@telia-ace/alliance-portal 1.0.6-next.3 → 1.0.6-next.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @telia-ace/alliance-portal
 
+## 1.0.6-next.4
+
+### Patch Changes
+
+-   f743a2b: Skip checking user claims for groups when `AUTH_SKIP_GROUP_CLAIM_CHECK` is set to `'true'`.
+
 ## 1.0.6-next.3
 
 ### Patch Changes

package/dist/config.js

@@ -7,6 +7,7 @@ var ConfigKeys;
     ConfigKeys["AuthClientSecret"] = "AUTH_CLIENT_SECRET";
     ConfigKeys["AuthClientId"] = "AUTH_CLIENT_ID";
     ConfigKeys["AuthResponseType"] = "AUTH_RESPONSE_TYPE";
+    ConfigKeys["AuthSkipGroupClaimCheck"] = "AUTH_SKIP_GROUP_CLAIM_CHECK";
     ConfigKeys["ServiceBaseUrl"] = "SERVICE_BASE_URL";
     ConfigKeys["WebprovisionsTag"] = "WEBPROVISIONS_TAG";
     ConfigKeys["WebprovisionsDistributionUrl"] = "WEBPROVISIONS_DISTRIBUTION_URL";

package/dist/graphql/generated.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GetUserDocument = exports.GetOrCreateUserDocument = void 0;
+exports.GetUserDocument = exports.SetUserTypeDocument = exports.GetOrCreateUserDocument = void 0;
 exports.GetOrCreateUserDocument = { "kind": "Document", "definitions": [{ "kind": "OperationDefinition", "operation": "mutation", "name": { "kind": "Name", "value": "GetOrCreateUser" }, "variableDefinitions": [{ "kind": "VariableDefinition", "variable": { "kind": "Variable", "name": { "kind": "Name", "value": "input" } }, "type": { "kind": "NonNullType", "type": { "kind": "NamedType", "name": { "kind": "Name", "value": "GetOrCreateUserInput" } } } }], "selectionSet": { "kind": "SelectionSet", "selections": [{ "kind": "Field", "name": { "kind": "Name", "value": "getOrCreateUser" }, "arguments": [{ "kind": "Argument", "name": { "kind": "Name", "value": "input" }, "value": { "kind": "Variable", "name": { "kind": "Name", "value": "input" } } }], "selectionSet": { "kind": "SelectionSet", "selections": [{ "kind": "Field", "name": { "kind": "Name", "value": "objectId" } }, { "kind": "Field", "name": { "kind": "Name", "value": "displayName" } }, { "kind": "Field", "name": { "kind": "Name", "value": "type" } }] } }] } }] };
+exports.SetUserTypeDocument = { "kind": "Document", "definitions": [{ "kind": "OperationDefinition", "operation": "mutation", "name": { "kind": "Name", "value": "SetUserType" }, "variableDefinitions": [{ "kind": "VariableDefinition", "variable": { "kind": "Variable", "name": { "kind": "Name", "value": "input" } }, "type": { "kind": "NonNullType", "type": { "kind": "NamedType", "name": { "kind": "Name", "value": "SetUserTypeInput" } } } }], "selectionSet": { "kind": "SelectionSet", "selections": [{ "kind": "Field", "name": { "kind": "Name", "value": "setUserType" }, "arguments": [{ "kind": "Argument", "name": { "kind": "Name", "value": "input" }, "value": { "kind": "Variable", "name": { "kind": "Name", "value": "input" } } }] }] } }] };
 exports.GetUserDocument = { "kind": "Document", "definitions": [{ "kind": "OperationDefinition", "operation": "query", "name": { "kind": "Name", "value": "GetUser" }, "variableDefinitions": [{ "kind": "VariableDefinition", "variable": { "kind": "Variable", "name": { "kind": "Name", "value": "objectId" } }, "type": { "kind": "NonNullType", "type": { "kind": "NamedType", "name": { "kind": "Name", "value": "String" } } } }, { "kind": "VariableDefinition", "variable": { "kind": "Variable", "name": { "kind": "Name", "value": "workspaceSlug" } }, "type": { "kind": "NonNullType", "type": { "kind": "NamedType", "name": { "kind": "Name", "value": "String" } } } }], "selectionSet": { "kind": "SelectionSet", "selections": [{ "kind": "Field", "name": { "kind": "Name", "value": "user" }, "arguments": [{ "kind": "Argument", "name": { "kind": "Name", "value": "objectId" }, "value": { "kind": "Variable", "name": { "kind": "Name", "value": "objectId" } } }, { "kind": "Argument", "name": { "kind": "Name", "value": "workspaceSlug" }, "value": { "kind": "Variable", "name": { "kind": "Name", "value": "workspaceSlug" } } }], "selectionSet": { "kind": "SelectionSet", "selections": [{ "kind": "Field", "name": { "kind": "Name", "value": "id" } }] } }] } }] };

package/dist/index.js

@@ -32,7 +32,6 @@ async function startPortal() {
                 displayName: claims.name || 'Empty displayName',
                 email: claims.email || claims.emails[0] || 'Empty email',
                 objectId: claims.sub || claims.oid,
-                type: hasEnterpriseAdminRole(claims) ? 'system-admin' : 'user',
             };
             logger.trace({
                 msg: 'decoded JWT and mapped claims to user, getting or creating user in database',
@@ -47,6 +46,22 @@ async function startPortal() {
                 logger.trace({ msg: 'added user to database, if it did not already exist' });
             }
             catch { }
+            // For easier testing as system admin during development
+            const skipGroupClaimCheck = configService.get(config_2.ConfigKeys.AuthSkipGroupClaimCheck) ===
+                'true';
+            if (!skipGroupClaimCheck) {
+                const type = hasEnterpriseAdminRole(claims) ? 'system-admin' : 'user';
+                logger.trace({ msg: 'updating user type according to user claims', type });
+                try {
+                    await (0, graphql_request_1.request)(configService.getOrThrow(alliance_internal_node_utilities_1.SharedConfigKeys.DbEndpoint), graphql_1.SetUserTypeDocument, { input: { objectId: user.objectId, type } }, {
+                        authorization: (0, alliance_internal_node_utilities_1.createSystemUserToken)(configService),
+                    });
+                    logger.trace({
+                        msg: 'user type updated',
+                    });
+                }
+                catch { }
+            }
             // FUTURE TODO: Implement some external storage for sessions, such as redis
             // Temporary - With this the stored session cookie gets too big
             // @ts-ignore

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@telia-ace/alliance-portal",
-  "version": "1.0.6-next.3",
+  "version": "1.0.6-next.4",
   "description": "ACE Alliance portal",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "Telia Company AB",