diff --git a/src/core/oauth2-authorize.js b/src/core/oauth2-authorize.js index 3c0b15cc..fd3a4afc 100644 --- a/src/core/oauth2-authorize.js +++ b/src/core/oauth2-authorize.js @@ -64,8 +64,8 @@ export default function authorize ( { auth, authActions, errActions, configs, au } } - let authorizationUrl = schema.get("authorizationUrl"); - let url = [authorizationUrl, query.join("&")].join(authorizationUrl.indexOf('?') === -1 ? "?" : "&") + let authorizationUrl = schema.get("authorizationUrl") + let url = [authorizationUrl, query.join("&")].join(authorizationUrl.indexOf("?") === -1 ? "?" : "&") // pass action authorizeOauth2 and authentication data through window // to authorize with oauth2 diff --git a/test/core/oauth2-authorize.js b/test/core/oauth2-authorize.js index e6c76a6d..1d99cdce 100644 --- a/test/core/oauth2-authorize.js +++ b/test/core/oauth2-authorize.js @@ -7,9 +7,9 @@ import oauth2Authorize from "core/oauth2-authorize" describe("OAuth2", function () { let mockSchema = { - flow: 'accessCode', - authorizationUrl: 'https://testAuthorizationUrl' - }; + flow: "accessCode", + authorizationUrl: "https://testAuthorizationUrl" + } let authConfig = { auth: { schema: { get: (key)=> mockSchema[key] } }, @@ -17,23 +17,23 @@ describe("OAuth2", function () { errActions: {}, configs: { oauth2RedirectUrl: "" }, authConfigs: {} - }; + } describe("authorize redirect", function () { it("should build redirectUrl", function() { - win.open = createSpy(); - oauth2Authorize(authConfig); - expect(win.open.calls.length).toEqual(1); - expect(win.open.calls[0].arguments[0]).toMatch("https://testAuthorizationUrl?response_type=code&redirect_uri=&state="); - }); + win.open = createSpy() + oauth2Authorize(authConfig) + expect(win.open.calls.length).toEqual(1) + expect(win.open.calls[0].arguments[0]).toMatch("https://testAuthorizationUrl?response_type=code&redirect_uri=&state=") + }) it("should build correct redirectUrl from authorizeUrl with query parameters", function() { - win.open = createSpy(); - mockSchema.authorizationUrl = 'https://testAuthorizationUrl?param=1'; - oauth2Authorize(authConfig); - expect(win.open.calls.length).toEqual(1); - expect(win.open.calls[0].arguments[0]).toMatch("https://testAuthorizationUrl?param=1&response_type=code&redirect_uri=&state="); - }); - }); -}); + win.open = createSpy() + mockSchema.authorizationUrl = "https://testAuthorizationUrl?param=1" + oauth2Authorize(authConfig) + expect(win.open.calls.length).toEqual(1) + expect(win.open.calls[0].arguments[0]).toMatch("https://testAuthorizationUrl?param=1&response_type=code&redirect_uri=&state=") + }) + }) +})