@comet/cms-api 9.0.0-beta.1 → 9.0.0-beta.3

package/lib/access-log/access-log.interceptor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"access-log.interceptor.d.ts","sourceRoot":"","sources":["../../src/access-log/access-log.interceptor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAsB,MAAM,EAAE,eAAe,EAAY,MAAM,gBAAgB,CAAC;AAMtH,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAK9C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,qBACa,oBAAqB,YAAW,eAAe;IAKb,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IAC/B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;IAL/D,SAAS,CAAC,QAAQ,CAAC,MAAM,SAAyC;IAClE,OAAO,CAAC,YAAY,CAAW;gBAG6B,MAAM,CAAC,EAAE,eAAe,YAAA,EAC/B,SAAS,CAAC,EAAE,SAAS,YAAA;IAQ1E,SAAS,CAAC,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,WAAW;IA2EtD,OAAO,CAAC,qBAAqB;IAgB7B,OAAO,CAAC,uBAAuB;CAIlC"}
+{"version":3,"file":"access-log.interceptor.d.ts","sourceRoot":"","sources":["../../src/access-log/access-log.interceptor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAsB,MAAM,EAAE,eAAe,EAAY,MAAM,gBAAgB,CAAC;AAMtH,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAK9C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,qBACa,oBAAqB,YAAW,eAAe;IAKb,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IAC/B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;IAL/D,SAAS,CAAC,QAAQ,CAAC,MAAM,SAAyC;IAClE,OAAO,CAAC,YAAY,CAAW;gBAG6B,MAAM,CAAC,EAAE,eAAe,YAAA,EAC/B,SAAS,CAAC,EAAE,SAAS,YAAA;IAQ1E,SAAS,CAAC,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,WAAW;IA6EtD,OAAO,CAAC,qBAAqB;IAkB7B,OAAO,CAAC,uBAAuB;CAIlC"}

package/lib/access-log/access-log.interceptor.js

@@ -21,17 +21,15 @@ const dam_constants_1 = require("../dam/dam.constants");
 const access_log_constants_1 = require("./access-log.constants");
 let AccessLogInterceptor = AccessLogInterceptor_1 = class AccessLogInterceptor {
     constructor(config, damConfig) {
-        var _a, _b;
         this.config = config;
         this.damConfig = damConfig;
         this.logger = new common_1.Logger(AccessLogInterceptor_1.name);
-        const damBasePath = (_b = (_a = this.damConfig) === null || _a === void 0 ? void 0 : _a.basePath) !== null && _b !== void 0 ? _b : "dam";
+        const damBasePath = this.damConfig?.basePath ?? "dam";
         this.ignoredPaths = this.damConfig
             ? [`/${damBasePath}/images/`, `/${damBasePath}/files/preview`, `/${damBasePath}/files/download`, `/${damBasePath}/files/:hash/`]
             : [];
     }
     intercept(context, next) {
-        var _a;
         const requestType = context.getType().toString();
         const requestData = [];
         let ignored = false;
@@ -53,14 +51,15 @@ let AccessLogInterceptor = AccessLogInterceptor_1 = class AccessLogInterceptor {
             const ipAddress = (0, request_ip_1.getClientIp)(graphqlContext.req);
             requestData.push(`ip: ${ipAddress}`);
             this.pushUserToRequestData(graphqlContext.req.user, requestData);
-            const gqlArgs = Object.assign({}, graphqlExecutionContext.getArgs());
+            const gqlArgs = { ...graphqlExecutionContext.getArgs() };
             if (gqlInfo.operation.operation === "mutation") {
                 delete gqlArgs["input"];
                 delete gqlArgs["data"];
             }
             requestData.push(`operationType: ${gqlInfo.parentType}`);
-            if ((_a = gqlInfo.operation.name) === null || _a === void 0 ? void 0 : _a.value)
+            if (gqlInfo.operation.name?.value) {
                 requestData.push(`operationName: ${gqlInfo.operation.name.value}`);
+            }
             requestData.push(`resolver function: ${gqlInfo.fieldName}`);
             requestData.push(`args: ${JSON.stringify(gqlArgs)}`);
         }
@@ -96,8 +95,9 @@ let AccessLogInterceptor = AccessLogInterceptor_1 = class AccessLogInterceptor {
                 ? this.config.userToLog
                 : (user, impersonatedUser) => {
                     let log = `user: ${user.id}`;
-                    if (impersonatedUser)
+                    if (impersonatedUser) {
                         log += ` (impersonating: ${impersonatedUser.id})`;
+                    }
                     return log;
                 };
             requestData.push(userToLog(user, impersonatedUser));

package/lib/access-log/access-log.interceptor.js.map

@@ -1 +1 @@
-{"version":3,"file":"access-log.interceptor.js","sourceRoot":"","sources":["../../src/access-log/access-log.interceptor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"access-log.interceptor.js","sourceRoot":"","sources":["../../src/access-log/access-log.interceptor.ts"],"names":[],"mappings":"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"}

package/lib/auth/guards/comet.guard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"comet.guard.d.ts","sourceRoot":"","sources":["../../../src/auth/guards/comet.guard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAsB,MAAM,EAAyB,MAAM,gBAAgB,CAAC;AAClH,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAMzC,OAAO,EAAE,sBAAsB,EAAE,MAAM,iDAAiD,CAAC;AAGzF,OAAO,EAAE,oBAAoB,EAAqB,MAAM,gCAAgC,CAAC;AAEzF,qBACa,cAAe,YAAW,WAAW;IAI1C,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACO,OAAO,CAAC,QAAQ,CAAC,YAAY;IALhE,SAAS,CAAC,QAAQ,CAAC,MAAM,SAAmC;gBAGhD,SAAS,EAAE,SAAS,EACX,OAAO,EAAE,sBAAsB,EACA,YAAY,EAAE,oBAAoB,EAAE;IAGxF,OAAO,CAAC,UAAU;IAMZ,WAAW,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;YA8ChD,0BAA0B;IAQxC,OAAO,CAAC,uBAAuB;CASlC"}
+{"version":3,"file":"comet.guard.d.ts","sourceRoot":"","sources":["../../../src/auth/guards/comet.guard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAsB,MAAM,EAAyB,MAAM,gBAAgB,CAAC;AAClH,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAMzC,OAAO,EAAE,sBAAsB,EAAE,MAAM,iDAAiD,CAAC;AAGzF,OAAO,EAAE,oBAAoB,EAAqB,MAAM,gCAAgC,CAAC;AAEzF,qBACa,cAAe,YAAW,WAAW;IAI1C,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACO,OAAO,CAAC,QAAQ,CAAC,YAAY;IALhE,SAAS,CAAC,QAAQ,CAAC,MAAM,SAAmC;gBAGhD,SAAS,EAAE,SAAS,EACX,OAAO,EAAE,sBAAsB,EACA,YAAY,EAAE,oBAAoB,EAAE;IAGxF,OAAO,CAAC,UAAU;IAMZ,WAAW,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;YAkDhD,0BAA0B;IAUxC,OAAO,CAAC,uBAAuB;CASlC"}

package/lib/auth/guards/comet.guard.js

@@ -11,15 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var CometAuthGuard_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CometAuthGuard = void 0;
@@ -41,62 +32,61 @@ let CometAuthGuard = CometAuthGuard_1 = class CometAuthGuard {
             ? graphql_1.GqlExecutionContext.create(context).getContext().req
             : context.switchToHttp().getRequest();
     }
-    canActivate(context) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const request = this.getRequest(context);
-            const disableCometGuard = this.reflector.getAllAndOverride(disable_comet_guards_decorator_1.DISABLE_COMET_GUARDS_METADATA_KEY, [context.getHandler(), context.getClass()]);
-            const hasIncludeInvisibleContentHeader = !!request.headers["x-include-invisible-content"];
-            if (disableCometGuard && !hasIncludeInvisibleContentHeader) {
-                return true;
-            }
-            if (this.isResolvingGraphQLField(context)) {
-                return true;
-            }
-            const result = yield this.getAuthenticatedUserResult(request);
-            if (!result) {
-                this.logger.debug(`No AuthService could authenticate the user for ${context.getClass().name}::${context.getHandler().name}().`);
-                throw new common_1.UnauthorizedException("No AuthService could authenticate the user");
-            }
-            if ("authenticationError" in result)
-                throw new common_1.UnauthorizedException(result.authenticationError);
-            if ("systemUser" in result) {
-                request["user"] = result.systemUser;
-            }
-            else {
-                let user;
-                if ("userId" in result) {
-                    const userId = result.userId;
-                    const userService = this.service.getUserService();
-                    if (!userService)
-                        throw new common_1.UnauthorizedException(`User authenticated by ID but no user service given: ${userId}`);
-                    try {
-                        if (userService.getUserForLogin) {
-                            user = yield userService.getUserForLogin(userId);
-                        }
-                        else {
-                            user = yield userService.getUser(userId);
-                        }
+    async canActivate(context) {
+        const request = this.getRequest(context);
+        const disableCometGuard = this.reflector.getAllAndOverride(disable_comet_guards_decorator_1.DISABLE_COMET_GUARDS_METADATA_KEY, [context.getHandler(), context.getClass()]);
+        const hasIncludeInvisibleContentHeader = !!request.headers["x-include-invisible-content"];
+        if (disableCometGuard && !hasIncludeInvisibleContentHeader) {
+            return true;
+        }
+        if (this.isResolvingGraphQLField(context)) {
+            return true;
+        }
+        const result = await this.getAuthenticatedUserResult(request);
+        if (!result) {
+            this.logger.debug(`No AuthService could authenticate the user for ${context.getClass().name}::${context.getHandler().name}().`);
+            throw new common_1.UnauthorizedException("No AuthService could authenticate the user");
+        }
+        if ("authenticationError" in result) {
+            throw new common_1.UnauthorizedException(result.authenticationError);
+        }
+        if ("systemUser" in result) {
+            request["user"] = result.systemUser;
+        }
+        else {
+            let user;
+            if ("userId" in result) {
+                const userId = result.userId;
+                const userService = this.service.getUserService();
+                if (!userService) {
+                    throw new common_1.UnauthorizedException(`User authenticated by ID but no user service given: ${userId}`);
+                }
+                try {
+                    if (userService.getUserForLogin) {
+                        user = await userService.getUserForLogin(userId);
                     }
-                    catch (e) {
-                        throw new common_1.UnauthorizedException(`Could not get user from UserService: ${userId} - ${e.message}`);
+                    else {
+                        user = await userService.getUser(userId);
                     }
                 }
-                else {
-                    user = result.user;
+                catch (e) {
+                    throw new common_1.UnauthorizedException(`Could not get user from UserService: ${userId} - ${e.message}`);
                 }
-                request["user"] = yield this.service.createCurrentUser(user, request);
             }
-            return true;
-        });
+            else {
+                user = result.user;
+            }
+            request["user"] = await this.service.createCurrentUser(user, request);
+        }
+        return true;
     }
-    getAuthenticatedUserResult(request) {
-        return __awaiter(this, void 0, void 0, function* () {
-            for (const authService of this.authServices) {
-                const result = yield authService.authenticateUser(request);
-                if (result && result !== auth_service_interface_1.SKIP_AUTH_SERVICE)
-                    return result;
+    async getAuthenticatedUserResult(request) {
+        for (const authService of this.authServices) {
+            const result = await authService.authenticateUser(request);
+            if (result && result !== auth_service_interface_1.SKIP_AUTH_SERVICE) {
+                return result;
             }
-        });
+        }
     }
     // See https://docs.nestjs.com/graphql/other-features#execute-enhancers-at-the-field-resolver-level
     isResolvingGraphQLField(context) {

package/lib/auth/guards/comet.guard.js.map

@@ -1 +1 @@
-{"version":3,"file":"comet.guard.js","sourceRoot":"","sources":["../../../src/auth/guards/comet.guard.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"comet.guard.js","sourceRoot":"","sources":["../../../src/auth/guards/comet.guard.ts"],"names":[],"mappings":"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"}

package/lib/auth/resolver/auth.resolver.js

@@ -11,15 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -43,33 +34,27 @@ function createAuthResolver(config) {
             this.accessControlService = accessControlService;
             this.service = service;
         }
-        currentUser(user) {
-            return __awaiter(this, void 0, void 0, function* () {
-                return user;
-            });
+        async currentUser(user) {
+            return user;
         }
-        currentUserSignOut(req) {
-            return __awaiter(this, void 0, void 0, function* () {
-                let signOutUrl = (config === null || config === void 0 ? void 0 : config.postLogoutRedirectUri) || "/";
-                if (req.headers["authorization"] && (config === null || config === void 0 ? void 0 : config.endSessionEndpoint)) {
-                    const url = new URL(config.endSessionEndpoint);
-                    url.search = new URLSearchParams({
-                        id_token_hint: req.headers["authorization"].substring(7),
-                        post_logout_redirect_uri: signOutUrl,
-                    }).toString();
-                    signOutUrl = url.toString();
-                }
-                return signOutUrl;
-            });
+        async currentUserSignOut(req) {
+            let signOutUrl = config?.postLogoutRedirectUri || "/";
+            if (req.headers["authorization"] && config?.endSessionEndpoint) {
+                const url = new URL(config.endSessionEndpoint);
+                url.search = new URLSearchParams({
+                    id_token_hint: req.headers["authorization"].substring(7),
+                    post_logout_redirect_uri: signOutUrl,
+                }).toString();
+                signOutUrl = url.toString();
+            }
+            return signOutUrl;
         }
         permissionsForScope(user, scope) {
             return user.permissions.map((p) => p.permission).filter((permission) => this.accessControlService.isAllowed(user, permission, scope));
         }
-        allowedContentScopes(user) {
-            return __awaiter(this, void 0, void 0, function* () {
-                const allowedContentScopes = user.permissions.flatMap((p) => p.contentScopes);
-                return (yield this.service.getAvailableContentScopes()).filter((contentScopeWithLabel) => allowedContentScopes.some((allowedContentScope) => (0, lodash_isequal_1.default)(contentScopeWithLabel.scope, allowedContentScope)));
-            });
+        async allowedContentScopes(user) {
+            const allowedContentScopes = user.permissions.flatMap((p) => p.contentScopes);
+            return (await this.service.getAvailableContentScopes()).filter((contentScopeWithLabel) => allowedContentScopes.some((allowedContentScope) => (0, lodash_isequal_1.default)(contentScopeWithLabel.scope, allowedContentScope)));
         }
     };
     __decorate([

package/lib/auth/resolver/auth.resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.resolver.js","sourceRoot":"","sources":["../../../src/auth/resolver/auth.resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auth.resolver.js","sourceRoot":"","sources":["../../../src/auth/resolver/auth.resolver.ts"],"names":[],"mappings":"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"}

package/lib/auth/services/basic.auth-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"basic.auth-service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/basic.auth-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,OAAO,EAAE,sBAAsB,EAA2C,MAAM,gCAAgC,CAAC;AAEjH,UAAU,sBAAsB;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,wBAAgB,sBAAsB,CAAC,EAAE,QAAQ,EAAE,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,EAAE,EAAE,sBAAsB;;kCAMvF,OAAO,GAAG,sBAAsB;;EAajE"}
+{"version":3,"file":"basic.auth-service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/basic.auth-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,OAAO,EAAE,sBAAsB,EAA2C,MAAM,gCAAgC,CAAC;AAEjH,UAAU,sBAAsB;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,wBAAgB,sBAAsB,CAAC,EAAE,QAAQ,EAAE,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,EAAE,EAAE,sBAAsB;;kCAUvF,OAAO,GAAG,sBAAsB;;EAmBjE"}

package/lib/auth/services/basic.auth-service.js

@@ -10,21 +10,25 @@ exports.createBasicAuthService = createBasicAuthService;
 const common_1 = require("@nestjs/common");
 const auth_service_interface_1 = require("../util/auth-service.interface");
 function createBasicAuthService({ username: requiredUsername, password: requiredPassword }) {
-    if (requiredUsername === "")
+    if (requiredUsername === "") {
         throw new Error(`username for BasicAuthService must not be empty`);
-    if (requiredPassword === "")
+    }
+    if (requiredPassword === "") {
         throw new Error(`password for BasicAuthService (username "${requiredUsername}") must not be empty`);
+    }
     let BasicAuthService = class BasicAuthService {
         authenticateUser(request) {
-            var _a, _b;
-            const [type, token] = (_b = (_a = request.header("authorization")) === null || _a === void 0 ? void 0 : _a.split(" ")) !== null && _b !== void 0 ? _b : [];
-            if (type !== "Basic")
+            const [type, token] = request.header("authorization")?.split(" ") ?? [];
+            if (type !== "Basic") {
                 return auth_service_interface_1.SKIP_AUTH_SERVICE;
+            }
             const [username, password] = Buffer.from(token, "base64").toString("ascii").split(":");
-            if (username !== requiredUsername)
+            if (username !== requiredUsername) {
                 return auth_service_interface_1.SKIP_AUTH_SERVICE;
-            if (password !== requiredPassword)
+            }
+            if (password !== requiredPassword) {
                 return { authenticationError: `Wrong password for Basic Auth user "${username}".` };
+            }
             return { systemUser: username };
         }
     };

package/lib/auth/services/basic.auth-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"basic.auth-service.js","sourceRoot":"","sources":["../../../src/auth/services/basic.auth-service.ts"],"names":[],"mappings":";;;;;;;;AAUA,wDAmBC;AA7BD,2CAA4C;AAG5C,2EAAiH;AAOjH,SAAgB,sBAAsB,CAAC,EAAE,QAAQ,EAAE,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,EAA0B;IACrH,IAAI,gBAAgB,KAAK,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;IAChG,IAAI,gBAAgB,KAAK,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,4CAA4C,gBAAgB,sBAAsB,CAAC,CAAC;IAGjI,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;QAClB,gBAAgB,CAAC,OAAgB;;YAC7B,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,MAAA,MAAA,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,0CAAE,KAAK,CAAC,GAAG,CAAC,mCAAI,EAAE,CAAC;YACxE,IAAI,IAAI,KAAK,OAAO;gBAAE,OAAO,0CAAiB,CAAC;YAE/C,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACvF,IAAI,QAAQ,KAAK,gBAAgB;gBAAE,OAAO,0CAAiB,CAAC;YAE5D,IAAI,QAAQ,KAAK,gBAAgB;gBAAE,OAAO,EAAE,mBAAmB,EAAE,uCAAuC,QAAQ,IAAI,EAAE,CAAC;YAEvH,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC;QACpC,CAAC;KACJ,CAAA;IAZK,gBAAgB;QADrB,IAAA,mBAAU,GAAE;OACP,gBAAgB,CAYrB;IACD,OAAO,gBAAgB,CAAC;AAC5B,CAAC"}
+{"version":3,"file":"basic.auth-service.js","sourceRoot":"","sources":["../../../src/auth/services/basic.auth-service.ts"],"names":[],"mappings":";;;;;;;;AAUA,wDA6BC;AAvCD,2CAA4C;AAG5C,2EAAiH;AAOjH,SAAgB,sBAAsB,CAAC,EAAE,QAAQ,EAAE,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,EAA0B;IACrH,IAAI,gBAAgB,KAAK,EAAE,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;IACvE,CAAC;IACD,IAAI,gBAAgB,KAAK,EAAE,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,4CAA4C,gBAAgB,sBAAsB,CAAC,CAAC;IACxG,CAAC;IAGD,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;QAClB,gBAAgB,CAAC,OAAgB;YAC7B,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YACxE,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;gBACnB,OAAO,0CAAiB,CAAC;YAC7B,CAAC;YAED,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACvF,IAAI,QAAQ,KAAK,gBAAgB,EAAE,CAAC;gBAChC,OAAO,0CAAiB,CAAC;YAC7B,CAAC;YAED,IAAI,QAAQ,KAAK,gBAAgB,EAAE,CAAC;gBAChC,OAAO,EAAE,mBAAmB,EAAE,uCAAuC,QAAQ,IAAI,EAAE,CAAC;YACxF,CAAC;YAED,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC;QACpC,CAAC;KACJ,CAAA;IAlBK,gBAAgB;QADrB,IAAA,mBAAU,GAAE;OACP,gBAAgB,CAkBrB;IACD,OAAO,gBAAgB,CAAC;AAC5B,CAAC"}

package/lib/auth/services/jwt.auth-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jwt.auth-service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/jwt.auth-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,EAAc,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE3D,OAAO,OAAuB,MAAM,UAAU,CAAC;AAG/C,OAAO,EAAE,IAAI,EAAE,MAAM,wCAAwC,CAAC;AAC9D,OAAO,EAA0B,oBAAoB,EAAqB,MAAM,gCAAgC,CAAC;AAGjH,MAAM,MAAM,UAAU,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CAAC;AAEhD,KAAK,gBAAgB,GAAG,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAElE,MAAM,WAAW,yBAAyB;IACtC,gBAAgB,EAAE,gBAAgB,CAAC;CACtC;AAED,MAAM,WAAW,qBAAqB;IAClC,WAAW,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC;IAC9B,aAAa,CAAC,EAAE,gBAAgB,CAAC;IACjC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;OAEG;IACH,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC,yBAAyB,CAAC,CAAC;IACtE;;OAEG;IACH,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACrC;AAED,wBAAgB,oBAAoB,CAAC,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,OAAO,EAAE,EAAE,qBAAqB,GAAG,IAAI,CAAC,oBAAoB,CAAC,CA4ElI"}
+{"version":3,"file":"jwt.auth-service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/jwt.auth-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,EAAc,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE3D,OAAO,OAAuB,MAAM,UAAU,CAAC;AAG/C,OAAO,EAAE,IAAI,EAAE,MAAM,wCAAwC,CAAC;AAC9D,OAAO,EAA0B,oBAAoB,EAAqB,MAAM,gCAAgC,CAAC;AAGjH,MAAM,MAAM,UAAU,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CAAC;AAEhD,KAAK,gBAAgB,GAAG,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAElE,MAAM,WAAW,yBAAyB;IACtC,gBAAgB,EAAE,gBAAgB,CAAC;CACtC;AAED,MAAM,WAAW,qBAAqB;IAClC,WAAW,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC;IAC9B,aAAa,CAAC,EAAE,gBAAgB,CAAC;IACjC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;OAEG;IACH,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC,yBAAyB,CAAC,CAAC;IACtE;;OAEG;IACH,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACrC;AAED,wBAAgB,oBAAoB,CAAC,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,OAAO,EAAE,EAAE,qBAAqB,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAoFlI"}

package/lib/auth/services/jwt.auth-service.js

@@ -8,26 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createJwtAuthService = createJwtAuthService;
 const common_1 = require("@nestjs/common");
@@ -36,76 +16,74 @@ const jwt_1 = require("@nestjs/jwt");
 const jwks_rsa_1 = require("jwks-rsa");
 const is_injectable_service_helper_1 = require("../../common/helper/is-injectable-service.helper");
 const auth_service_interface_1 = require("../util/auth-service.interface");
-function createJwtAuthService(_a) {
-    var { jwksOptions, verifyOptions } = _a, options = __rest(_a, ["jwksOptions", "verifyOptions"]);
+function createJwtAuthService({ jwksOptions, verifyOptions, ...options }) {
     let JwtAuthService = class JwtAuthService {
         constructor(jwtService, moduleRef) {
             this.jwtService = jwtService;
             this.moduleRef = moduleRef;
-            if (jwksOptions)
+            if (jwksOptions) {
                 this.jwksClient = new jwks_rsa_1.JwksClient(jwksOptions);
+            }
         }
-        authenticateUser(request) {
-            return __awaiter(this, void 0, void 0, function* () {
-                const token = this.extractTokenFromRequest(request);
-                if (!token)
-                    return auth_service_interface_1.SKIP_AUTH_SERVICE;
-                if (this.jwksClient) {
-                    if (!verifyOptions)
-                        verifyOptions = {};
-                    verifyOptions.secret = yield this.loadSecretFromJwks(token);
-                }
-                if (!(verifyOptions === null || verifyOptions === void 0 ? void 0 : verifyOptions.secret)) {
-                    throw new Error("secret or public key must be provided");
-                }
-                let jwt;
-                try {
-                    jwt = yield this.jwtService.verifyAsync(token, verifyOptions);
-                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                }
-                catch (e) {
-                    if (e.name === "JsonWebTokenError" || e.name == "TokenExpiredError") {
-                        return { authenticationError: e.message };
-                    }
-                    throw e;
-                }
-                if (options.convertJwtToUser && options.shouldInvokeUserService) {
-                    throw new Error("Cannot use both `convertJwtToUser` and `shouldInvokeUserService` options simultaneously");
-                }
-                if (options.convertJwtToUser) {
-                    if ((0, is_injectable_service_helper_1.isInjectableService)(options.convertJwtToUser)) {
-                        const service = this.moduleRef.get(options.convertJwtToUser, { strict: false });
-                        return { user: yield service.convertJwtToUser(jwt) };
-                    }
-                    return { user: yield options.convertJwtToUser(jwt) };
-                }
-                if (typeof jwt.sub !== "string" || !jwt.sub) {
-                    return { authenticationError: "No sub found in JWT. Please implement `convertJwtToUser`" };
+        async authenticateUser(request) {
+            const token = this.extractTokenFromRequest(request);
+            if (!token) {
+                return auth_service_interface_1.SKIP_AUTH_SERVICE;
+            }
+            if (this.jwksClient) {
+                if (!verifyOptions) {
+                    verifyOptions = {};
                 }
-                if (options.shouldInvokeUserService) {
-                    return { userId: jwt.sub };
+                verifyOptions.secret = await this.loadSecretFromJwks(token);
+            }
+            if (!verifyOptions?.secret) {
+                throw new Error("secret or public key must be provided");
+            }
+            let jwt;
+            try {
+                jwt = await this.jwtService.verifyAsync(token, verifyOptions);
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            }
+            catch (e) {
+                if (e.name === "JsonWebTokenError" || e.name == "TokenExpiredError") {
+                    return { authenticationError: e.message };
                 }
-                if (typeof jwt.name === "string" && typeof jwt.email === "string") {
-                    return { user: { id: jwt.sub, name: jwt.name, email: jwt.email } };
+                throw e;
+            }
+            if (options.convertJwtToUser && options.shouldInvokeUserService) {
+                throw new Error("Cannot use both `convertJwtToUser` and `shouldInvokeUserService` options simultaneously");
+            }
+            if (options.convertJwtToUser) {
+                if ((0, is_injectable_service_helper_1.isInjectableService)(options.convertJwtToUser)) {
+                    const service = this.moduleRef.get(options.convertJwtToUser, { strict: false });
+                    return { user: await service.convertJwtToUser(jwt) };
                 }
+                return { user: await options.convertJwtToUser(jwt) };
+            }
+            if (typeof jwt.sub !== "string" || !jwt.sub) {
+                return { authenticationError: "No sub found in JWT. Please implement `convertJwtToUser`" };
+            }
+            if (options.shouldInvokeUserService) {
                 return { userId: jwt.sub };
-            });
+            }
+            if (typeof jwt.name === "string" && typeof jwt.email === "string") {
+                return { user: { id: jwt.sub, name: jwt.name, email: jwt.email } };
+            }
+            return { userId: jwt.sub };
         }
         extractTokenFromRequest(request) {
-            var _a, _b;
             if (options.tokenHeaderName) {
                 return request.header(options.tokenHeaderName);
             }
-            const [type, token] = (_b = (_a = request.header("authorization")) === null || _a === void 0 ? void 0 : _a.split(" ")) !== null && _b !== void 0 ? _b : [];
+            const [type, token] = request.header("authorization")?.split(" ") ?? [];
             return type === "Bearer" ? token : undefined;
         }
-        loadSecretFromJwks(token) {
-            return __awaiter(this, void 0, void 0, function* () {
-                if (!this.jwksClient)
-                    throw new Error("jwksOptions.jwksUri not set");
-                const jwt = this.jwtService.decode(token, { complete: true });
-                return (yield this.jwksClient.getSigningKey(jwt.header.kid)).getPublicKey();
-            });
+        async loadSecretFromJwks(token) {
+            if (!this.jwksClient) {
+                throw new Error("jwksOptions.jwksUri not set");
+            }
+            const jwt = this.jwtService.decode(token, { complete: true });
+            return (await this.jwksClient.getSigningKey(jwt.header.kid)).getPublicKey();
         }
     };
     JwtAuthService = __decorate([

package/lib/auth/services/jwt.auth-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"jwt.auth-service.js","sourceRoot":"","sources":["../../../src/auth/services/jwt.auth-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"jwt.auth-service.js","sourceRoot":"","sources":["../../../src/auth/services/jwt.auth-service.ts"],"names":[],"mappings":"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"}

package/lib/auth/services/site-preview.auth-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"site-preview.auth-service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/site-preview.auth-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAIlD,OAAO,EAA0B,oBAAoB,EAAqB,MAAM,gCAAgC,CAAC;AAEjH,MAAM,WAAW,4BAA4B;IACzC,iBAAiB,EAAE,MAAM,CAAC;CAC7B;AAED,wBAAgB,4BAA4B,CAAC,EAAE,iBAAiB,EAAE,EAAE,4BAA4B,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAkC5H"}
+{"version":3,"file":"site-preview.auth-service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/site-preview.auth-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAIlD,OAAO,EAA0B,oBAAoB,EAAqB,MAAM,gCAAgC,CAAC;AAEjH,MAAM,WAAW,4BAA4B;IACzC,iBAAiB,EAAE,MAAM,CAAC;CAC7B;AAED,wBAAgB,4BAA4B,CAAC,EAAE,iBAAiB,EAAE,EAAE,4BAA4B,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAoC5H"}