Merge pull request #39 from Bynder/make_scopes_mandatory

Made scope mandatory and removed deprecated login samples
Bynder · Oct 24, 2019 · d27931f · d27931f
2 parents 330f25c + c1c14e1
commit d27931f
Show file tree

Hide file tree

Showing 14 changed files with 8 additions and 979 deletions.
diff --git a/samples/login.html b/samples/login.html
diff --git a/samples/login.js b/samples/login.js
diff --git a/samples/login_completed.html b/samples/login_completed.html
diff --git a/src/bynder-js-sdk.js b/src/bynder-js-sdk.js
@@ -7,7 +7,6 @@ const queryString = require("query-string");
 const simpleOAuth2 = require("simple-oauth2");
 const url = require("url");
 
-const DEFAULT_SCOPES = "openid offline";
 const defaultAssetsNumberPerPage = 50;
 
 /**
@@ -196,10 +195,10 @@ class Bynder {
    * Builds OAuth2 authorization URL.
    * @return {String} Authorization URL
    */
-  makeAuthorizationURL(state) {
+  makeAuthorizationURL(state, scope) {
     return this.oauth2.authorizationCode.authorizeURL({
       redirect_uri: this.redirectUri,
-      scope: DEFAULT_SCOPES,
+      scope: scope,
       state: state
     });
   }
@@ -212,8 +211,7 @@ class Bynder {
   getToken(code) {
     const tokenConfig = {
       code: code,
-      redirect_uri: this.redirectUri,
-      scope: DEFAULT_SCOPES
+      redirect_uri: this.redirectUri
     };
 
     return this.oauth2.authorizationCode.getToken(tokenConfig).then(result => {

diff --git a/tests/__snapshots__/login.test.js.snap b/tests/__snapshots__/login.test.js.snap
@@ -1,3 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Make authorization URL should return correct authorization URL 1`] = `"https://integrations.getbynder.com/v6/authentication/oauth2/auth?response_type=code&client_id=5f5206f4-2d7a-4345-bd4c-12fad14ac111&redirect_uri=http%3A%2F%2Flocalhost%2Ftest%2Fcallback&scope=openid%20offline&state=state%20example"`;
+exports[`Make authorization URL should return correct authorization URL 1`] = `"https://integrations.getbynder.com/v6/authentication/oauth2/auth?response_type=code&client_id=5f5206f4-2d7a-4345-bd4c-12fad14ac111&redirect_uri=http%3A%2F%2Flocalhost%2Ftest%2Fcallback&scope=offline&state=state%20example"`;
diff --git a/tests/brands.test.js b/tests/brands.test.js
diff --git a/tests/collections.test.js b/tests/collections.test.js
diff --git a/tests/login.test.js b/tests/login.test.js
@@ -6,8 +6,10 @@ let bynder;
 
 describe("Make authorization URL", () => {
   bynder = new Bynder(configs);
-  const encodedRedirectUri = encodeURIComponent(configs.redirectUri);
-  const authorizationUrl = bynder.makeAuthorizationURL("state example");
+  const authorizationUrl = bynder.makeAuthorizationURL(
+    "state example",
+    "offline"
+  );
 
   test("should return correct authorization URL", () => {
     // Security token is random token so we compare without this