@livechat/accounts-sdk 2.2.3 → 2.2.4-beta.0

package/dist/accounts-sdk.js

@@ -4007,6 +4007,25 @@
     string: string
   };
 
+  /**
+   * Normalize PKCE options, support deprecated code_challange_method option
+   * @param {object|undefined} pkce PKCE options
+   * @returns {object|undefined} normalized PKCE options
+   */
+  function normalizePkce(pkce) {
+    if (!pkce || pkce.code_challange_method === undefined) {
+      return pkce;
+    }
+    const normalized = Object.assign({}, pkce);
+    // eslint-disable-next-line max-len
+    console.warn('[accounts-sdk] pkce.code_challange_method is deprecated and will be removed in v3.0.0. Use code_challenge_method instead.');
+    if (normalized.code_challenge_method === undefined) {
+      normalized.code_challenge_method = normalized.code_challange_method;
+    }
+    delete normalized.code_challange_method;
+    return normalized;
+  }
+
   /**
    * Accounts SDK main class
    */
@@ -4037,7 +4056,8 @@
      * @param {string} [options.pkce.code_verifier] override auto generated code verifier
      * @param {number} [options.pkce.code_verifier_length] code verifier length, between 43 and 128 characters
      *   https://tools.ietf.org/html/rfc7636#section-4.1 (default: `128`)
-     * @param {string} [options.pkce.code_challange_method] code challange method, use `S256` or `plain` (default: `S256`)
+     * @param {string} [options.pkce.code_challenge_method] code challenge method, use `S256` or `plain` (default: `S256`)
+     * @param {string} [options.pkce.code_challange_method] **Deprecated.** Use `code_challenge_method` instead.
      */
     constructor() {
       let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -4068,10 +4088,11 @@
         pkce: {
           enabled: true,
           code_verifier_length: 128,
-          code_challange_method: 'S256'
+          code_challenge_method: 'S256'
         }
       };
       this.options = Object.assign({}, defaultOptions, options);
+      this.options.pkce = normalizePkce(this.options.pkce);
       this.transaction = new Transaction(this.options);
       this.redirectUriParamsPersister = new RedirectUriParamsPersister(this.options);
     }
@@ -4119,6 +4140,7 @@
       let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       let flow = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
       const localOptions = Object.assign({}, this.options, options);
+      localOptions.pkce = normalizePkce(localOptions.pkce);
       if (!localOptions.state) {
         localOptions.state = random.string(localOptions.key_length);
       }
@@ -4145,14 +4167,15 @@
       }
       if (localOptions.response_type === 'code' && localOptions.pkce.enabled) {
         const codeVerifier = localOptions.pkce.code_verifier || random.string(localOptions.pkce.code_verifier_length);
-        switch (localOptions.pkce.code_challange_method) {
+        switch (localOptions.pkce.code_challenge_method) {
           case 'S256':
             {
-              const codeChallenge = sjcl.hash.sha256.hash(codeVerifier);
+              const hashBits = sjcl.hash.sha256.hash(codeVerifier);
+              const hashBytes = hashBits.reduce((s, w) => s + String.fromCharCode(w >>> 24 & 0xff, w >>> 16 & 0xff, w >>> 8 & 0xff, w & 0xff), '');
               Object.assign(params, {
                 code_verifier: codeVerifier,
-                code_challenge: encoding.base64URLEncode(codeChallenge),
-                code_challenge_method: localOptions.pkce.code_challange_method
+                code_challenge: encoding.base64URLEncode(hashBytes),
+                code_challenge_method: localOptions.pkce.code_challenge_method
               });
               break;
             }
@@ -4160,7 +4183,7 @@
             Object.assign(params, {
               code_verifier: codeVerifier,
               code_challenge: codeVerifier,
-              code_challenge_method: localOptions.pkce.code_challange_method
+              code_challenge_method: localOptions.pkce.code_challenge_method
             });
         }
       }