@darraghor/nest-backend-libs 2.30.0 → 2.31.0

package/dist/authorization/config/AuthConfigurationService.d.ts

@@ -5,4 +5,5 @@ export declare class AuthConfigurationService extends ValidatedConfigurationServ
     constructor(configService: ConfigService);
     get auth0Audience(): string;
     get auth0Domain(): string;
+    get superUserIds(): string[];
 }

package/dist/authorization/config/AuthConfigurationService.js

@@ -10,7 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { Injectable } from "@nestjs/common";
 import { ConfigService } from "@nestjs/config";
-import { IsDefined, IsString } from "class-validator";
+import { IsArray, IsDefined, IsString } from "class-validator";
 import { ValidatedConfigurationService } from "../../configuration/ValidatedConfigurationService.js";
 let AuthConfigurationService = class AuthConfigurationService extends ValidatedConfigurationService {
     configService;
@@ -24,6 +24,16 @@ let AuthConfigurationService = class AuthConfigurationService extends ValidatedC
     get auth0Domain() {
         return this.configService.get("auth.auth0Domain");
     }
+    get superUserIds() {
+        const ids = this.configService.get("auth.superUserIds");
+        if (ids === undefined) {
+            return [];
+        }
+        return ids
+            .split(",")
+            .map((id) => id.trim())
+            .filter((id) => id !== "");
+    }
 };
 __decorate([
     IsDefined(),
@@ -37,6 +47,12 @@ __decorate([
     __metadata("design:type", String),
     __metadata("design:paramtypes", [])
 ], AuthConfigurationService.prototype, "auth0Domain", null);
+__decorate([
+    IsDefined(),
+    IsArray(),
+    __metadata("design:type", Array),
+    __metadata("design:paramtypes", [])
+], AuthConfigurationService.prototype, "superUserIds", null);
 AuthConfigurationService = __decorate([
     Injectable(),
     __metadata("design:paramtypes", [ConfigService])

package/dist/authorization/config/AuthConfigurationService.js.map

@@ -1 +1 @@
-{"version":3,"file":"AuthConfigurationService.js","sourceRoot":"","sources":["../../../src/authorization/config/AuthConfigurationService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,6DAA6D;AAC7D,OAAO,EAAC,UAAU,EAAC,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAC,SAAS,EAAE,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAC,6BAA6B,EAAC,MAAM,sDAAsD,CAAC;AAG5F,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,6BAA6B;IACnD;IAApB,YAAoB,aAA4B;QAC5C,KAAK,EAAE,CAAC;QADQ,kBAAa,GAAb,aAAa,CAAe;IAEhD,CAAC;IAED,IAEI,aAAa;QACb,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,oBAAoB,CAAE,CAAC;IACjE,CAAC;IAED,IAEI,WAAW;QACX,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,kBAAkB,CAAE,CAAC;IAC/D,CAAC;CACJ,CAAA;AAXG;IAAC,SAAS,EAAE;IACX,QAAQ,EAAE;;;6DAGV;AAED;IAAC,SAAS,EAAE;IACX,QAAQ,EAAE;;;2DAGV;AAfQ,wBAAwB;IADpC,UAAU,EAAE;qCAE0B,aAAa;GADvC,wBAAwB,CAgBpC;SAhBY,wBAAwB"}
+{"version":3,"file":"AuthConfigurationService.js","sourceRoot":"","sources":["../../../src/authorization/config/AuthConfigurationService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,6DAA6D;AAC7D,OAAO,EAAC,UAAU,EAAC,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAC,6BAA6B,EAAC,MAAM,sDAAsD,CAAC;AAG5F,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,6BAA6B;IACnD;IAApB,YAAoB,aAA4B;QAC5C,KAAK,EAAE,CAAC;QADQ,kBAAa,GAAb,aAAa,CAAe;IAEhD,CAAC;IAED,IAEI,aAAa;QACb,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,oBAAoB,CAAE,CAAC;IACjE,CAAC;IAED,IAEI,WAAW;QACX,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,kBAAkB,CAAE,CAAC;IAC/D,CAAC;IAED,IAEI,YAAY;QACZ,MAAM,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,mBAAmB,CAAE,CAAC;QACjE,IAAI,GAAG,KAAK,SAAS,EAAE;YACnB,OAAO,EAAE,CAAC;SACb;QACD,OAAO,GAAG;aACL,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;aACtB,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IACnC,CAAC;CACJ,CAAA;AAxBG;IAAC,SAAS,EAAE;IACX,QAAQ,EAAE;;;6DAGV;AAED;IAAC,SAAS,EAAE;IACX,QAAQ,EAAE;;;2DAGV;AAED;IAAC,SAAS,EAAE;IACX,OAAO,EAAE;;;4DAUT;AA5BQ,wBAAwB;IADpC,UAAU,EAAE;qCAE0B,aAAa;GADvC,wBAAwB,CA6BpC;SA7BY,wBAAwB"}

package/dist/authorization/config/AuthConfigurationVariables.d.ts

@@ -1,8 +1,10 @@
 declare const _default: (() => {
     auth0Domain: string | undefined;
     auth0audience: string | undefined;
+    superUserIds: string | undefined;
 }) & import("@nestjs/config").ConfigFactoryKeyHost<{
     auth0Domain: string | undefined;
     auth0audience: string | undefined;
+    superUserIds: string | undefined;
 }>;
 export default _default;

package/dist/authorization/config/AuthConfigurationVariables.js

@@ -2,5 +2,6 @@ import { registerAs } from "@nestjs/config";
 export default registerAs("auth", () => ({
     auth0Domain: process.env.AUTH0_DOMAIN,
     auth0audience: process.env.AUTH0_AUDIENCE,
+    superUserIds: process.env.SUPER_USER_IDS,
 }));
 //# sourceMappingURL=AuthConfigurationVariables.js.map

package/dist/authorization/config/AuthConfigurationVariables.js.map

@@ -1 +1 @@
-{"version":3,"file":"AuthConfigurationVariables.js","sourceRoot":"","sources":["../../../src/authorization/config/AuthConfigurationVariables.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,gBAAgB,CAAC;AAE1C,eAAe,UAAU,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IACrC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY;IACrC,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;CAC5C,CAAC,CAAC,CAAC"}
+{"version":3,"file":"AuthConfigurationVariables.js","sourceRoot":"","sources":["../../../src/authorization/config/AuthConfigurationVariables.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,gBAAgB,CAAC;AAE1C,eAAe,UAAU,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IACrC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY;IACrC,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;IACzC,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;CAC3C,CAAC,CAAC,CAAC"}

package/dist/authorization/services/UserValidation.service.d.ts

@@ -3,16 +3,20 @@ import { AuthZClientService } from "../../authzclient/authz.service.js";
 import { UserProfile } from "../../authzclient/UserProfile.dto.js";
 import { Invitation } from "../../invitations/entities/invitation.entity.js";
 import { User } from "../../user-internal/entities/user.entity.js";
+import { AuthConfigurationService } from "../config/AuthConfigurationService.js";
 import { AccessToken } from "../models/AccessToken.js";
+import { RequestUser } from "../models/RequestWithUser.js";
 export declare class UserValidationService {
     private userRepository;
     private authzClient;
     private readonly invitationRepository;
+    private readonly config;
     private readonly logger;
-    constructor(userRepository: Repository<User>, authzClient: AuthZClientService, invitationRepository: Repository<Invitation>);
+    constructor(userRepository: Repository<User>, authzClient: AuthZClientService, invitationRepository: Repository<Invitation>, config: AuthConfigurationService);
     getAuth0User(rawAccessToken: string): Promise<UserProfile>;
     validateUserApiKey(apiKey: string): Promise<User | undefined>;
-    validateUser(payload: AccessToken, rawAccessToken: string, invitationId?: string): Promise<User | undefined>;
+    addPermissionsToUser(user: User, authProviderPermissions: string[] | undefined): RequestUser;
+    validateUser(payload: AccessToken, rawAccessToken: string, invitationId?: string): Promise<RequestUser>;
     private findUserForRequest;
     handleInvitedUser(rawAccessToken: string, invitationCode: string): Promise<User>;
     handleNewIndependentUser(foundUser: User | null, rawAccessToken: string): Promise<User>;

package/dist/authorization/services/UserValidation.service.js

@@ -22,15 +22,18 @@ import { Roles } from "../../organisation/dto/RolesEnum.js";
 import { MembershipRole } from "../../organisation/entities/member-role.entity.js";
 import { Organisation } from "../../organisation/entities/organisation.entity.js";
 import { User } from "../../user-internal/entities/user.entity.js";
+import { AuthConfigurationService } from "../config/AuthConfigurationService.js";
 let UserValidationService = UserValidationService_1 = class UserValidationService {
     userRepository;
     authzClient;
     invitationRepository;
+    config;
     logger = new Logger(UserValidationService_1.name);
-    constructor(userRepository, authzClient, invitationRepository) {
+    constructor(userRepository, authzClient, invitationRepository, config) {
         this.userRepository = userRepository;
         this.authzClient = authzClient;
         this.invitationRepository = invitationRepository;
+        this.config = config;
     }
     async getAuth0User(rawAccessToken) {
         const result = await this.authzClient.getUser(rawAccessToken);
@@ -54,10 +57,24 @@ let UserValidationService = UserValidationService_1 = class UserValidationServic
             return undefined;
         return result;
     }
+    addPermissionsToUser(user, authProviderPermissions) {
+        console.debug({ list: this.config.superUserIds }, "super user ids");
+        if (!user?.id) {
+            throw new Error("Unable to authenticate and register a valid user with this auth0 user");
+        }
+        const permissionsSet = new Set(authProviderPermissions || []);
+        if (user.auth0UserId &&
+            this.config.superUserIds.includes(user.auth0UserId)) {
+            permissionsSet.add("read:all");
+            permissionsSet.add("modify:all");
+        }
+        // eslint-disable-next-line sonarjs/prefer-immediate-return
+        return { ...user, permissions: [...permissionsSet] };
+    }
     async validateUser(payload, rawAccessToken, invitationId) {
         if (invitationId) {
             // even though there is commonality here it's easier to treat the invitation path as completely separate
-            return this.handleInvitedUser(rawAccessToken, invitationId);
+            return this.addPermissionsToUser(await this.handleInvitedUser(rawAccessToken, invitationId), payload.permissions);
         }
         // try to find the user and their memberships
         const foundUser = await this.findUserForRequest(payload.sub);
@@ -70,10 +87,11 @@ let UserValidationService = UserValidationService_1 = class UserValidationServic
             foundUser?.memberships !== undefined &&
             foundUser?.memberships !== null &&
             foundUser?.memberships?.length > 0) {
-            return foundUser;
+            return this.addPermissionsToUser(foundUser, payload.permissions);
         }
         // otherwise we need to add a membership to a user
-        return this.handleNewIndependentUser(foundUser, rawAccessToken);
+        const userResult = await this.handleNewIndependentUser(foundUser, rawAccessToken);
+        return this.addPermissionsToUser(userResult, payload.permissions);
     }
     async findUserForRequest(auth0UserId) {
         return await this.userRepository.findOne({
@@ -191,7 +209,8 @@ UserValidationService = UserValidationService_1 = __decorate([
     __param(2, InjectRepository(Invitation)),
     __metadata("design:paramtypes", [Repository,
         AuthZClientService,
-        Repository])
+        Repository,
+        AuthConfigurationService])
 ], UserValidationService);
 export { UserValidationService };
 //# sourceMappingURL=UserValidation.service.js.map

package/dist/authorization/services/UserValidation.service.js.map

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

package/dist/authorization/strategies/authzstrategy.js

@@ -41,14 +41,7 @@ let JwtStrategy = JwtStrategy_1 = class JwtStrategy extends PassportStrategy(Str
             return;
         }
         const invitationId = request.query.invitationId;
-        const userResult = await this.userValidationService.validateUser(payload, rawAccessToken, invitationId);
-        if (!userResult?.id) {
-            throw new Error("Unable to authenticate and register a valid user with this auth0 user");
-        }
-        const withPermissions = { permissions: payload.permissions || [] };
-        // eslint-disable-next-line sonarjs/prefer-immediate-return
-        const rp = { ...userResult, ...withPermissions };
-        return rp;
+        return this.userValidationService.validateUser(payload, rawAccessToken, invitationId);
     }
 };
 JwtStrategy = JwtStrategy_1 = __decorate([

package/dist/authorization/strategies/authzstrategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"authzstrategy.js","sourceRoot":"","sources":["../../../src/authorization/strategies/authzstrategy.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAC,UAAU,EAAE,MAAM,EAAC,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAC,gBAAgB,EAAC,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAC,UAAU,EAAE,QAAQ,EAAC,MAAM,cAAc,CAAC;AAClD,OAAO,EAAC,iBAAiB,EAAC,MAAM,UAAU,CAAC;AAG3C,OAAO,EAAC,wBAAwB,EAAC,MAAM,uCAAuC,CAAC;AAE/E,OAAO,EAAC,qBAAqB,EAAC,MAAM,uCAAuC,CAAC;AAGrE,IAAM,WAAW,mBAAjB,MAAM,WAAY,SAAQ,gBAAgB,CAAC,QAAQ,CAAC;IAGlC;IAFJ,MAAM,GAAG,IAAI,MAAM,CAAC,aAAW,CAAC,IAAI,CAAC,CAAC;IACvD,YACqB,qBAA4C,EAC7D,MAAgC;QAEhC,KAAK,CAAC;YACF,mBAAmB,EAAE,iBAAiB,CAAC;gBACnC,KAAK,EAAE,IAAI;gBACX,SAAS,EAAE,IAAI;gBACf,qBAAqB,EAAE,CAAC;gBACxB,OAAO,EAAE,WAAW,MAAM,CAAC,WAAW,wBAAwB;aACjE,CAAC;YACF,iBAAiB,EAAE,IAAI;YACvB,iJAAiJ;YACjJ,cAAc,EAAE,UAAU,CAAC,2BAA2B,EAAE;YACxD,QAAQ,EAAE,MAAM,CAAC,aAAa;YAC9B,MAAM,EAAE,WAAW,MAAM,CAAC,WAAW,GAAG;YACxC,UAAU,EAAE,CAAC,OAAO,CAAC;SACxB,CAAC,CAAC;QAhBc,0BAAqB,GAArB,qBAAqB,CAAuB;IAiBjE,CAAC;IAED,KAAK,CAAC,QAAQ,CACV,OAAgB,EAChB,OAAoB;QAEpB,MAAM,cAAc,GAChB,UAAU,CAAC,2BAA2B,EAAE,CAAC,OAAO,CAAC,CAAC;QACtD,IAAI,cAAc,KAAK,SAAS,IAAI,cAAc,KAAK,IAAI,EAAE;YACzD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;YACvD,OAAO;SACV;QAED,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,YAAsB,CAAC;QAE1D,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAC5D,OAAO,EACP,cAAc,EACd,YAAY,CACf,CAAC;QACF,IAAI,CAAC,UAAU,EAAE,EAAE,EAAE;YACjB,MAAM,IAAI,KAAK,CACX,uEAAuE,CAC1E,CAAC;SACL;QAED,MAAM,eAAe,GAAG,EAAC,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,EAAE,EAAC,CAAC;QACjE,2DAA2D;QAC3D,MAAM,EAAE,GAAG,EAAC,GAAG,UAAU,EAAE,GAAG,eAAe,EAAgB,CAAC;QAC9D,OAAO,EAAE,CAAC;IACd,CAAC;CACJ,CAAA;AAnDY,WAAW;IADvB,UAAU,EAAE;qCAImC,qBAAqB;QACrD,wBAAwB;GAJ3B,WAAW,CAmDvB;SAnDY,WAAW"}
+{"version":3,"file":"authzstrategy.js","sourceRoot":"","sources":["../../../src/authorization/strategies/authzstrategy.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAC,UAAU,EAAE,MAAM,EAAC,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAC,gBAAgB,EAAC,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAC,UAAU,EAAE,QAAQ,EAAC,MAAM,cAAc,CAAC;AAClD,OAAO,EAAC,iBAAiB,EAAC,MAAM,UAAU,CAAC;AAG3C,OAAO,EAAC,wBAAwB,EAAC,MAAM,uCAAuC,CAAC;AAE/E,OAAO,EAAC,qBAAqB,EAAC,MAAM,uCAAuC,CAAC;AAGrE,IAAM,WAAW,mBAAjB,MAAM,WAAY,SAAQ,gBAAgB,CAAC,QAAQ,CAAC;IAGlC;IAFJ,MAAM,GAAG,IAAI,MAAM,CAAC,aAAW,CAAC,IAAI,CAAC,CAAC;IACvD,YACqB,qBAA4C,EAC7D,MAAgC;QAEhC,KAAK,CAAC;YACF,mBAAmB,EAAE,iBAAiB,CAAC;gBACnC,KAAK,EAAE,IAAI;gBACX,SAAS,EAAE,IAAI;gBACf,qBAAqB,EAAE,CAAC;gBACxB,OAAO,EAAE,WAAW,MAAM,CAAC,WAAW,wBAAwB;aACjE,CAAC;YACF,iBAAiB,EAAE,IAAI;YACvB,iJAAiJ;YACjJ,cAAc,EAAE,UAAU,CAAC,2BAA2B,EAAE;YACxD,QAAQ,EAAE,MAAM,CAAC,aAAa;YAC9B,MAAM,EAAE,WAAW,MAAM,CAAC,WAAW,GAAG;YACxC,UAAU,EAAE,CAAC,OAAO,CAAC;SACxB,CAAC,CAAC;QAhBc,0BAAqB,GAArB,qBAAqB,CAAuB;IAiBjE,CAAC;IAED,KAAK,CAAC,QAAQ,CACV,OAAgB,EAChB,OAAoB;QAEpB,MAAM,cAAc,GAChB,UAAU,CAAC,2BAA2B,EAAE,CAAC,OAAO,CAAC,CAAC;QACtD,IAAI,cAAc,KAAK,SAAS,IAAI,cAAc,KAAK,IAAI,EAAE;YACzD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;YACvD,OAAO;SACV;QAED,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,YAAsB,CAAC;QAE1D,OAAO,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAC1C,OAAO,EACP,cAAc,EACd,YAAY,CACf,CAAC;IACN,CAAC;CACJ,CAAA;AAzCY,WAAW;IADvB,UAAU,EAAE;qCAImC,qBAAqB;QACrD,wBAAwB;GAJ3B,WAAW,CAyCvB;SAzCY,WAAW"}

package/dist/core-config/CoreConfigurationService.d.ts

@@ -9,7 +9,6 @@ export declare class CoreConfigurationService extends ValidatedConfigurationServ
     get webPort(): number;
     get appTitle(): string;
     get frontEndAppUrl(): string;
-    get marketingAppUrl(): string;
     get nodeEnv(): string;
     get bullQueueHost(): string;
 }

package/dist/core-config/CoreConfigurationService.js

@@ -37,9 +37,6 @@ let CoreConfigurationService = class CoreConfigurationService extends ValidatedC
     get frontEndAppUrl() {
         return this.configService.get("core.frontEndAppUrl");
     }
-    get marketingAppUrl() {
-        return this.configService.get("core.marketingAppUrl");
-    }
     get nodeEnv() {
         return this.configService.get("core.nodeEnv");
     }
@@ -83,12 +80,6 @@ __decorate([
     __metadata("design:type", String),
     __metadata("design:paramtypes", [])
 ], CoreConfigurationService.prototype, "frontEndAppUrl", null);
-__decorate([
-    IsDefined(),
-    IsString(),
-    __metadata("design:type", String),
-    __metadata("design:paramtypes", [])
-], CoreConfigurationService.prototype, "marketingAppUrl", null);
 __decorate([
     IsDefined(),
     IsString(),

package/dist/core-config/CoreConfigurationService.js.map

@@ -1 +1 @@
-{"version":3,"file":"CoreConfigurationService.js","sourceRoot":"","sources":["../../src/core-config/CoreConfigurationService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,6DAA6D;AAC7D,OAAO,EAAC,UAAU,EAAC,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAC,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAC,6BAA6B,EAAC,MAAM,mDAAmD,CAAC;AAGzF,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,6BAA6B;IACnD;IAApB,YAAoB,aAA4B;QAC5C,KAAK,EAAE,CAAC;QADQ,kBAAa,GAAb,aAAa,CAAe;IAEhD,CAAC;IAED,IAEI,qBAAqB;QACrB,OAAO,CACH,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,4BAA4B,CAAC;YAC5D,MAAM,CACT,CAAC;IACN,CAAC;IAED,IAEI,mCAAmC;QACnC,OAAO,CACH,IAAI,CAAC,aAAa,CAAC,GAAG,CAClB,0CAA0C,CAC7C,KAAK,MAAM,CACf,CAAC;IACN,CAAC;IAED,IAEI,iBAAiB;QACjB,OAAO,CACH,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,wBAAwB,CAAC,KAAK,MAAM,CACtE,CAAC;IACN,CAAC;IAED,IAEI,OAAO;QACP,OAAO,MAAM,CAAC,QAAQ,CAClB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,cAAc,CAAE,EAC/C,EAAE,CACL,CAAC;IACN,CAAC;IAED,IAEI,QAAQ;QACR,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,eAAe,CAAE,CAAC;IAC5D,CAAC;IAED,IAEI,cAAc;QACd,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,qBAAqB,CAAE,CAAC;IAClE,CAAC;IACD,IAEI,eAAe;QACf,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,sBAAsB,CAAE,CAAC;IACnE,CAAC;IAED,IAEI,OAAO;QACP,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,cAAc,CAAE,CAAC;IAC3D,CAAC;IAED,IAEI,aAAa;QACb,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,oBAAoB,CAAE,CAAC;IACjE,CAAC;CACJ,CAAA;AAhEG;IAAC,SAAS,EAAE;IACX,SAAS,EAAE;;;qEAMX;AAED;IAAC,SAAS,EAAE;IACX,SAAS,EAAE;;;mFAOX;AAED;IAAC,SAAS,EAAE;IACX,SAAS,EAAE;;;iEAKX;AAED;IAAC,SAAS,EAAE;IACX,KAAK,EAAE;;;uDAMP;AAED;IAAC,SAAS,EAAE;IACX,QAAQ,EAAE;;;wDAGV;AAED;IAAC,SAAS,EAAE;IACX,QAAQ,EAAE;;;8DAGV;AACD;IAAC,SAAS,EAAE;IACX,QAAQ,EAAE;;;+DAGV;AAED;IAAC,SAAS,EAAE;IACX,QAAQ,EAAE;;;uDAGV;AAED;IAAC,SAAS,EAAE;IACX,QAAQ,EAAE;;;6DAGV;AApEQ,wBAAwB;IADpC,UAAU,EAAE;qCAE0B,aAAa;GADvC,wBAAwB,CAqEpC;SArEY,wBAAwB"}
+{"version":3,"file":"CoreConfigurationService.js","sourceRoot":"","sources":["../../src/core-config/CoreConfigurationService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,6DAA6D;AAC7D,OAAO,EAAC,UAAU,EAAC,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAC,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAC,6BAA6B,EAAC,MAAM,mDAAmD,CAAC;AAGzF,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,6BAA6B;IACnD;IAApB,YAAoB,aAA4B;QAC5C,KAAK,EAAE,CAAC;QADQ,kBAAa,GAAb,aAAa,CAAe;IAEhD,CAAC;IAED,IAEI,qBAAqB;QACrB,OAAO,CACH,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,4BAA4B,CAAC;YAC5D,MAAM,CACT,CAAC;IACN,CAAC;IAED,IAEI,mCAAmC;QACnC,OAAO,CACH,IAAI,CAAC,aAAa,CAAC,GAAG,CAClB,0CAA0C,CAC7C,KAAK,MAAM,CACf,CAAC;IACN,CAAC;IAED,IAEI,iBAAiB;QACjB,OAAO,CACH,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,wBAAwB,CAAC,KAAK,MAAM,CACtE,CAAC;IACN,CAAC;IAED,IAEI,OAAO;QACP,OAAO,MAAM,CAAC,QAAQ,CAClB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,cAAc,CAAE,EAC/C,EAAE,CACL,CAAC;IACN,CAAC;IAED,IAEI,QAAQ;QACR,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,eAAe,CAAE,CAAC;IAC5D,CAAC;IAED,IAEI,cAAc;QACd,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,qBAAqB,CAAE,CAAC;IAClE,CAAC;IAED,IAEI,OAAO;QACP,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,cAAc,CAAE,CAAC;IAC3D,CAAC;IAED,IAEI,aAAa;QACb,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,oBAAoB,CAAE,CAAC;IACjE,CAAC;CACJ,CAAA;AA3DG;IAAC,SAAS,EAAE;IACX,SAAS,EAAE;;;qEAMX;AAED;IAAC,SAAS,EAAE;IACX,SAAS,EAAE;;;mFAOX;AAED;IAAC,SAAS,EAAE;IACX,SAAS,EAAE;;;iEAKX;AAED;IAAC,SAAS,EAAE;IACX,KAAK,EAAE;;;uDAMP;AAED;IAAC,SAAS,EAAE;IACX,QAAQ,EAAE;;;wDAGV;AAED;IAAC,SAAS,EAAE;IACX,QAAQ,EAAE;;;8DAGV;AAED;IAAC,SAAS,EAAE;IACX,QAAQ,EAAE;;;uDAGV;AAED;IAAC,SAAS,EAAE;IACX,QAAQ,EAAE;;;6DAGV;AA/DQ,wBAAwB;IADpC,UAAU,EAAE;qCAE0B,aAAa;GADvC,wBAAwB,CAgEpC;SAhEY,wBAAwB"}

package/dist/organisation/entities/organisation.entity.d.ts

@@ -8,5 +8,5 @@ export declare class Organisation {
     name: string;
     createdDate: Date;
     updateDate: Date;
-    deletedDate: Date;
+    deletedDate?: Date;
 }

package/dist/organisation/entities/organisation.entity.js

@@ -7,7 +7,7 @@ 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);
 };
-import { ApiProperty } from "@nestjs/swagger";
+import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import { Column, CreateDateColumn, DeleteDateColumn, Entity, Generated, Index, OneToMany, PrimaryGeneratedColumn, UpdateDateColumn, } from "typeorm";
 import { OrganisationMembership } from "../../organisation-memberships/entities/organisation-membership.entity.js";
@@ -68,7 +68,7 @@ __decorate([
 ], Organisation.prototype, "updateDate", void 0);
 __decorate([
     DeleteDateColumn(),
-    ApiProperty(),
+    ApiPropertyOptional(),
     __metadata("design:type", Date)
 ], Organisation.prototype, "deletedDate", void 0);
 Organisation = __decorate([

package/dist/organisation/entities/organisation.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"organisation.entity.js","sourceRoot":"","sources":["../../../src/organisation/entities/organisation.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAC,IAAI,EAAC,MAAM,mBAAmB,CAAC;AAEvC,OAAO,EACH,MAAM,EACN,gBAAgB,EAChB,gBAAgB,EAChB,MAAM,EACN,SAAS,EACT,KAAK,EACL,SAAS,EACT,sBAAsB,EACtB,gBAAgB,GACnB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAC,sBAAsB,EAAC,MAAM,2EAA2E,CAAC;AACjH,OAAO,EAAC,8BAA8B,EAAC,MAAM,+EAA+E,CAAC;AAGtH,IAAM,YAAY,GAAlB,MAAM,YAAY;IAGrB,EAAE,CAAU;IASL,IAAI,CAAU;IAMrB,WAAW,CAA4B;IAUvC,mBAAmB,CAAoC;IAIvD,IAAI,CAAU;IAId,WAAW,CAAQ;IAInB,UAAU,CAAQ;IAIlB,WAAW,CAAQ;CACtB,CAAA;AA5CG;IAAC,sBAAsB,EAAE;IACxB,WAAW,EAAE;;wCACF;AAEZ;IAAC,MAAM,CAAC,MAAM,EAAE;QACZ,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,GAAG,EAAE,CAAC,oBAAoB;KACtC,CAAC;IACD,SAAS,CAAC,MAAM,CAAC;IACjB,WAAW,EAAE;IACb,KAAK,EAAE;;0CACa;AAErB;IAAC,SAAS,CAAC,GAAG,EAAE,CAAC,sBAAsB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,YAAY,EAAE;QAC9D,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;KAChC,CAAC;IACD,IAAI,CAAC,GAAG,EAAE,CAAC,sBAAsB,CAAC;;iDACI;AAEvC;IAAC,SAAS,CACN,GAAG,EAAE,CAAC,8BAA8B,EACpC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,YAAY,EACzB;QACI,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;KAChC,CACJ;IACA,IAAI,CAAC,GAAG,EAAE,CAAC,8BAA8B,CAAC;;yDACY;AAEvD;IAAC,MAAM,EAAE;IACR,WAAW,EAAE;;0CACA;AAEd;IAAC,gBAAgB,EAAE;IAClB,WAAW,EAAE;8BACA,IAAI;iDAAC;AAEnB;IAAC,gBAAgB,EAAE;IAClB,WAAW,EAAE;8BACD,IAAI;gDAAC;AAElB;IAAC,gBAAgB,EAAE;IAClB,WAAW,EAAE;8BACA,IAAI;iDAAC;AA5CV,YAAY;IADxB,MAAM,EAAE;GACI,YAAY,CA6CxB;SA7CY,YAAY"}
+{"version":3,"file":"organisation.entity.js","sourceRoot":"","sources":["../../../src/organisation/entities/organisation.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,WAAW,EAAE,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAC,IAAI,EAAC,MAAM,mBAAmB,CAAC;AAEvC,OAAO,EACH,MAAM,EACN,gBAAgB,EAChB,gBAAgB,EAChB,MAAM,EACN,SAAS,EACT,KAAK,EACL,SAAS,EACT,sBAAsB,EACtB,gBAAgB,GACnB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAC,sBAAsB,EAAC,MAAM,2EAA2E,CAAC;AACjH,OAAO,EAAC,8BAA8B,EAAC,MAAM,+EAA+E,CAAC;AAGtH,IAAM,YAAY,GAAlB,MAAM,YAAY;IAGrB,EAAE,CAAU;IASL,IAAI,CAAU;IAMrB,WAAW,CAA4B;IAUvC,mBAAmB,CAAoC;IAIvD,IAAI,CAAU;IAId,WAAW,CAAQ;IAInB,UAAU,CAAQ;IAIlB,WAAW,CAAQ;CACtB,CAAA;AA5CG;IAAC,sBAAsB,EAAE;IACxB,WAAW,EAAE;;wCACF;AAEZ;IAAC,MAAM,CAAC,MAAM,EAAE;QACZ,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,GAAG,EAAE,CAAC,oBAAoB;KACtC,CAAC;IACD,SAAS,CAAC,MAAM,CAAC;IACjB,WAAW,EAAE;IACb,KAAK,EAAE;;0CACa;AAErB;IAAC,SAAS,CAAC,GAAG,EAAE,CAAC,sBAAsB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,YAAY,EAAE;QAC9D,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;KAChC,CAAC;IACD,IAAI,CAAC,GAAG,EAAE,CAAC,sBAAsB,CAAC;;iDACI;AAEvC;IAAC,SAAS,CACN,GAAG,EAAE,CAAC,8BAA8B,EACpC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,YAAY,EACzB;QACI,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;KAChC,CACJ;IACA,IAAI,CAAC,GAAG,EAAE,CAAC,8BAA8B,CAAC;;yDACY;AAEvD;IAAC,MAAM,EAAE;IACR,WAAW,EAAE;;0CACA;AAEd;IAAC,gBAAgB,EAAE;IAClB,WAAW,EAAE;8BACA,IAAI;iDAAC;AAEnB;IAAC,gBAAgB,EAAE;IAClB,WAAW,EAAE;8BACD,IAAI;gDAAC;AAElB;IAAC,gBAAgB,EAAE;IAClB,mBAAmB,EAAE;8BACR,IAAI;iDAAC;AA5CV,YAAY;IADxB,MAAM,EAAE;GACI,YAAY,CA6CxB;SA7CY,YAAY"}

package/dist/organisation-memberships/entities/organisation-membership.entity.d.ts

@@ -14,5 +14,5 @@ export declare class OrganisationMembership {
     roles?: MembershipRole[];
     createdDate: Date;
     updateDate: Date;
-    deletedDate: Date;
+    deletedDate?: Date;
 }

package/dist/organisation-memberships/entities/organisation-membership.entity.js

@@ -101,7 +101,7 @@ __decorate([
 ], OrganisationMembership.prototype, "updateDate", void 0);
 __decorate([
     DeleteDateColumn(),
-    ApiProperty(),
+    ApiPropertyOptional(),
     __metadata("design:type", Date)
 ], OrganisationMembership.prototype, "deletedDate", void 0);
 OrganisationMembership = __decorate([

package/dist/organisation-memberships/entities/organisation-membership.entity.js.map

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

package/dist/organisation-subscriptions/entities/organisation-subscription.entity.d.ts

@@ -15,5 +15,5 @@ export declare class OrganisationSubscriptionRecord {
     organisationId: number;
     createdDate: Date;
     updatedDate: Date;
-    deletedDate: Date;
+    deletedDate?: Date;
 }

package/dist/organisation-subscriptions/entities/organisation-subscription.entity.js

@@ -7,7 +7,7 @@ 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);
 };
-import { ApiProperty } from "@nestjs/swagger";
+import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import { Column, CreateDateColumn, DeleteDateColumn, Entity, Generated, Index, ManyToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn, } from "typeorm";
 import { Organisation } from "../../organisation/entities/organisation.entity.js";
@@ -106,7 +106,7 @@ __decorate([
 ], OrganisationSubscriptionRecord.prototype, "updatedDate", void 0);
 __decorate([
     DeleteDateColumn(),
-    ApiProperty(),
+    ApiPropertyOptional(),
     __metadata("design:type", Date)
 ], OrganisationSubscriptionRecord.prototype, "deletedDate", void 0);
 OrganisationSubscriptionRecord = __decorate([

package/dist/organisation-subscriptions/entities/organisation-subscription.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"organisation-subscription.entity.js","sourceRoot":"","sources":["../../../src/organisation-subscriptions/entities/organisation-subscription.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAC,IAAI,EAAC,MAAM,mBAAmB,CAAC;AAEvC,OAAO,EACH,MAAM,EACN,gBAAgB,EAChB,gBAAgB,EAChB,MAAM,EACN,SAAS,EACT,KAAK,EACL,SAAS,EACT,sBAAsB,EAEtB,UAAU,EACV,gBAAgB,GACnB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAC,YAAY,EAAC,MAAM,oDAAoD,CAAC;AAGzE,IAAM,8BAA8B,GAApC,MAAM,8BAA8B;IAGvC,EAAE,CAAU;IASL,IAAI,CAAU;IAIrB,kBAAkB,CAAU;IAI5B,0BAA0B,CAAU;IAIpC,sBAAsB,CAAU;IAIhC,uBAAuB,CAAU;IAIjC,0BAA0B,CAAU;IAIpC,iBAAiB,CAAU;IAI3B,iBAAiB,CAAU;IAK3B,UAAU,CAAQ;IAGlB,YAAY,CAA0B;IAK/B,cAAc,CAAU;IAI/B,WAAW,CAAQ;IAInB,WAAW,CAAQ;IAInB,WAAW,CAAQ;CACtB,CAAA;AAjEG;IAAC,sBAAsB,EAAE;IACxB,WAAW,EAAE;;0DACF;AAEZ;IAAC,MAAM,CAAC,MAAM,EAAE;QACZ,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,GAAG,EAAE,CAAC,oBAAoB;KACtC,CAAC;IACD,SAAS,CAAC,MAAM,CAAC;IACjB,WAAW,EAAE;IACb,KAAK,EAAE;;4DACa;AAErB;IAAC,MAAM,EAAE;IACR,WAAW,EAAE;;0EACc;AAE5B;IAAC,MAAM,EAAE;IACR,WAAW,EAAE;;kFACsB;AAEpC;IAAC,MAAM,EAAE;IACR,WAAW,EAAE;;8EACkB;AAEhC;IAAC,MAAM,EAAE;IACR,WAAW,EAAE;;+EACmB;AAEjC;IAAC,MAAM,EAAE;IACR,WAAW,EAAE;;kFACsB;AAEpC;IAAC,MAAM,EAAE;IACR,WAAW,EAAE;;yEACa;AAE3B;IAAC,MAAM,EAAE;IACR,WAAW,EAAE;;yEACa;AAE3B;IAAC,MAAM,EAAE;IACR,WAAW,EAAE;IACb,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;8BACJ,IAAI;kEAAC;AAElB;IAAC,SAAS,CAAC,GAAG,EAAE,CAAC,YAAY,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC;;oEAC9B;AAEtC;IAAC,WAAW,EAAE;IACb,MAAM,EAAE;IACR,UAAU,CAAC,CAAC,GAAmC,EAAE,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC;;sEACvC;AAE/B;IAAC,gBAAgB,EAAE;IAClB,WAAW,EAAE;8BACA,IAAI;mEAAC;AAEnB;IAAC,gBAAgB,EAAE;IAClB,WAAW,EAAE;8BACA,IAAI;mEAAC;AAEnB;IAAC,gBAAgB,EAAE;IAClB,WAAW,EAAE;8BACA,IAAI;mEAAC;AAjEV,8BAA8B;IAD1C,MAAM,EAAE;GACI,8BAA8B,CAkE1C;SAlEY,8BAA8B"}
+{"version":3,"file":"organisation-subscription.entity.js","sourceRoot":"","sources":["../../../src/organisation-subscriptions/entities/organisation-subscription.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,WAAW,EAAE,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAC,IAAI,EAAC,MAAM,mBAAmB,CAAC;AAEvC,OAAO,EACH,MAAM,EACN,gBAAgB,EAChB,gBAAgB,EAChB,MAAM,EACN,SAAS,EACT,KAAK,EACL,SAAS,EACT,sBAAsB,EAEtB,UAAU,EACV,gBAAgB,GACnB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAC,YAAY,EAAC,MAAM,oDAAoD,CAAC;AAGzE,IAAM,8BAA8B,GAApC,MAAM,8BAA8B;IAGvC,EAAE,CAAU;IASL,IAAI,CAAU;IAIrB,kBAAkB,CAAU;IAI5B,0BAA0B,CAAU;IAIpC,sBAAsB,CAAU;IAIhC,uBAAuB,CAAU;IAIjC,0BAA0B,CAAU;IAIpC,iBAAiB,CAAU;IAI3B,iBAAiB,CAAU;IAK3B,UAAU,CAAQ;IAGlB,YAAY,CAA0B;IAK/B,cAAc,CAAU;IAI/B,WAAW,CAAQ;IAInB,WAAW,CAAQ;IAInB,WAAW,CAAQ;CACtB,CAAA;AAjEG;IAAC,sBAAsB,EAAE;IACxB,WAAW,EAAE;;0DACF;AAEZ;IAAC,MAAM,CAAC,MAAM,EAAE;QACZ,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,GAAG,EAAE,CAAC,oBAAoB;KACtC,CAAC;IACD,SAAS,CAAC,MAAM,CAAC;IACjB,WAAW,EAAE;IACb,KAAK,EAAE;;4DACa;AAErB;IAAC,MAAM,EAAE;IACR,WAAW,EAAE;;0EACc;AAE5B;IAAC,MAAM,EAAE;IACR,WAAW,EAAE;;kFACsB;AAEpC;IAAC,MAAM,EAAE;IACR,WAAW,EAAE;;8EACkB;AAEhC;IAAC,MAAM,EAAE;IACR,WAAW,EAAE;;+EACmB;AAEjC;IAAC,MAAM,EAAE;IACR,WAAW,EAAE;;kFACsB;AAEpC;IAAC,MAAM,EAAE;IACR,WAAW,EAAE;;yEACa;AAE3B;IAAC,MAAM,EAAE;IACR,WAAW,EAAE;;yEACa;AAE3B;IAAC,MAAM,EAAE;IACR,WAAW,EAAE;IACb,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;8BACJ,IAAI;kEAAC;AAElB;IAAC,SAAS,CAAC,GAAG,EAAE,CAAC,YAAY,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC;;oEAC9B;AAEtC;IAAC,WAAW,EAAE;IACb,MAAM,EAAE;IACR,UAAU,CAAC,CAAC,GAAmC,EAAE,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC;;sEACvC;AAE/B;IAAC,gBAAgB,EAAE;IAClB,WAAW,EAAE;8BACA,IAAI;mEAAC;AAEnB;IAAC,gBAAgB,EAAE;IAClB,WAAW,EAAE;8BACA,IAAI;mEAAC;AAEnB;IAAC,gBAAgB,EAAE;IAClB,mBAAmB,EAAE;8BACR,IAAI;mEAAC;AAjEV,8BAA8B;IAD1C,MAAM,EAAE;GACI,8BAA8B,CAkE1C;SAlEY,8BAA8B"}

package/dist/root-app/core-app.module.js

@@ -42,10 +42,7 @@ let CoreModule = class CoreModule {
                 app.flushLogs();
                 app.use(helmet());
                 app.enableCors({
-                    origin: [
-                        configService.frontEndAppUrl,
-                        configService.marketingAppUrl,
-                    ],
+                    origin: [configService.frontEndAppUrl],
                 });
                 app.useGlobalPipes(new ValidationPipe({
                     transform: true,

package/dist/root-app/core-app.module.js.map

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

package/dist/smtp-email-client/email.entity.d.ts

@@ -10,5 +10,5 @@ export declare class Email {
     sentDate?: Date;
     createdDate: Date;
     updatedDate: Date;
-    deletedDate: Date;
+    deletedDate?: Date;
 }

package/dist/smtp-email-client/email.entity.js

@@ -83,8 +83,8 @@ __decorate([
     __metadata("design:type", Date)
 ], Email.prototype, "updatedDate", void 0);
 __decorate([
-    ApiProperty(),
     DeleteDateColumn(),
+    ApiPropertyOptional(),
     __metadata("design:type", Date)
 ], Email.prototype, "deletedDate", void 0);
 Email = __decorate([

package/dist/smtp-email-client/email.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"email.entity.js","sourceRoot":"","sources":["../../src/smtp-email-client/email.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EACH,MAAM,EACN,gBAAgB,EAChB,gBAAgB,EAChB,MAAM,EACN,SAAS,EACT,KAAK,EACL,sBAAsB,EACtB,gBAAgB,GACnB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAC,OAAO,EAAC,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAC,WAAW,EAAE,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AAG1D,IAAM,KAAK,GAAX,MAAM,KAAK;IAGd,EAAE,CAAU;IAMZ,OAAO,CAAU;IAKjB,IAAI,CAAU;IAId,EAAE,CAAU;IAIZ,KAAK,CAAU;IAIf,QAAQ,CAAU;IAIlB,QAAQ,CAAU;IAIlB,OAAO,CAAU;IAIjB,QAAQ,CAAQ;IAIhB,WAAW,CAAQ;IAInB,WAAW,CAAQ;IAInB,WAAW,CAAQ;CACtB,CAAA;AAlDG;IAAC,sBAAsB,EAAE;IACxB,WAAW,EAAE;;iCACF;AAEZ;IAAC,WAAW,EAAE;IACb,MAAM,EAAE;IACR,KAAK,EAAE;IACP,OAAO,EAAE;;sCACO;AAEjB;IAAC,WAAW,EAAE;IACb,MAAM,EAAE;IACR,SAAS,CAAC,MAAM,CAAC;;mCACJ;AAEd;IAAC,MAAM,EAAE;IACR,WAAW,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC;;iCAChB;AAEZ;IAAC,MAAM,EAAE;IACR,WAAW,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC;;oCACb;AAEf;IAAC,MAAM,CAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;IACxB,mBAAmB,EAAE;;uCACJ;AAElB;IAAC,MAAM,CAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;IACxB,mBAAmB,EAAE;;uCACJ;AAElB;IAAC,MAAM,EAAE;IACR,WAAW,EAAE;;sCACG;AAEjB;IAAC,MAAM,CAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;IACxB,mBAAmB,EAAE;8BACX,IAAI;uCAAC;AAEhB;IAAC,WAAW,EAAE;IACb,gBAAgB,EAAE;8BACL,IAAI;0CAAC;AAEnB;IAAC,WAAW,EAAE;IACb,gBAAgB,EAAE;8BACL,IAAI;0CAAC;AAEnB;IAAC,WAAW,EAAE;IACb,gBAAgB,EAAE;8BACL,IAAI;0CAAC;AAlDV,KAAK;IADjB,MAAM,EAAE;GACI,KAAK,CAmDjB;SAnDY,KAAK"}
+{"version":3,"file":"email.entity.js","sourceRoot":"","sources":["../../src/smtp-email-client/email.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EACH,MAAM,EACN,gBAAgB,EAChB,gBAAgB,EAChB,MAAM,EACN,SAAS,EACT,KAAK,EACL,sBAAsB,EACtB,gBAAgB,GACnB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAC,OAAO,EAAC,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAC,WAAW,EAAE,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AAG1D,IAAM,KAAK,GAAX,MAAM,KAAK;IAGd,EAAE,CAAU;IAMZ,OAAO,CAAU;IAKjB,IAAI,CAAU;IAId,EAAE,CAAU;IAIZ,KAAK,CAAU;IAIf,QAAQ,CAAU;IAIlB,QAAQ,CAAU;IAIlB,OAAO,CAAU;IAIjB,QAAQ,CAAQ;IAIhB,WAAW,CAAQ;IAInB,WAAW,CAAQ;IAInB,WAAW,CAAQ;CACtB,CAAA;AAlDG;IAAC,sBAAsB,EAAE;IACxB,WAAW,EAAE;;iCACF;AAEZ;IAAC,WAAW,EAAE;IACb,MAAM,EAAE;IACR,KAAK,EAAE;IACP,OAAO,EAAE;;sCACO;AAEjB;IAAC,WAAW,EAAE;IACb,MAAM,EAAE;IACR,SAAS,CAAC,MAAM,CAAC;;mCACJ;AAEd;IAAC,MAAM,EAAE;IACR,WAAW,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC;;iCAChB;AAEZ;IAAC,MAAM,EAAE;IACR,WAAW,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC;;oCACb;AAEf;IAAC,MAAM,CAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;IACxB,mBAAmB,EAAE;;uCACJ;AAElB;IAAC,MAAM,CAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;IACxB,mBAAmB,EAAE;;uCACJ;AAElB;IAAC,MAAM,EAAE;IACR,WAAW,EAAE;;sCACG;AAEjB;IAAC,MAAM,CAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;IACxB,mBAAmB,EAAE;8BACX,IAAI;uCAAC;AAEhB;IAAC,WAAW,EAAE;IACb,gBAAgB,EAAE;8BACL,IAAI;0CAAC;AAEnB;IAAC,WAAW,EAAE;IACb,gBAAgB,EAAE;8BACL,IAAI;0CAAC;AAEnB;IAAC,gBAAgB,EAAE;IAClB,mBAAmB,EAAE;8BACR,IAAI;0CAAC;AAlDV,KAAK;IADjB,MAAM,EAAE;GACI,KAAK,CAmDjB;SAnDY,KAAK"}

package/dist/user-api-key/userApiKey.entity.d.ts

@@ -9,5 +9,5 @@ export declare class UserApiKey {
     userId: number;
     createdDate: Date;
     updateDate: Date;
-    deletedDate: Date;
+    deletedDate?: Date;
 }

package/dist/user-api-key/userApiKey.entity.js

@@ -7,7 +7,7 @@ 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);
 };
-import { ApiProperty } from "@nestjs/swagger";
+import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
 import { Column, CreateDateColumn, DeleteDateColumn, Entity, Generated, Index, ManyToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn, } from "typeorm";
 import { User } from "../user-internal/entities/user.entity.js";
 let UserApiKey = class UserApiKey {
@@ -65,7 +65,7 @@ __decorate([
 ], UserApiKey.prototype, "updateDate", void 0);
 __decorate([
     DeleteDateColumn(),
-    ApiProperty(),
+    ApiPropertyOptional(),
     __metadata("design:type", Date)
 ], UserApiKey.prototype, "deletedDate", void 0);
 UserApiKey = __decorate([

package/dist/user-api-key/userApiKey.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"userApiKey.entity.js","sourceRoot":"","sources":["../../src/user-api-key/userApiKey.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACH,MAAM,EACN,gBAAgB,EAChB,gBAAgB,EAChB,MAAM,EACN,SAAS,EACT,KAAK,EACL,SAAS,EACT,sBAAsB,EAEtB,UAAU,EACV,gBAAgB,GACnB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAC,IAAI,EAAC,MAAM,0CAA0C,CAAC;AAGvD,IAAM,UAAU,GAAhB,MAAM,UAAU;IAGnB,EAAE,CAAU;IASL,IAAI,CAAU;IAGrB,MAAM,CAAU;IAGhB,WAAW,CAAU;IAGrB,IAAI,CAAkB;IAItB,MAAM,CAAU;IAIhB,WAAW,CAAQ;IAInB,UAAU,CAAQ;IAIlB,WAAW,CAAQ;CACtB,CAAA;AArCG;IAAC,sBAAsB,EAAE;IACxB,WAAW,EAAE;;sCACF;AAEZ;IAAC,MAAM,CAAC,MAAM,EAAE;QACZ,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,GAAG,EAAE,CAAC,oBAAoB;KACtC,CAAC;IACD,SAAS,CAAC,MAAM,CAAC;IACjB,WAAW,EAAE;IACb,KAAK,EAAE;;wCACa;AAErB;IAAC,WAAW,EAAE;;0CACE;AAEhB;IAAC,WAAW,EAAE;;+CACO;AAErB;IAAC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;;wCACA;AAEtB;IAAC,WAAW,EAAE;IACb,UAAU,CAAC,CAAC,UAAsB,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC;;0CACxC;AAEhB;IAAC,gBAAgB,EAAE;IAClB,WAAW,EAAE;8BACA,IAAI;+CAAC;AAEnB;IAAC,gBAAgB,EAAE;IAClB,WAAW,EAAE;8BACD,IAAI;8CAAC;AAElB;IAAC,gBAAgB,EAAE;IAClB,WAAW,EAAE;8BACA,IAAI;+CAAC;AArCV,UAAU;IADtB,MAAM,EAAE;GACI,UAAU,CAsCtB;SAtCY,UAAU"}
+{"version":3,"file":"userApiKey.entity.js","sourceRoot":"","sources":["../../src/user-api-key/userApiKey.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,WAAW,EAAE,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AACjE,OAAO,EACH,MAAM,EACN,gBAAgB,EAChB,gBAAgB,EAChB,MAAM,EACN,SAAS,EACT,KAAK,EACL,SAAS,EACT,sBAAsB,EAEtB,UAAU,EACV,gBAAgB,GACnB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAC,IAAI,EAAC,MAAM,0CAA0C,CAAC;AAGvD,IAAM,UAAU,GAAhB,MAAM,UAAU;IAGnB,EAAE,CAAU;IASL,IAAI,CAAU;IAGrB,MAAM,CAAU;IAGhB,WAAW,CAAU;IAGrB,IAAI,CAAkB;IAItB,MAAM,CAAU;IAIhB,WAAW,CAAQ;IAInB,UAAU,CAAQ;IAIlB,WAAW,CAAQ;CACtB,CAAA;AArCG;IAAC,sBAAsB,EAAE;IACxB,WAAW,EAAE;;sCACF;AAEZ;IAAC,MAAM,CAAC,MAAM,EAAE;QACZ,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,GAAG,EAAE,CAAC,oBAAoB;KACtC,CAAC;IACD,SAAS,CAAC,MAAM,CAAC;IACjB,WAAW,EAAE;IACb,KAAK,EAAE;;wCACa;AAErB;IAAC,WAAW,EAAE;;0CACE;AAEhB;IAAC,WAAW,EAAE;;+CACO;AAErB;IAAC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;;wCACA;AAEtB;IAAC,WAAW,EAAE;IACb,UAAU,CAAC,CAAC,UAAsB,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC;;0CACxC;AAEhB;IAAC,gBAAgB,EAAE;IAClB,WAAW,EAAE;8BACA,IAAI;+CAAC;AAEnB;IAAC,gBAAgB,EAAE;IAClB,WAAW,EAAE;8BACD,IAAI;8CAAC;AAElB;IAAC,gBAAgB,EAAE;IAClB,mBAAmB,EAAE;8BACR,IAAI;+CAAC;AArCV,UAAU;IADtB,MAAM,EAAE;GACI,UAAU,CAsCtB;SAtCY,UAAU"}

package/dist/user-internal/dto/userResponseDto.d.ts

@@ -1,7 +1,7 @@
 import { OrganisationMembership } from "../../organisation-memberships/entities/organisation-membership.entity.js";
 import { UserApiKey } from "../../user-api-key/userApiKey.entity.js";
 export declare class UserDto {
-    isSuper: boolean;
+    isSuper?: boolean;
     id: number;
     email: string;
     uuid: string;
@@ -17,5 +17,5 @@ export declare class UserDto {
     apiKeys: UserApiKey[];
     createdDate: Date;
     updateDate: Date;
-    deletedDate: Date;
+    deletedDate?: Date;
 }

package/dist/user-internal/dto/userResponseDto.js

@@ -30,7 +30,9 @@ export class UserDto {
     deletedDate;
 }
 __decorate([
-    ApiProperty(),
+    ApiPropertyOptional({
+        description: "Is the user a super user. Only set if the user is the current user. Will not be set for list responses.",
+    }),
     __metadata("design:type", Boolean)
 ], UserDto.prototype, "isSuper", void 0);
 __decorate([
@@ -94,7 +96,7 @@ __decorate([
     __metadata("design:type", Date)
 ], UserDto.prototype, "updateDate", void 0);
 __decorate([
-    ApiProperty(),
+    ApiPropertyOptional(),
     __metadata("design:type", Date)
 ], UserDto.prototype, "deletedDate", void 0);
 //# sourceMappingURL=userResponseDto.js.map

package/dist/user-internal/dto/userResponseDto.js.map

@@ -1 +1 @@
-{"version":3,"file":"userResponseDto.js","sourceRoot":"","sources":["../../../src/user-internal/dto/userResponseDto.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,WAAW,EAAE,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAC,sBAAsB,EAAC,MAAM,2EAA2E,CAAC;AACjH,OAAO,EAAC,UAAU,EAAC,MAAM,yCAAyC,CAAC;AAEnE,MAAM,OAAO,OAAO;IAEhB,OAAO,CAAW;IAGlB,EAAE,CAAU;IAGZ,KAAK,CAAU;IAGR,IAAI,CAAU;IAGrB,aAAa,CAAW;IAGxB,OAAO,CAAW;IAGlB,IAAI,CAAU;IAGd,UAAU,CAAU;IAGpB,SAAS,CAAU;IAGnB,OAAO,CAAU;IAGjB,WAAW,CAAU;IAGrB,QAAQ,CAAU;IAGlB,WAAW,CAA4B;IAGvC,OAAO,CAAgB;IAGvB,WAAW,CAAQ;IAGnB,UAAU,CAAQ;IAGlB,WAAW,CAAQ;CACtB;AAlDG;IAAC,WAAW,EAAE;;wCACI;AAElB;IAAC,WAAW,EAAE;;mCACF;AAEZ;IAAC,WAAW,EAAE;;sCACC;AAEf;IAAC,WAAW,EAAE;;qCACO;AAErB;IAAC,WAAW,EAAE;;8CACU;AAExB;IAAC,WAAW,EAAE;;wCACI;AAElB;IAAC,mBAAmB,EAAE;;qCACR;AAEd;IAAC,mBAAmB,EAAE;;2CACF;AAEpB;IAAC,mBAAmB,EAAE;;0CACH;AAEnB;IAAC,mBAAmB,EAAE;;wCACL;AAEjB;IAAC,mBAAmB,EAAE;;4CACD;AAErB;IAAC,mBAAmB,EAAE;;yCACJ;AAElB;IAAC,WAAW,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,CAAC,sBAAsB,EAAE,OAAO,EAAE,IAAI,EAAC,CAAC;;4CAC1B;AAEvC;IAAC,WAAW,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,IAAI,EAAC,CAAC;;wCAC9B;AAEvB;IAAC,WAAW,EAAE;8BACA,IAAI;4CAAC;AAEnB;IAAC,WAAW,EAAE;8BACD,IAAI;2CAAC;AAElB;IAAC,WAAW,EAAE;8BACA,IAAI;4CAAC"}
+{"version":3,"file":"userResponseDto.js","sourceRoot":"","sources":["../../../src/user-internal/dto/userResponseDto.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,WAAW,EAAE,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAC,sBAAsB,EAAC,MAAM,2EAA2E,CAAC;AACjH,OAAO,EAAC,UAAU,EAAC,MAAM,yCAAyC,CAAC;AAEnE,MAAM,OAAO,OAAO;IAKhB,OAAO,CAAW;IAGlB,EAAE,CAAU;IAGZ,KAAK,CAAU;IAGR,IAAI,CAAU;IAGrB,aAAa,CAAW;IAGxB,OAAO,CAAW;IAGlB,IAAI,CAAU;IAGd,UAAU,CAAU;IAGpB,SAAS,CAAU;IAGnB,OAAO,CAAU;IAGjB,WAAW,CAAU;IAGrB,QAAQ,CAAU;IAGlB,WAAW,CAA4B;IAGvC,OAAO,CAAgB;IAGvB,WAAW,CAAQ;IAGnB,UAAU,CAAQ;IAGlB,WAAW,CAAQ;CACtB;AArDG;IAAC,mBAAmB,CAAC;QACjB,WAAW,EACP,yGAAyG;KAChH,CAAC;;wCACgB;AAElB;IAAC,WAAW,EAAE;;mCACF;AAEZ;IAAC,WAAW,EAAE;;sCACC;AAEf;IAAC,WAAW,EAAE;;qCACO;AAErB;IAAC,WAAW,EAAE;;8CACU;AAExB;IAAC,WAAW,EAAE;;wCACI;AAElB;IAAC,mBAAmB,EAAE;;qCACR;AAEd;IAAC,mBAAmB,EAAE;;2CACF;AAEpB;IAAC,mBAAmB,EAAE;;0CACH;AAEnB;IAAC,mBAAmB,EAAE;;wCACL;AAEjB;IAAC,mBAAmB,EAAE;;4CACD;AAErB;IAAC,mBAAmB,EAAE;;yCACJ;AAElB;IAAC,WAAW,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,CAAC,sBAAsB,EAAE,OAAO,EAAE,IAAI,EAAC,CAAC;;4CAC1B;AAEvC;IAAC,WAAW,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,IAAI,EAAC,CAAC;;wCAC9B;AAEvB;IAAC,WAAW,EAAE;8BACA,IAAI;4CAAC;AAEnB;IAAC,WAAW,EAAE;8BACD,IAAI;2CAAC;AAElB;IAAC,mBAAmB,EAAE;8BACR,IAAI;4CAAC"}

package/dist/user-internal/entities/user.entity.d.ts

@@ -16,5 +16,5 @@ export declare class User {
     apiKeys?: UserApiKey[];
     createdDate: Date;
     updateDate: Date;
-    deletedDate: Date;
+    deletedDate?: Date;
 }

package/dist/user-internal/entities/user.entity.js

@@ -117,7 +117,7 @@ __decorate([
 ], User.prototype, "updateDate", void 0);
 __decorate([
     DeleteDateColumn(),
-    ApiProperty(),
+    ApiPropertyOptional(),
     __metadata("design:type", Date)
 ], User.prototype, "deletedDate", void 0);
 User = __decorate([

package/dist/user-internal/entities/user.entity.js.map

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

package/dist/user-internal/user.controller.js

@@ -13,10 +13,11 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 import { Controller, Get, Request, Body, Patch, Param, Delete, UseGuards, BadRequestException, } from "@nestjs/common";
 import { UserService } from "./user.service.js";
 import { UpdateUserDto } from "./dto/update-user.dto.js";
-import { ApiBearerAuth, ApiOkResponse, ApiTags } from "@nestjs/swagger";
+import { ApiBearerAuth, ApiOkResponse, ApiOperation, ApiTags, } from "@nestjs/swagger";
 import { isUUID } from "class-validator";
 import { BooleanResult } from "../root-app/models/boolean-result.js";
 import { UserDto } from "./dto/userResponseDto.js";
+import { User } from "./entities/user.entity.js";
 import { DefaultAuthGuard } from "../authorization/guards/DefaultAuthGuard.js";
 import { ClaimsAuthorisationGuard } from "../authorization/guards/ClaimsAuthorisationGuard.js";
 import { SuperUserClaims } from "../authorization/models/SuperUserClaims.js";
@@ -39,16 +40,16 @@ let UserController = class UserController {
             throw new BadRequestException(uuid, "Invalid UUID");
         }
         // find the user if they are in the same organisation as the user
+        // being searched for
         const result = await this.userService.findOneIfSameOrganisation(uuid, request.user);
         return {
             ...result,
             memberships: request.user.memberships ?? [],
             apiKeys: request.user.apiKeys ?? [],
-            isSuper: request.user.permissions.includes(SuperUserClaims.MODIFY_ALL),
         };
     }
     async findAll() {
-        return await this.userService.findAll();
+        return this.userService.findAll();
     }
     async update(uuid, updateUserDto, request) {
         const result = await this.userService.update(uuid, updateUserDto, request.user.uuid);
@@ -70,8 +71,12 @@ __decorate([
 ], UserController.prototype, "findOne", null);
 __decorate([
     Get(),
+    ApiOperation({
+        summary: "Get all users in the system. Limited to Super Admin role.",
+        tags: ["SuperPower"],
+    }),
     MandatoryUserClaims("read:all"),
-    ApiOkResponse({ type: UserDto, isArray: true }),
+    ApiOkResponse({ type: User, isArray: true }),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)

package/dist/user-internal/user.controller.js.map

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

package/dist/user-internal/user.service.d.ts

@@ -4,6 +4,7 @@ import { UpdateUserDto } from "./dto/update-user.dto.js";
 import { User } from "./entities/user.entity.js";
 export declare class UserService {
     private repository;
+    private readonly logger;
     constructor(repository: Repository<User>);
     findAll(): Promise<User[]>;
     findOneByAuth0Id(auth0Id: string): Promise<User | undefined>;

package/dist/user-internal/user.service.js

@@ -10,19 +10,27 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-import { Injectable, NotFoundException } from "@nestjs/common";
+var UserService_1;
+import { Injectable, Logger, NotFoundException } from "@nestjs/common";
 import { InjectRepository } from "@nestjs/typeorm";
 import { Repository } from "typeorm";
 import { Roles } from "../organisation/dto/RolesEnum.js";
 import { User } from "./entities/user.entity.js";
-let UserService = class UserService {
+let UserService = UserService_1 = class UserService {
     repository;
-    //private readonly logger = new Logger(UserService.name);
+    logger = new Logger(UserService_1.name);
     constructor(repository) {
         this.repository = repository;
     }
     async findAll() {
-        return this.repository.find();
+        const allUsers = await this.repository.find({
+            relations: {
+                memberships: true,
+                apiKeys: true,
+            },
+        });
+        this.logger.debug({ allUsers }, "Found all users");
+        return allUsers;
     }
     async findOneByAuth0Id(auth0Id) {
         return this.repository.findOneOrFail({
@@ -103,7 +111,7 @@ let UserService = class UserService {
         }
     }
 };
-UserService = __decorate([
+UserService = UserService_1 = __decorate([
     Injectable(),
     __param(0, InjectRepository(User)),
     __metadata("design:paramtypes", [Repository])

package/dist/user-internal/user.service.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@darraghor/nest-backend-libs",
-    "version": "2.30.0",
+    "version": "2.31.0",
     "license": "SEE LICENSE IN LICENSE.md",
     "description": "Some helpers for personal projects in nestjs",
     "homepage": "https://github.com/darraghoriordan/nest-backend-libs",