@darraghor/nest-backend-libs 2.22.0 → 2.23.1

package/dist/invitations/invitation.service.js

@@ -11,6 +11,7 @@ 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 InvitationService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InvitationService = void 0;
 const common_1 = require("@nestjs/common");
@@ -19,76 +20,173 @@ const typeorm_2 = require("typeorm");
 const RolesEnum_1 = require("../organisation/dto/RolesEnum");
 const invitation_entity_1 = require("./entities/invitation.entity");
 const email_client_service_1 = require("../smtp-email-client/email-client.service");
-const organisation_entity_1 = require("../organisation/entities/organisation.entity");
 const InvitationConfigurationService_1 = require("./InvitationConfigurationService");
-let InvitationService = class InvitationService {
+const organisation_membership_entity_1 = require("../organisation-memberships/entities/organisation-membership.entity");
+const member_role_entity_1 = require("../organisation/entities/member-role.entity");
+const user_internal_1 = require("../user-internal");
+let InvitationService = InvitationService_1 = class InvitationService {
     invitationRepository;
-    organisationRepository;
+    orgMembershipRepository;
+    userRepository;
     emailClient;
     configService;
-    constructor(invitationRepository, organisationRepository, emailClient, configService) {
+    logger = new common_1.Logger(InvitationService_1.name);
+    constructor(invitationRepository, orgMembershipRepository, userRepository, emailClient, configService) {
         this.invitationRepository = invitationRepository;
-        this.organisationRepository = organisationRepository;
+        this.orgMembershipRepository = orgMembershipRepository;
+        this.userRepository = userRepository;
         this.emailClient = emailClient;
         this.configService = configService;
     }
+    async getOneActiveInvitation(invitationCode) {
+        return this.invitationRepository.findOne({
+            where: {
+                uuid: invitationCode,
+                acceptedOn: (0, typeorm_2.IsNull)(),
+                expiresOn: (0, typeorm_2.LessThan)(new Date()),
+            },
+            relations: {
+                organisationMembership: {
+                    user: true,
+                    organisation: true,
+                },
+            },
+        });
+    }
+    async acceptInvitation(invitationId) {
+        await this.invitationRepository.manager.transaction(async (transactionalEntityManager) => {
+            // get the invitation again to ensure we have the latest version
+            const latestInvitation = await transactionalEntityManager.findOne(invitation_entity_1.Invitation, {
+                where: { id: invitationId },
+                relations: {
+                    organisationMembership: true,
+                },
+            });
+            if (!latestInvitation) {
+                throw new common_1.NotFoundException(`Invitation with id ${invitationId} not found`);
+            }
+            // set the invitation to accepted
+            latestInvitation.acceptedOn = new Date();
+            await transactionalEntityManager.save(latestInvitation);
+            // set the user's membership to member and remove the invitation role
+            const memberRole = new member_role_entity_1.MembershipRole();
+            memberRole.name = RolesEnum_1.Roles.member;
+            latestInvitation.organisationMembership.roles = [memberRole];
+            await transactionalEntityManager.save(latestInvitation.organisationMembership);
+        });
+    }
     async create(createDto, createdBy) {
-        const existingInvitations = await this.invitationRepository.find({
+        await this.canManageInvitationsForThisOrg(createDto.organisationId, createdBy.id);
+        const existingMemberships = await this.orgMembershipRepository.find({
             where: {
-                emailAddress: createDto.emailAddress,
+                user: {
+                    email: createDto.emailAddress,
+                },
                 organisation: {
                     id: createDto.organisationId,
                 },
-                // and it's not expired
-                expiresOn: (0, typeorm_2.MoreThan)(new Date()),
+            },
+            relations: {
+                invitation: true,
+                roles: true,
             },
         });
-        if (existingInvitations) {
-            throw new Error("An valid invitation already exists for this email address for this organisation");
+        if (existingMemberships.some((m) => m.roles.some((r) => r.name === RolesEnum_1.Roles.member || r.name === RolesEnum_1.Roles.owner))) {
+            const message = "A user with this email address is already a member of this organisation";
+            this.logger.error(message, { createDto, createdBy });
+            throw new Error(message);
         }
-        // otherwise, create a new invitation
+        if (existingMemberships.some((m) => m.invitation &&
+            m.invitation.acceptedOn === null &&
+            m.invitation.expiresOn > new Date())) {
+            const message = "An valid invitation with this email already exists for this organisation";
+            this.logger.error(message, { createDto, createdBy });
+            throw new Error(message);
+        }
+        // new empty user
+        const user = new user_internal_1.User();
+        user.email = createDto.emailAddress;
+        const savedUser = await this.userRepository.save(user);
+        // new role
+        const role = new member_role_entity_1.MembershipRole();
+        role.name = RolesEnum_1.Roles.invited;
+        // a new invitation
         const unsavedInvitation = new invitation_entity_1.Invitation();
         unsavedInvitation.emailAddress = createDto.emailAddress;
         unsavedInvitation.expiresOn = new Date();
         unsavedInvitation.expiresOn.setDate(unsavedInvitation.expiresOn.getDate() + 1);
-        unsavedInvitation.organisation =
-            await this.organisationRepository.findOneOrFail({
-                where: { id: createDto.organisationId },
-            });
         unsavedInvitation.givenName = createDto.givenName;
-        const savedInvitation = await this.invitationRepository.save(unsavedInvitation);
+        // create a new membership
+        const membership = this.orgMembershipRepository.create();
+        membership.organisationId = createDto.organisationId;
+        membership.userId = savedUser.id;
+        membership.invitation = unsavedInvitation;
+        membership.roles = [role];
+        const savedMembership = await this.orgMembershipRepository.save(membership);
+        const retrievedMembership = await this.orgMembershipRepository.findOne({
+            where: { id: savedMembership.id },
+            relations: {
+                invitation: true,
+                organisation: true,
+            },
+        });
+        if (!retrievedMembership || !retrievedMembership.invitation) {
+            this.logger.error("Newly saved membership not found", {
+                createDto,
+                createdBy,
+                createdMembershipId: savedMembership?.id,
+            });
+            throw new Error("Newly saved membership not found");
+        }
         // try to email the invitation
-        await this.emailClient.sendMail([unsavedInvitation.emailAddress], [], `Invitation to join ${unsavedInvitation.organisation.name}`, createdBy.uuid, `You have been invited to join ${unsavedInvitation.organisation.name} by ${createdBy.givenName || "another "} ${createdBy.familyName || "member"}. Please click the link below to accept the invitation.
+        await this.emailClient.sendMail([unsavedInvitation.emailAddress], [], `Invitation to join ${retrievedMembership.organisation.name}`, createdBy.uuid, `You have been invited to join ${retrievedMembership.organisation.name} by ${createdBy.givenName || "another member"}. Please click the link below to accept the invitation.
 
-            ${this.configService.baseUrl}/accept-invitation/${savedInvitation.uuid}`);
-        // if it gets to here we have a sent invitation
-        savedInvitation.notificationSent = new Date();
-        return this.invitationRepository.save(savedInvitation);
+            ${this.configService.baseUrl}/accept-invitation/${retrievedMembership.invitation.uuid}`);
+        // if it gets to here we have a queued invitation
+        retrievedMembership.invitation.notificationSent = new Date();
+        return this.invitationRepository.save(retrievedMembership.invitation);
+    }
+    async canManageInvitationsForThisOrg(orgId, userId) {
+        const requesterMembership = await this.orgMembershipRepository.findOneOrFail({
+            where: {
+                organisation: {
+                    id: orgId,
+                },
+                user: {
+                    id: userId,
+                },
+            },
+            relations: {
+                roles: true,
+            },
+        });
+        if (requesterMembership.roles.some((role) => role.name === RolesEnum_1.Roles.owner)) {
+            throw new Error("You must be an admin to invite users to an organisation");
+        }
     }
     async remove(uuid, currentUserId) {
         const invitation = await this.invitationRepository.findOneOrFail({
             where: {
                 uuid,
-                organisation: {
-                    memberships: {
-                        user: {
-                            id: currentUserId,
-                        },
-                        roles: {
-                            name: RolesEnum_1.Roles.owner,
-                        },
-                    },
-                },
+            },
+            relations: {
+                organisationMembership: { organisation: true },
             },
         });
+        if (!invitation) {
+            throw new common_1.NotFoundException();
+        }
+        await this.canManageInvitationsForThisOrg(invitation.organisationMembership.organisation.id, currentUserId);
         return this.invitationRepository.remove(invitation);
     }
 };
-InvitationService = __decorate([
+InvitationService = InvitationService_1 = __decorate([
     (0, common_1.Injectable)(),
     __param(0, (0, typeorm_1.InjectRepository)(invitation_entity_1.Invitation)),
-    __param(1, (0, typeorm_1.InjectRepository)(organisation_entity_1.Organisation)),
+    __param(1, (0, typeorm_1.InjectRepository)(organisation_membership_entity_1.OrganisationMembership)),
+    __param(2, (0, typeorm_1.InjectRepository)(user_internal_1.User)),
     __metadata("design:paramtypes", [typeorm_2.Repository,
+        typeorm_2.Repository,
         typeorm_2.Repository,
         email_client_service_1.SmtpEmailClient,
         InvitationConfigurationService_1.InvitationsConfigurationService])

package/dist/invitations/invitation.service.js.map

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

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

@@ -1,3 +1,4 @@
+import { Invitation } from "../../invitations";
 import { MembershipRole } from "../../organisation/entities/member-role.entity";
 import { Organisation } from "../../organisation/entities/organisation.entity";
 import { User } from "../../user-internal/entities/user.entity";
@@ -7,6 +8,7 @@ export declare class OrganisationMembership {
     user: User;
     userId: number;
     organisation: Organisation;
+    invitation?: Invitation;
     organisationId: number;
     roles: MembershipRole[];
     createdDate: Date;

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

@@ -13,6 +13,7 @@ exports.OrganisationMembership = void 0;
 const swagger_1 = require("@nestjs/swagger");
 const class_transformer_1 = require("class-transformer");
 const typeorm_1 = require("typeorm");
+const invitations_1 = require("../../invitations");
 const member_role_entity_1 = require("../../organisation/entities/member-role.entity");
 const organisation_entity_1 = require("../../organisation/entities/organisation.entity");
 const user_entity_1 = require("../../user-internal/entities/user.entity");
@@ -22,6 +23,7 @@ let OrganisationMembership = class OrganisationMembership {
     user;
     userId;
     organisation;
+    invitation;
     organisationId;
     roles;
     createdDate;
@@ -69,6 +71,15 @@ __decorate([
     }),
     __metadata("design:type", organisation_entity_1.Organisation)
 ], OrganisationMembership.prototype, "organisation", void 0);
+__decorate([
+    (0, typeorm_1.OneToOne)(() => invitations_1.Invitation, (inv) => inv.organisationMembership, {
+        eager: true,
+        nullable: true,
+        cascade: ["insert", "update"],
+    }),
+    (0, typeorm_1.JoinColumn)(),
+    __metadata("design:type", invitations_1.Invitation)
+], OrganisationMembership.prototype, "invitation", void 0);
 __decorate([
     (0, typeorm_1.Column)(),
     (0, swagger_1.ApiProperty)(),

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":";;;;;;;;;;;;AAAA,6CAA4C;AAC5C,yDAAuC;AAEvC,qCAeiB;AACjB,uFAA8E;AAC9E,yFAA6E;AAC7E,0EAA8D;AAGvD,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAG/B,EAAE,CAAU;IASL,IAAI,CAAU;IAMrB,IAAI,CAAQ;IAKL,MAAM,CAAU;IAMvB,YAAY,CAAgB;IAKrB,cAAc,CAAU;IAS/B,KAAK,CAAoB;IAIzB,WAAW,CAAQ;IAInB,UAAU,CAAQ;IAIlB,WAAW,CAAQ;IAEnB,4DAA4D;IAItD,AAAN,KAAK,CAAC,UAAU;QACZ,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACb,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;SACnB;IACL,CAAC;CACJ,CAAA;AAjEG;IAAC,IAAA,gCAAsB,GAAE;IACxB,IAAA,qBAAW,GAAE;;kDACF;AAEZ;IAAC,IAAA,gBAAM,EAAC,MAAM,EAAE;QACZ,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,GAAG,EAAE,CAAC,oBAAoB;KACtC,CAAC;IACD,IAAA,mBAAS,EAAC,MAAM,CAAC;IACjB,IAAA,qBAAW,GAAE;IACb,IAAA,eAAK,GAAE;;oDACa;AAErB;IAAC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,kBAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE;QAC/C,KAAK,EAAE,IAAI;QACX,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;KAChC,CAAC;8BACK,kBAAI;oDAAC;AAEZ;IAAC,IAAA,gBAAM,GAAE;IACR,IAAA,qBAAW,GAAE;IACb,IAAA,oBAAU,EAAC,CAAC,UAAkC,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC;;sDAC7C;AAEvB;IAAC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,kCAAY,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE;QACrD,KAAK,EAAE,IAAI;QACX,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;KAChC,CAAC;8BACa,kCAAY;4DAAC;AAE5B;IAAC,IAAA,gBAAM,GAAE;IACR,IAAA,qBAAW,GAAE;IACb,IAAA,oBAAU,EAAC,CAAC,UAAkC,EAAE,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC;;8DAC7C;AAE/B;IAAC,IAAA,qBAAW,EAAC,EAAC,IAAI,EAAE,GAAG,EAAE,CAAC,mCAAc,EAAE,OAAO,EAAE,IAAI,EAAC,CAAC;IACzD,+DAA+D;;IAC9D,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,mCAAc,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE;QACxD,KAAK,EAAE,IAAI;QACX,OAAO,EAAE,IAAI;KAChB,CAAC;IACD,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,mCAAc,CAAC;;qDACF;AAEzB;IAAC,IAAA,0BAAgB,GAAE;IAClB,IAAA,qBAAW,GAAE;8BACA,IAAI;2DAAC;AAEnB;IAAC,IAAA,0BAAgB,GAAE;IAClB,IAAA,qBAAW,GAAE;8BACD,IAAI;0DAAC;AAElB;IAAC,IAAA,0BAAgB,GAAE;IAClB,IAAA,qBAAW,GAAE;8BACA,IAAI;2DAAC;AAMb;IAHL,IAAA,mBAAS,GAAE;IACX,IAAA,qBAAW,GAAE;IACb,IAAA,qBAAW,GAAE;;;;wDAKb;AAjEQ,sBAAsB;IADlC,IAAA,gBAAM,GAAE;GACI,sBAAsB,CAkElC;AAlEY,wDAAsB"}
+{"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/user-api-key/CreateApiKeyDto.d.ts

@@ -0,0 +1,3 @@
+export default class CreateApiKeyDto {
+    description: string;
+}

package/dist/user-api-key/CreateApiKeyDto.js

@@ -0,0 +1,24 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const swagger_1 = require("@nestjs/swagger");
+const class_validator_1 = require("class-validator");
+class CreateApiKeyDto {
+    description;
+}
+__decorate([
+    (0, class_validator_1.IsString)(),
+    (0, class_validator_1.IsNotEmpty)(),
+    (0, swagger_1.ApiProperty)(),
+    __metadata("design:type", String)
+], CreateApiKeyDto.prototype, "description", void 0);
+exports.default = CreateApiKeyDto;
+//# sourceMappingURL=CreateApiKeyDto.js.map

package/dist/user-api-key/CreateApiKeyDto.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CreateApiKeyDto.js","sourceRoot":"","sources":["../../src/user-api-key/CreateApiKeyDto.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,6CAA4C;AAC5C,qDAAqD;AAErD,MAAqB,eAAe;IAIhC,WAAW,CAAU;CACxB;AAJG;IAAC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,qBAAW,GAAE;;oDACO;AAJzB,kCAKC"}

package/dist/user-api-key/index.d.ts

@@ -0,0 +1,3 @@
+export { UserApiKeyService } from "./user-apikey.service";
+export { UserApiKeyController } from "./user-apikey.controller";
+export { UserApiKeyModule } from "./user-apikey.module";

package/dist/user-api-key/index.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserApiKeyModule = exports.UserApiKeyController = exports.UserApiKeyService = void 0;
+var user_apikey_service_1 = require("./user-apikey.service");
+Object.defineProperty(exports, "UserApiKeyService", { enumerable: true, get: function () { return user_apikey_service_1.UserApiKeyService; } });
+var user_apikey_controller_1 = require("./user-apikey.controller");
+Object.defineProperty(exports, "UserApiKeyController", { enumerable: true, get: function () { return user_apikey_controller_1.UserApiKeyController; } });
+var user_apikey_module_1 = require("./user-apikey.module");
+Object.defineProperty(exports, "UserApiKeyModule", { enumerable: true, get: function () { return user_apikey_module_1.UserApiKeyModule; } });
+//# sourceMappingURL=index.js.map

package/dist/user-api-key/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/user-api-key/index.ts"],"names":[],"mappings":";;;AAAA,6DAAwD;AAAhD,wHAAA,iBAAiB,OAAA;AACzB,mEAA8D;AAAtD,8HAAA,oBAAoB,OAAA;AAC5B,2DAAsD;AAA9C,sHAAA,gBAAgB,OAAA"}

package/dist/user-api-key/user-apikey.controller.d.ts

@@ -0,0 +1,13 @@
+import { RequestWithUser } from "../authz/RequestWithUser";
+import { BooleanResult } from "../root-app/models/boolean-result";
+import { UserApiKey } from "./userApiKey.entity";
+import { UserApiKeyService } from "./user-apikey.service";
+import CreateApiKeyDto from "./CreateApiKeyDto";
+export declare class UserApiKeyController {
+    private readonly apiKeyService;
+    constructor(apiKeyService: UserApiKeyService);
+    getAllForUser(request: RequestWithUser): Promise<UserApiKey[]>;
+    generateNewKey(uuid: string, request: RequestWithUser): Promise<UserApiKey>;
+    update(createKeyDto: CreateApiKeyDto, request: RequestWithUser): Promise<UserApiKey>;
+    remove(uuid: string, request: RequestWithUser): Promise<BooleanResult>;
+}

package/dist/user-api-key/user-apikey.controller.js

@@ -0,0 +1,88 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserApiKeyController = void 0;
+const common_1 = require("@nestjs/common");
+const swagger_1 = require("@nestjs/swagger");
+const boolean_result_1 = require("../root-app/models/boolean-result");
+const authz_1 = require("../authz");
+const userApiKey_entity_1 = require("./userApiKey.entity");
+const user_apikey_service_1 = require("./user-apikey.service");
+const CreateApiKeyDto_1 = __importDefault(require("./CreateApiKeyDto"));
+let UserApiKeyController = class UserApiKeyController {
+    apiKeyService;
+    constructor(apiKeyService) {
+        this.apiKeyService = apiKeyService;
+    }
+    async getAllForUser(request) {
+        return this.apiKeyService.getAllForUser(request.user.uuid);
+    }
+    async generateNewKey(uuid, request) {
+        return await this.apiKeyService.refreshKeyValue(uuid, request.user.uuid);
+    }
+    async update(createKeyDto, request) {
+        return await this.apiKeyService.createKey(request.user.id, createKeyDto.description);
+    }
+    async remove(uuid, request) {
+        const isDeleted = await this.apiKeyService.remove(uuid, request.user.uuid);
+        return { result: isDeleted };
+    }
+};
+__decorate([
+    (0, common_1.Get)(),
+    (0, swagger_1.ApiOkResponse)({ type: userApiKey_entity_1.UserApiKey, isArray: true }),
+    __param(0, (0, common_1.Request)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], UserApiKeyController.prototype, "getAllForUser", null);
+__decorate([
+    (0, common_1.Put)(":uuid"),
+    (0, swagger_1.ApiOkResponse)({ type: userApiKey_entity_1.UserApiKey }),
+    __param(0, (0, common_1.Param)("uuid")),
+    __param(1, (0, common_1.Request)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, Object]),
+    __metadata("design:returntype", Promise)
+], UserApiKeyController.prototype, "generateNewKey", null);
+__decorate([
+    (0, common_1.Post)(),
+    (0, swagger_1.ApiOkResponse)({ type: userApiKey_entity_1.UserApiKey }),
+    __param(0, (0, common_1.Body)()),
+    __param(1, (0, common_1.Request)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [CreateApiKeyDto_1.default, Object]),
+    __metadata("design:returntype", Promise)
+], UserApiKeyController.prototype, "update", null);
+__decorate([
+    (0, common_1.Delete)(":uuid"),
+    (0, swagger_1.ApiOkResponse)({ type: boolean_result_1.BooleanResult }),
+    __param(0, (0, common_1.Param)("uuid")),
+    __param(1, (0, common_1.Request)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, Object]),
+    __metadata("design:returntype", Promise)
+], UserApiKeyController.prototype, "remove", null);
+UserApiKeyController = __decorate([
+    (0, common_1.UseGuards)(authz_1.DefaultAuthGuard, authz_1.ClaimsAuthorisationGuard),
+    (0, swagger_1.ApiBearerAuth)(),
+    (0, common_1.Controller)("api-key"),
+    (0, swagger_1.ApiTags)("Users"),
+    __metadata("design:paramtypes", [user_apikey_service_1.UserApiKeyService])
+], UserApiKeyController);
+exports.UserApiKeyController = UserApiKeyController;
+//# sourceMappingURL=user-apikey.controller.js.map

package/dist/user-api-key/user-apikey.controller.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"user-apikey.controller.js","sourceRoot":"","sources":["../../src/user-api-key/user-apikey.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,2CAUwB;AACxB,6CAAsE;AAEtE,sEAAgE;AAChE,oCAAoE;AACpE,2DAA+C;AAC/C,+DAAwD;AACxD,wEAAgD;AAMzC,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IACA;IAA7B,YAA6B,aAAgC;QAAhC,kBAAa,GAAb,aAAa,CAAmB;IAAG,CAAC;IAI3D,AAAN,KAAK,CAAC,aAAa,CACJ,OAAwB;QAEnC,OAAO,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/D,CAAC;IAIK,AAAN,KAAK,CAAC,cAAc,CACD,IAAY,EAChB,OAAwB;QAEnC,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CAC3C,IAAI,EACJ,OAAO,CAAC,IAAI,CAAC,IAAI,CACpB,CAAC;IACN,CAAC;IAIK,AAAN,KAAK,CAAC,MAAM,CACA,YAA6B,EAC1B,OAAwB;QAEnC,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CACrC,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,YAAY,CAAC,WAAW,CAC3B,CAAC;IACN,CAAC;IAIK,AAAN,KAAK,CAAC,MAAM,CACO,IAAY,EAChB,OAAwB;QAEnC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAC7C,IAAI,EACJ,OAAO,CAAC,IAAI,CAAC,IAAI,CACpB,CAAC;QACF,OAAO,EAAC,MAAM,EAAE,SAAS,EAAC,CAAC;IAC/B,CAAC;CACJ,CAAA;AA1CS;IAFL,IAAA,YAAG,GAAE;IACL,IAAA,uBAAa,EAAC,EAAC,IAAI,EAAE,8BAAU,EAAE,OAAO,EAAE,IAAI,EAAC,CAAC;IAE5C,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;yDAGb;AAIK;IAFL,IAAA,YAAG,EAAC,OAAO,CAAC;IACZ,IAAA,uBAAa,EAAC,EAAC,IAAI,EAAE,8BAAU,EAAC,CAAC;IAE7B,WAAA,IAAA,cAAK,EAAC,MAAM,CAAC,CAAA;IACb,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;0DAMb;AAIK;IAFL,IAAA,aAAI,GAAE;IACN,IAAA,uBAAa,EAAC,EAAC,IAAI,EAAE,8BAAU,EAAC,CAAC;IAE7B,WAAA,IAAA,aAAI,GAAE,CAAA;IACN,WAAA,IAAA,gBAAO,GAAE,CAAA;;qCADY,yBAAe;;kDAOxC;AAIK;IAFL,IAAA,eAAM,EAAC,OAAO,CAAC;IACf,IAAA,uBAAa,EAAC,EAAC,IAAI,EAAE,8BAAa,EAAC,CAAC;IAEhC,WAAA,IAAA,cAAK,EAAC,MAAM,CAAC,CAAA;IACb,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;kDAOb;AA9CQ,oBAAoB;IAJhC,IAAA,kBAAS,EAAC,wBAAgB,EAAE,gCAAwB,CAAC;IACrD,IAAA,uBAAa,GAAE;IACf,IAAA,mBAAU,EAAC,SAAS,CAAC;IACrB,IAAA,iBAAO,EAAC,OAAO,CAAC;qCAE+B,uCAAiB;GADpD,oBAAoB,CA+ChC;AA/CY,oDAAoB"}

package/dist/user-api-key/user-apikey.module.d.ts

@@ -0,0 +1,2 @@
+export declare class UserApiKeyModule {
+}

package/dist/user-api-key/user-apikey.module.js

@@ -0,0 +1,27 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserApiKeyModule = void 0;
+const common_1 = require("@nestjs/common");
+const user_internal_module_1 = require("../user-internal/user-internal.module");
+const user_apikey_service_1 = require("./user-apikey.service");
+const user_apikey_controller_1 = require("./user-apikey.controller");
+const typeorm_1 = require("@nestjs/typeorm");
+const userApiKey_entity_1 = require("./userApiKey.entity");
+let UserApiKeyModule = class UserApiKeyModule {
+};
+UserApiKeyModule = __decorate([
+    (0, common_1.Module)({
+        imports: [typeorm_1.TypeOrmModule.forFeature([userApiKey_entity_1.UserApiKey]), user_internal_module_1.UserInternalModule],
+        controllers: [user_apikey_controller_1.UserApiKeyController],
+        providers: [user_apikey_service_1.UserApiKeyService],
+        exports: [],
+    })
+], UserApiKeyModule);
+exports.UserApiKeyModule = UserApiKeyModule;
+//# sourceMappingURL=user-apikey.module.js.map

package/dist/user-api-key/user-apikey.module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"user-apikey.module.js","sourceRoot":"","sources":["../../src/user-api-key/user-apikey.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAsC;AACtC,gFAAyE;AACzE,+DAAwD;AACxD,qEAA8D;AAC9D,6CAA8C;AAC9C,2DAA+C;AAQxC,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;CAAG,CAAA;AAAnB,gBAAgB;IAN5B,IAAA,eAAM,EAAC;QACJ,OAAO,EAAE,CAAC,uBAAa,CAAC,UAAU,CAAC,CAAC,8BAAU,CAAC,CAAC,EAAE,yCAAkB,CAAC;QACrE,WAAW,EAAE,CAAC,6CAAoB,CAAC;QACnC,SAAS,EAAE,CAAC,uCAAiB,CAAC;QAC9B,OAAO,EAAE,EAAE;KACd,CAAC;GACW,gBAAgB,CAAG;AAAnB,4CAAgB"}

package/dist/user-api-key/user-apikey.service.d.ts

@@ -0,0 +1,17 @@
+import { Repository } from "typeorm";
+import { UserApiKey } from "./userApiKey.entity";
+export declare class UserApiKeyService {
+    private repository;
+    constructor(repository: Repository<UserApiKey>);
+    getAllForUser(uuid: string): Promise<UserApiKey[]>;
+    findOneByKey(apiKey: string): Promise<UserApiKey>;
+    /**
+     * When working on keys with the api, use an id to find the key
+     * @param id
+     * @returns
+     */
+    findOneById(id: number): Promise<UserApiKey>;
+    refreshKeyValue(uuid: string, currentUserUuid: string): Promise<UserApiKey>;
+    createKey(currentUserId: number, description: string): Promise<UserApiKey>;
+    remove(uuid: string, currentUserUuid: string): Promise<boolean>;
+}

package/dist/user-api-key/user-apikey.service.js

@@ -0,0 +1,91 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserApiKeyService = void 0;
+const common_1 = require("@nestjs/common");
+const typeorm_1 = require("@nestjs/typeorm");
+const nanoid_1 = require("nanoid");
+const typeorm_2 = require("typeorm");
+const userApiKey_entity_1 = require("./userApiKey.entity");
+let UserApiKeyService = class UserApiKeyService {
+    repository;
+    // private readonly logger = new Logger(UserApiKeyService.name);
+    constructor(repository) {
+        this.repository = repository;
+    }
+    async getAllForUser(uuid) {
+        return this.repository.find({
+            where: {
+                user: { uuid },
+            },
+        });
+    }
+    async findOneByKey(apiKey) {
+        return this.repository.findOneOrFail({
+            where: { apiKey },
+            relations: {
+                user: true,
+            },
+        });
+    }
+    /**
+     * When working on keys with the api, use an id to find the key
+     * @param id
+     * @returns
+     */
+    async findOneById(id) {
+        return this.repository.findOneOrFail({
+            where: { id },
+            relations: {
+                user: true,
+            },
+        });
+    }
+    async refreshKeyValue(uuid, currentUserUuid) {
+        const userApiKey = await this.repository.findOneBy({
+            uuid,
+            user: { uuid: currentUserUuid },
+        });
+        if (!userApiKey) {
+            throw new common_1.NotFoundException();
+        }
+        userApiKey.apiKey = "mKey_" + (0, nanoid_1.nanoid)();
+        return this.repository.save(userApiKey);
+    }
+    async createKey(currentUserId, description) {
+        const userApiKey = new userApiKey_entity_1.UserApiKey();
+        userApiKey.description = description;
+        userApiKey.userId = currentUserId;
+        userApiKey.apiKey = "mKey_" + (0, nanoid_1.nanoid)();
+        return this.repository.save(userApiKey);
+    }
+    async remove(uuid, currentUserUuid) {
+        const userApiKey = await this.repository.findOneBy({
+            uuid,
+            user: { uuid: currentUserUuid },
+        });
+        if (!userApiKey) {
+            throw new common_1.NotFoundException();
+        }
+        const result = await this.repository.remove(userApiKey);
+        return result.deletedDate !== undefined;
+    }
+};
+UserApiKeyService = __decorate([
+    (0, common_1.Injectable)(),
+    __param(0, (0, typeorm_1.InjectRepository)(userApiKey_entity_1.UserApiKey)),
+    __metadata("design:paramtypes", [typeorm_2.Repository])
+], UserApiKeyService);
+exports.UserApiKeyService = UserApiKeyService;
+//# sourceMappingURL=user-apikey.service.js.map

package/dist/user-api-key/user-apikey.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"user-apikey.service.js","sourceRoot":"","sources":["../../src/user-api-key/user-apikey.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA6D;AAC7D,6CAAiD;AACjD,mCAA8B;AAC9B,qCAAmC;AACnC,2DAA+C;AAGxC,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAId;IAHZ,gEAAgE;IAChE,YAEY,UAAkC;QAAlC,eAAU,GAAV,UAAU,CAAwB;IAC3C,CAAC;IAEJ,KAAK,CAAC,aAAa,CAAC,IAAY;QAC5B,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YACxB,KAAK,EAAE;gBACH,IAAI,EAAE,EAAC,IAAI,EAAC;aACf;SACJ,CAAC,CAAC;IACP,CAAC;IACD,KAAK,CAAC,YAAY,CAAC,MAAc;QAC7B,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC;YACjC,KAAK,EAAE,EAAC,MAAM,EAAC;YACf,SAAS,EAAE;gBACP,IAAI,EAAE,IAAI;aACb;SACJ,CAAC,CAAC;IACP,CAAC;IACD;;;;OAIG;IACH,KAAK,CAAC,WAAW,CAAC,EAAU;QACxB,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC;YACjC,KAAK,EAAE,EAAC,EAAE,EAAC;YACX,SAAS,EAAE;gBACP,IAAI,EAAE,IAAI;aACb;SACJ,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,eAAe,CACjB,IAAY,EACZ,eAAuB;QAEvB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC;YAC/C,IAAI;YACJ,IAAI,EAAE,EAAC,IAAI,EAAE,eAAe,EAAC;SAChC,CAAC,CAAC;QACH,IAAI,CAAC,UAAU,EAAE;YACb,MAAM,IAAI,0BAAiB,EAAE,CAAC;SACjC;QAED,UAAU,CAAC,MAAM,GAAG,OAAO,GAAG,IAAA,eAAM,GAAE,CAAC;QAEvC,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,SAAS,CACX,aAAqB,EACrB,WAAmB;QAEnB,MAAM,UAAU,GAAG,IAAI,8BAAU,EAAE,CAAC;QACpC,UAAU,CAAC,WAAW,GAAG,WAAW,CAAC;QACrC,UAAU,CAAC,MAAM,GAAG,aAAa,CAAC;QAClC,UAAU,CAAC,MAAM,GAAG,OAAO,GAAG,IAAA,eAAM,GAAE,CAAC;QAEvC,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAY,EAAE,eAAuB;QAC9C,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC;YAC/C,IAAI;YACJ,IAAI,EAAE,EAAC,IAAI,EAAE,eAAe,EAAC;SAChC,CAAC,CAAC;QACH,IAAI,CAAC,UAAU,EAAE;YACb,MAAM,IAAI,0BAAiB,EAAE,CAAC;SACjC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACxD,OAAO,MAAM,CAAC,WAAW,KAAK,SAAS,CAAC;IAC5C,CAAC;CACJ,CAAA;AA7EY,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;IAIJ,WAAA,IAAA,0BAAgB,EAAC,8BAAU,CAAC,CAAA;qCACT,oBAAU;GAJzB,iBAAiB,CA6E7B;AA7EY,8CAAiB"}

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

@@ -0,0 +1,12 @@
+import { User } from "../user-internal";
+export declare class UserApiKey {
+    id: number;
+    uuid: string;
+    apiKey: string;
+    description: string;
+    user: User;
+    userId: number;
+    createdDate: Date;
+    updateDate: Date;
+    deletedDate: Date;
+}