@boxyhq/saml-jackson 1.0.2 → 1.0.3

package/dist/controller/oauth.js

@@ -61,7 +61,7 @@ const validateResponse = (rawResponse, validateOpts) => __awaiter(void 0, void 0
     }
     return profile;
 });
-function getEncodedClientId(client_id) {
+function getEncodedTenantProduct(client_id) {
     try {
         const sp = new URLSearchParams(client_id);
         const tenant = sp.get('tenant');
@@ -128,7 +128,7 @@ class OAuthController {
     }
     authorize(body) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { response_type = 'code', client_id, redirect_uri, state, tenant, product, code_challenge, code_challenge_method = '', 
+            const { response_type = 'code', client_id, redirect_uri, state, tenant, product, access_type, code_challenge, code_challenge_method = '', 
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
             provider = 'saml', idp_hint, } = body;
             let requestedTenant = tenant;
@@ -169,9 +169,13 @@ class OAuthController {
                     samlConfig = resolvedSamlConfig;
                 }
             }
-            else if (client_id && client_id !== '' && client_id !== 'undefined' && client_id !== 'null') {
+            else if ((client_id && client_id !== '' && client_id !== 'undefined' && client_id !== 'null') ||
+                (access_type && access_type !== '' && access_type !== 'undefined' && access_type !== 'null')) {
                 // if tenant and product are encoded in the client_id then we parse it and check for the relevant config(s)
-                const sp = getEncodedClientId(client_id);
+                let sp = getEncodedTenantProduct(client_id);
+                if (!sp && access_type) {
+                    sp = getEncodedTenantProduct(access_type);
+                }
                 if (sp && sp.tenant && sp.product) {
                     requestedTenant = sp.tenant;
                     requestedProduct = sp.product;
@@ -204,6 +208,10 @@ class OAuthController {
                 }
                 else {
                     samlConfig = yield this.configStore.get(client_id);
+                    if (samlConfig) {
+                        requestedTenant = samlConfig.tenant;
+                        requestedProduct = samlConfig.product;
+                    }
                 }
             }
             else {
@@ -456,7 +464,7 @@ class OAuthController {
             else if (client_id && client_secret) {
                 // check if we have an encoded client_id
                 if (client_id !== 'dummy') {
-                    const sp = getEncodedClientId(client_id);
+                    const sp = getEncodedTenantProduct(client_id);
                     if (!sp) {
                         // OAuth flow
                         if (client_id !== codeVal.clientID || client_secret !== codeVal.clientSecret) {

package/dist/typings.d.ts

@@ -51,6 +51,7 @@ export interface OAuthReqBody {
     state: string;
     tenant?: string;
     product?: string;
+    access_type?: string;
     code_challenge: string;
     code_challenge_method: 'plain' | 'S256' | '';
     provider: 'saml';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boxyhq/saml-jackson",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "SAML Jackson library",
   "keywords": [
     "SAML 2.0"
@@ -43,7 +43,7 @@
     "mongodb": "4.5.0",
     "mysql2": "2.3.3",
     "pg": "8.7.3",
-    "redis": "4.0.6",
+    "redis": "4.1.0",
     "reflect-metadata": "0.1.13",
     "ripemd160": "2.0.2",
     "typeorm": "0.3.6",
@@ -51,19 +51,19 @@
     "xmlbuilder": "15.1.1"
   },
   "devDependencies": {
-    "@types/node": "17.0.30",
+    "@types/node": "17.0.31",
     "@types/sinon": "10.0.11",
     "@types/tap": "15.0.7",
-    "@typescript-eslint/eslint-plugin": "5.21.0",
-    "@typescript-eslint/parser": "5.21.0",
+    "@typescript-eslint/eslint-plugin": "5.23.0",
+    "@typescript-eslint/parser": "5.23.0",
     "cross-env": "7.0.3",
-    "eslint": "8.14.0",
+    "eslint": "8.15.0",
     "eslint-config-prettier": "8.5.0",
     "prettier": "2.6.2",
-    "sinon": "13.0.2",
-    "tap": "16.1.0",
+    "sinon": "14.0.0",
+    "tap": "16.2.0",
     "ts-node": "10.7.0",
-    "tsconfig-paths": "3.14.1",
+    "tsconfig-paths": "4.0.0",
     "typescript": "4.6.4"
   },
   "engines": {