@boxyhq/saml-jackson 1.3.1 → 1.3.3

package/dist/controller/oauth.d.ts

@@ -108,6 +108,10 @@ export declare class OAuthController implements IOAuthController {
      *               type: string
      *             lastName:
      *               type: string
+     *             roles:
+     *               type: array
+     *             groups:
+     *               type: array
      *             raw:
      *               type: object
      *             requested:

package/dist/controller/oauth.js

@@ -100,11 +100,12 @@ class OAuthController {
             else if (this.opts.idpDiscoveryPath) {
                 if (!isIdpFlow) {
                     // redirect to IdP selection page
-                    const idpList = connections.map(({ idpMetadata, oidcProvider, clientID }) => {
+                    const idpList = connections.map(({ idpMetadata, oidcProvider, clientID, name }) => {
                         var _a;
                         return JSON.stringify({
                             provider: (_a = idpMetadata === null || idpMetadata === void 0 ? void 0 : idpMetadata.provider) !== null && _a !== void 0 ? _a : oidcProvider === null || oidcProvider === void 0 ? void 0 : oidcProvider.provider,
                             clientID,
+                            name,
                             connectionIsSAML: idpMetadata && typeof idpMetadata === 'object',
                             connectionIsOIDC: oidcProvider && typeof oidcProvider === 'object',
                         });
@@ -381,7 +382,7 @@ class OAuthController {
                     oidcCodeVerifier = openid_client_1.generators.codeVerifier();
                     const code_challenge = openid_client_1.generators.codeChallenge(oidcCodeVerifier);
                     ssoUrl = oidcClient.authorizationUrl({
-                        scope: [...requestedScopes, 'openid', 'email', 'profile']
+                        scope: [...requestedScopes, 'openid', 'email', 'profile', 'groups']
                             .filter((value, index, self) => self.indexOf(value) === index) // filter out duplicates
                             .join(' '),
                         code_challenge,
@@ -615,7 +616,7 @@ class OAuthController {
         });
     }
     extractOIDCUserProfile(tokenSet, oidcClient) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function* () {
             const profile = { claims: {} };
             const idTokenClaims = tokenSet.claims();
@@ -624,6 +625,8 @@ class OAuthController {
             profile.claims.email = (_a = idTokenClaims.email) !== null && _a !== void 0 ? _a : userinfo.email;
             profile.claims.firstName = (_b = idTokenClaims.given_name) !== null && _b !== void 0 ? _b : userinfo.given_name;
             profile.claims.lastName = (_c = idTokenClaims.family_name) !== null && _c !== void 0 ? _c : userinfo.family_name;
+            profile.claims.roles = (_d = idTokenClaims.roles) !== null && _d !== void 0 ? _d : userinfo.roles;
+            profile.claims.groups = (_e = idTokenClaims.groups) !== null && _e !== void 0 ? _e : userinfo.groups;
             profile.claims.raw = userinfo;
             return profile;
         });
@@ -867,7 +870,7 @@ class OAuthController {
                     throw new error_1.JacksonError('JWT signing keys are not loaded', 500);
                 }
                 let claims = requestHasNonce ? { nonce: codeVal.requested.nonce } : {};
-                claims = Object.assign(Object.assign({}, claims), { id: codeVal.profile.claims.id, email: codeVal.profile.claims.email, firstName: codeVal.profile.claims.firstName, lastName: codeVal.profile.claims.lastName });
+                claims = Object.assign(Object.assign({}, claims), { id: codeVal.profile.claims.id, email: codeVal.profile.claims.email, firstName: codeVal.profile.claims.firstName, lastName: codeVal.profile.claims.lastName, roles: codeVal.profile.claims.roles, groups: codeVal.profile.claims.groups });
                 const signingKey = yield (0, utils_1.loadJWSPrivateKey)(jwtSigningKeys.private, jwsAlg);
                 const id_token = yield new jose.SignJWT(claims)
                     .setProtectedHeader({ alg: jwsAlg })
@@ -922,6 +925,10 @@ class OAuthController {
      *               type: string
      *             lastName:
      *               type: string
+     *             roles:
+     *               type: array
+     *             groups:
+     *               type: array
      *             raw:
      *               type: object
      *             requested:

package/dist/loadConnection.js

@@ -34,16 +34,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
+const url = __importStar(require("url"));
 const loadConnection = (preLoadedConnection) => __awaiter(void 0, void 0, void 0, function* () {
     if (preLoadedConnection.startsWith('./')) {
         preLoadedConnection = path.resolve(process.cwd(), preLoadedConnection);
     }
+    else {
+        preLoadedConnection = path.resolve(preLoadedConnection);
+    }
     const files = yield fs.promises.readdir(preLoadedConnection);
     const connections = [];
     for (const idx in files) {
         const file = files[idx];
         if (file.endsWith('.js')) {
-            const { default: connection, } = yield Promise.resolve().then(() => __importStar(require(/* webpackIgnore: true */ path.join(preLoadedConnection, file))));
+            const filePath = path.join(preLoadedConnection, file);
+            const fileUrl = preLoadedConnection.startsWith('/') ? filePath : url.pathToFileURL(filePath).toString();
+            const { default: connection, } = yield Promise.resolve().then(() => __importStar(require(/* webpackIgnore: true */ fileUrl)));
             if (!('oidcDiscoveryUrl' in connection)) {
                 const rawMetadata = yield fs.promises.readFile(path.join(preLoadedConnection, path.parse(file).name + '.xml'), 'utf8');
                 connection.encodedRawMetadata = Buffer.from(rawMetadata, 'utf8').toString('base64');

package/dist/saml/claims.d.ts

@@ -1,6 +1,6 @@
 declare const _default: {
-    map: (claims: Record<"id" | "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" | "email" | "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" | "firstName" | "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" | "lastName" | "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname", unknown>) => {
-        raw: Record<"id" | "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" | "email" | "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" | "firstName" | "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" | "lastName" | "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname", unknown>;
+    map: (claims: Record<string, unknown>) => {
+        raw: Record<string, unknown>;
     };
 };
 export default _default;

package/dist/saml/claims.js

@@ -1,5 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const rolesAttribute = 'roles';
+const rolesSchema = 'http://schemas.microsoft.com/ws/2008/06/identity/claims/role';
+const groupsAttribute = 'groups';
+const groupsSchema = 'http://schemas.xmlsoap.org/claims/Group';
+const arrayMapping = [
+    {
+        attribute: rolesAttribute,
+        schema: rolesSchema,
+    },
+    {
+        attribute: groupsAttribute,
+        schema: groupsSchema,
+    },
+];
 const mapping = [
     {
         attribute: 'id',
@@ -17,8 +31,17 @@ const mapping = [
         attribute: 'lastName',
         schema: 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname',
     },
+    ...arrayMapping,
 ];
 const map = (claims) => {
+    arrayMapping.forEach((m) => {
+        if (claims[m.attribute]) {
+            claims[m.attribute] = [].concat(claims[m.attribute]);
+        }
+        else if (claims[m.schema]) {
+            claims[m.schema] = [].concat(claims[m.schema]);
+        }
+    });
     const profile = {
         raw: claims,
     };

package/dist/typings.d.ts

@@ -228,7 +228,10 @@ export interface Profile {
     email: string;
     firstName: string;
     lastName: string;
+    roles?: string[];
+    groups?: string[];
     requested: Record<string, string>;
+    raw: any;
 }
 export interface Index {
     name: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boxyhq/saml-jackson",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "SAML Jackson library",
   "keywords": [
     "SAML 2.0"
@@ -38,13 +38,13 @@
     "statements": 70
   },
   "dependencies": {
-    "@boxyhq/saml20": "1.0.7",
+    "@boxyhq/saml20": "1.0.11",
     "@opentelemetry/api": "1.0.4",
     "@opentelemetry/api-metrics": "0.27.0",
-    "axios": "1.1.2",
-    "jose": "4.10.0",
+    "axios": "1.1.3",
+    "jose": "4.10.3",
     "marked": "4.1.1",
-    "mongodb": "4.10.0",
+    "mongodb": "4.11.0",
     "mysql2": "2.3.3",
     "openid-client": "5.1.10",
     "node-forge": "1.3.1",
@@ -57,14 +57,14 @@
     "xmlbuilder": "15.1.1"
   },
   "devDependencies": {
-    "@faker-js/faker": "7.5.0",
-    "@types/node": "18.8.3",
+    "@faker-js/faker": "7.6.0",
+    "@types/node": "18.11.5",
     "@types/sinon": "10.0.13",
     "@types/tap": "15.0.7",
     "@typescript-eslint/eslint-plugin": "5.40.0",
-    "@typescript-eslint/parser": "5.38.1",
+    "@typescript-eslint/parser": "5.41.0",
     "cross-env": "7.0.3",
-    "eslint": "8.25.0",
+    "eslint": "8.26.0",
     "eslint-config-prettier": "8.5.0",
     "prettier": "2.7.1",
     "sinon": "14.0.1",