@boxyhq/saml-jackson 0.3.2-beta.297 → 0.3.2-beta.301

package/dist/controller/oauth.js

@@ -212,7 +212,17 @@ class OAuthController {
             if (!codeVal || !codeVal.profile) {
                 throw new error_1.JacksonError('Invalid code', 403);
             }
-            if (client_id && client_secret) {
+            if (code_verifier) {
+                // PKCE flow
+                let cv = code_verifier;
+                if (codeVal.session.code_challenge_method.toLowerCase() === 's256') {
+                    cv = codeVerifier.encode(code_verifier);
+                }
+                if (codeVal.session.code_challenge !== cv) {
+                    throw new error_1.JacksonError('Invalid code_verifier', 401);
+                }
+            }
+            else if (client_id && client_secret) {
                 // check if we have an encoded client_id
                 if (client_id !== 'dummy' && client_secret !== 'dummy') {
                     const sp = getEncodedClientId(client_id);
@@ -224,16 +234,6 @@ class OAuthController {
                     }
                 }
             }
-            else if (code_verifier) {
-                // PKCE flow
-                let cv = code_verifier;
-                if (codeVal.session.code_challenge_method.toLowerCase() === 's256') {
-                    cv = codeVerifier.encode(code_verifier);
-                }
-                if (codeVal.session.code_challenge !== cv) {
-                    throw new error_1.JacksonError('Invalid code_verifier', 401);
-                }
-            }
             else if (codeVal && codeVal.session) {
                 throw new error_1.JacksonError('Please specify client_secret or code_verifier', 401);
             }

package/dist/controller/utils.d.ts

@@ -1,5 +1,3 @@
-import { Request } from 'express';
-export declare const extractAuthToken: (req: Request) => string | null;
 export declare enum IndexNames {
     EntityID = "entityID",
     TenantProduct = "tenantProduct"

package/dist/controller/utils.js

@@ -1,15 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IndexNames = exports.extractAuthToken = void 0;
-const extractAuthToken = (req) => {
-    const authHeader = req.get('authorization');
-    const parts = (authHeader || '').split(' ');
-    if (parts.length > 1) {
-        return parts[1];
-    }
-    return null;
-};
-exports.extractAuthToken = extractAuthToken;
+exports.IndexNames = void 0;
 var IndexNames;
 (function (IndexNames) {
     IndexNames["EntityID"] = "entityID";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boxyhq/saml-jackson",
-  "version": "0.3.2-beta.297",
+  "version": "0.3.2-beta.301",
   "description": "SAML 2.0 service",
   "keywords": [
     "SAML 2.0"