Merge pull request #71 from KeeganBeuthin/fix/authURLParams

Author: DanielRivers

lib/sdk/oauth2-flows/AuthCodeAbstract.ts

@@ -292,8 +292,10 @@ export abstract class AuthCodeAbstract {
         lang,
         login_hint: loginHint,
         connection_id: connectionId,
+        state,
         ...rest
       } = options.authUrlParams;
+
       searchParamsObject = { ...rest, ...searchParamsObject };
 
       if (lang) {

lib/sdk/oauth2-flows/AuthCodeWithPKCE.ts

@@ -47,7 +47,10 @@ export class AuthCodeWithPKCE extends AuthCodeAbstract {
     this.codeChallenge = challenge;
     this.codeVerifier = verifier;
 
-    this.state = options.state ?? utilities.generateRandomString();
+    const providedState = options.state ?? options.authUrlParams?.state;
+
+    this.state = providedState ?? utilities.generateRandomString();
+
     const setItem = isBrowserEnvironment()
       ? (sessionManager as unknown as BrowserSessionManager).setSessionItemBrowser
       : sessionManager.setSessionItem;

lib/sdk/oauth2-flows/AuthorizationCode.ts

@@ -36,12 +36,15 @@ export class AuthorizationCode extends AuthCodeAbstract {
     sessionManager: SessionManager,
     options: AuthURLOptions = {}
   ): Promise<URL> {
+    const providedState = options.state ?? options.authUrlParams?.state;
+
     this.state =
-      options.state ??
+      providedState ??
       ((await sessionManager.getSessionItem(
         AuthorizationCode.STATE_KEY
       )) as string) ??
       utilities.generateRandomString();
+
     await sessionManager.setSessionItem(AuthorizationCode.STATE_KEY, this.state);
     const authURL = new URL(this.authorizationEndpoint);
     const authParams = this.generateAuthURLParams(options);

package.json

@@ -26,7 +26,7 @@
     "postbuild": "node sdk-version.js clean && ncp ./package-cjs.json ./dist-cjs/package.json && ncp ./package-esm.json ./dist/package.json",
     "prebuild": "node sdk-version.js && rimraf dist dist-cjs lib/models lib/apis",
     "lint": "eslint . && prettier . --check",
-    "lint:fix": "eslint --fix . && prettier . --check",
+    "lint:fix": "eslint --fix . && prettier . --write",
     "test": "jest --passWithNoTests",
     "lint-staged": "lint-staged",
     "husky": "husky install",