Merge branch 'develop' into inplayer/update-account

jwplayer · Dec 5, 2022 · 239a741 · 239a741
2 parents a65dba3 + 60af8be
commit 239a741
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/.github/workflows/codeceptjs.yml b/.github/workflows/codeceptjs.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Start preview server
         run: yarn start:test &
       - name: Run tests
-        run: wait-on -v -t 30000 -c ./scripts/waitOnConfig.js http-get://localhost:8080 && yarn codecept:${{ matrix.config }}
+        run: wait-on -v -t 60000 -c ./scripts/waitOnConfig.js http-get://localhost:8080 && yarn codecept:${{ matrix.config }}
         env:
           TEST_RETRY_COUNT: 2
           WORKER_COUNT: 2

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+# [2.9.0](https://github.com/jwplayer/ott-web-app/compare/v2.8.0...v2.9.0) (2022-12-05)
+
+
+### Bug Fixes
+
+* inplayer in service ([57757e9](https://github.com/jwplayer/ott-web-app/commit/57757e9e0f0683455ceea515dbe3811699b0f992))
+* refactor inplayer approach ([4d327b6](https://github.com/jwplayer/ott-web-app/commit/4d327b6ee0ee7cf39cff2f8d518861de5ab907fc))
+
+
+### Features
+
+* inplayer authentication ([f1922e4](https://github.com/jwplayer/ott-web-app/commit/f1922e4f95f92e76b5dca9b5a95291029a605573))
+
+
+
 # [2.8.0](https://github.com/jwplayer/ott-web-app/compare/v2.7.1...v2.8.0) (2022-12-01)
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jw-ott-webapp",
-  "version": "2.8.0",
+  "version": "2.9.0",
   "main": "index.js",
   "repository": "https://github.com/jwplayer/ott-web-app.git",
   "author": "JW Player",
@@ -138,4 +138,4 @@
     "codeceptjs/**/ansi-regex": "^4.1.1",
     "codeceptjs/**/minimatch": "^3.0.5"
   }
-}
+}
diff --git a/src/utils/configLoad.ts b/src/utils/configLoad.ts
@@ -109,7 +109,7 @@ export async function loadAndValidateConfig(configSource: string | undefined) {
 
   // TODO: refactor this once we have more input how integrations will be handled in dashboard
   if (config?.integrations?.cleeng?.id && config?.integrations?.inplayer?.clientId) {
-    throw new Error('Invalid client integration.');
+    throw new Error('Invalid client integration. You cannot have both Cleeng and Inplayer integrations enabled at the same time.');
   }
   if (config?.integrations?.cleeng?.id || config?.integrations?.inplayer?.clientId) {
     await initializeAccount();