@darraghor/nest-backend-libs 2.21.4 → 2.22.0

package/dist/authz/RequestWithUser.d.ts

@@ -1,8 +1,8 @@
-import { Person } from "../person-internal/entities/person.entity";
+import { User } from "../user-internal/entities/user.entity";
 import { Request } from "express";
 export interface RequestWithUser extends Request {
-    user: RequestPerson;
+    user: RequestUser;
 }
-export type RequestPerson = Pick<Person, Exclude<keyof Person, "nullChecks">> & {
+export type RequestUser = Pick<User, Exclude<keyof User, "nullChecks">> & {
     permissions: string[];
 };

package/dist/authz/UserValidation.service.d.ts

@@ -1,13 +1,13 @@
 import { Repository } from "typeorm";
 import { AuthZClientService } from "../authzclient/authz.service";
 import { UserProfile } from "../authzclient/UserProfile.dto";
-import { Person } from "../person-internal";
+import { User } from "../user-internal";
 import { AccessToken } from "./AccessToken";
 export declare class UserValidationService {
     private repository;
     private authzClient;
-    constructor(repository: Repository<Person>, authzClient: AuthZClientService);
+    constructor(repository: Repository<User>, authzClient: AuthZClientService);
     getAuth0User(payload: AccessToken, rawAccessToken: string): Promise<UserProfile | undefined>;
-    validateUser(payload: AccessToken, rawAccessToken: string): Promise<Person | undefined>;
-    updatePersonFromAuth0(person: Person, auth0User: UserProfile): Promise<Person>;
+    validateUser(payload: AccessToken, rawAccessToken: string): Promise<User | undefined>;
+    updateUserFromAuth0(user: User, auth0User: UserProfile): Promise<User>;
 }

package/dist/authz/UserValidation.service.js

@@ -22,7 +22,7 @@ const organisation_membership_entity_1 = require("../organisation-memberships/en
 const RolesEnum_1 = require("../organisation/dto/RolesEnum");
 const member_role_entity_1 = require("../organisation/entities/member-role.entity");
 const organisation_entity_1 = require("../organisation/entities/organisation.entity");
-const person_internal_1 = require("../person-internal");
+const user_internal_1 = require("../user-internal");
 let UserValidationService = class UserValidationService {
     repository;
     authzClient;
@@ -34,20 +34,20 @@ let UserValidationService = class UserValidationService {
         return await this.authzClient.getUser(rawAccessToken);
     }
     async validateUser(payload, rawAccessToken) {
-        // try to find the person and their memberships
-        const foundPerson = await this.repository.findOne({
+        // try to find the user and their memberships
+        const foundUser = await this.repository.findOne({
             where: { auth0UserId: payload.sub },
             relations: {
                 memberships: true,
             },
         });
-        // if person already configured then get out of here
-        if (foundPerson !== undefined &&
-            foundPerson !== null &&
-            foundPerson.memberships.length > 0) {
-            return foundPerson;
+        // if user already configured then get out of here
+        if (foundUser !== undefined &&
+            foundUser !== null &&
+            foundUser.memberships.length > 0) {
+            return foundUser;
         }
-        // if no person is found locally then get the user's profile details from auth0
+        // if no user is found locally then get the user's profile details from auth0
         const auth0User = await this.getAuth0User(payload, rawAccessToken);
         if (auth0User === undefined) {
             return;
@@ -64,34 +64,34 @@ let UserValidationService = class UserValidationService {
         const membership = new organisation_membership_entity_1.OrganisationMembership();
         membership.organisation = unsavedOrganisation;
         membership.roles = [ownerRole];
-        if (foundPerson !== undefined && foundPerson !== null) {
-            // if person already exists then add the membership to the existing person
-            foundPerson.memberships = [membership];
-            return this.repository.save(foundPerson);
+        if (foundUser !== undefined && foundUser !== null) {
+            // if user already exists then add the membership to the existing user
+            foundUser.memberships = [membership];
+            return this.repository.save(foundUser);
         }
-        const person = this.repository.create();
-        person.memberships = [membership];
+        const user = this.repository.create();
+        user.memberships = [membership];
         // eslint-disable-next-line sonarjs/prefer-immediate-return
-        const updatedPerson = this.updatePersonFromAuth0(person, auth0User);
-        return updatedPerson;
+        const updatedUser = this.updateUserFromAuth0(user, auth0User);
+        return updatedUser;
     }
-    async updatePersonFromAuth0(person, auth0User) {
-        person.auth0UserId = auth0User.sub;
-        person.blocked = false;
-        person.email = auth0User.email;
-        person.emailVerified = auth0User.email_verified;
-        person.familyName = auth0User.family_name;
-        person.givenName = auth0User.given_name;
-        person.name = auth0User.name;
-        person.picture = auth0User.picture;
-        person.username = auth0User.preferred_username;
-        // save person
-        return this.repository.save(person);
+    async updateUserFromAuth0(user, auth0User) {
+        user.auth0UserId = auth0User.sub;
+        user.blocked = false;
+        user.email = auth0User.email;
+        user.emailVerified = auth0User.email_verified;
+        user.familyName = auth0User.family_name;
+        user.givenName = auth0User.given_name;
+        user.name = auth0User.name;
+        user.picture = auth0User.picture;
+        user.username = auth0User.preferred_username;
+        // save user
+        return this.repository.save(user);
     }
 };
 UserValidationService = __decorate([
     (0, common_1.Injectable)(),
-    __param(0, (0, typeorm_1.InjectRepository)(person_internal_1.Person)),
+    __param(0, (0, typeorm_1.InjectRepository)(user_internal_1.User)),
     __metadata("design:paramtypes", [typeorm_2.Repository,
         authz_service_1.AuthZClientService])
 ], UserValidationService);

package/dist/authz/UserValidation.service.js.map

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

package/dist/authz/authz.module.js

@@ -18,7 +18,7 @@ const AuthConfigurationVariables_1 = __importDefault(require("./AuthConfiguratio
 const config_1 = require("@nestjs/config");
 const UserValidation_service_1 = require("./UserValidation.service");
 const typeorm_1 = require("@nestjs/typeorm");
-const person_entity_1 = require("../person-internal/entities/person.entity");
+const user_entity_1 = require("../user-internal/entities/user.entity");
 const authz_client_module_1 = require("../authzclient/authz-client.module");
 let AuthzModule = class AuthzModule {
 };
@@ -27,7 +27,7 @@ AuthzModule = __decorate([
     (0, common_1.Module)({
         imports: [
             config_1.ConfigModule.forFeature(AuthConfigurationVariables_1.default),
-            typeorm_1.TypeOrmModule.forFeature([person_entity_1.Person]),
+            typeorm_1.TypeOrmModule.forFeature([user_entity_1.User]),
             passport_1.PassportModule.register({ defaultStrategy: "jwt" }),
             authz_client_module_1.AuthzClientModule,
         ],

package/dist/authz/authz.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"authz.module.js","sourceRoot":"","sources":["../../src/authz/authz.module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA8C;AAC9C,+CAAgD;AAChD,yEAAoE;AACpE,mDAA4C;AAC5C,8FAA2D;AAC3D,2CAA4C;AAC5C,qEAA+D;AAC/D,6CAA8C;AAC9C,6EAAiE;AACjE,4EAAqE;AAa9D,IAAM,WAAW,GAAjB,MAAM,WAAW;CAAG,CAAA;AAAd,WAAW;IAXvB,IAAA,eAAM,GAAE;IACR,IAAA,eAAM,EAAC;QACJ,OAAO,EAAE;YACL,qBAAY,CAAC,UAAU,CAAC,oCAAe,CAAC;YACxC,uBAAa,CAAC,UAAU,CAAC,CAAC,sBAAM,CAAC,CAAC;YAClC,yBAAc,CAAC,QAAQ,CAAC,EAAC,eAAe,EAAE,KAAK,EAAC,CAAC;YACjD,uCAAiB;SACpB;QACD,SAAS,EAAE,CAAC,2BAAW,EAAE,mDAAwB,EAAE,8CAAqB,CAAC;QACzE,OAAO,EAAE,CAAC,yBAAc,EAAE,mDAAwB,CAAC;KACtD,CAAC;GACW,WAAW,CAAG;AAAd,kCAAW"}
+{"version":3,"file":"authz.module.js","sourceRoot":"","sources":["../../src/authz/authz.module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA8C;AAC9C,+CAAgD;AAChD,yEAAoE;AACpE,mDAA4C;AAC5C,8FAA2D;AAC3D,2CAA4C;AAC5C,qEAA+D;AAC/D,6CAA8C;AAC9C,uEAA2D;AAC3D,4EAAqE;AAa9D,IAAM,WAAW,GAAjB,MAAM,WAAW;CAAG,CAAA;AAAd,WAAW;IAXvB,IAAA,eAAM,GAAE;IACR,IAAA,eAAM,EAAC;QACJ,OAAO,EAAE;YACL,qBAAY,CAAC,UAAU,CAAC,oCAAe,CAAC;YACxC,uBAAa,CAAC,UAAU,CAAC,CAAC,kBAAI,CAAC,CAAC;YAChC,yBAAc,CAAC,QAAQ,CAAC,EAAC,eAAe,EAAE,KAAK,EAAC,CAAC;YACjD,uCAAiB;SACpB;QACD,SAAS,EAAE,CAAC,2BAAW,EAAE,mDAAwB,EAAE,8CAAqB,CAAC;QACzE,OAAO,EAAE,CAAC,yBAAc,EAAE,mDAAwB,CAAC;KACtD,CAAC;GACW,WAAW,CAAG;AAAd,kCAAW"}

package/dist/authz/authzstrategy.d.ts

@@ -2,13 +2,13 @@ import { Strategy } from "passport-jwt";
 import { AccessToken } from "./AccessToken";
 import { Request } from "express";
 import { AuthConfigurationService } from "./AuthConfigurationService";
-import { RequestPerson } from "./RequestWithUser";
+import { RequestUser } from "./RequestWithUser";
 import { UserValidationService } from "./UserValidation.service";
 declare const JwtStrategy_base: new (...args: any[]) => Strategy;
 export declare class JwtStrategy extends JwtStrategy_base {
     private readonly userValidationService;
     private readonly logger;
     constructor(userValidationService: UserValidationService, config: AuthConfigurationService);
-    validate(request: Request, payload: AccessToken): Promise<RequestPerson | undefined>;
+    validate(request: Request, payload: AccessToken): Promise<RequestUser | undefined>;
 }
 export {};

package/dist/authz/authzstrategy.js

@@ -43,10 +43,10 @@ let JwtStrategy = JwtStrategy_1 = class JwtStrategy extends (0, passport_1.Passp
             this.logger.error("Couldn't log the raw access token");
             return;
         }
-        const personResult = await this.userValidationService.validateUser(payload, rawAccessToken);
+        const userResult = await this.userValidationService.validateUser(payload, rawAccessToken);
         const withPermissions = { permissions: payload.permissions || [] };
         // eslint-disable-next-line sonarjs/prefer-immediate-return
-        const rp = { ...personResult, ...withPermissions };
+        const rp = { ...userResult, ...withPermissions };
         return rp;
     }
 };

package/dist/authz/authzstrategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"authzstrategy.js","sourceRoot":"","sources":["../../src/authz/authzstrategy.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAkD;AAClD,+CAAkD;AAClD,+CAAkD;AAClD,uCAA2C;AAG3C,yEAAoE;AAEpE,qEAA+D;AAGxD,IAAM,WAAW,mBAAjB,MAAM,WAAY,SAAQ,IAAA,2BAAgB,EAAC,uBAAQ,CAAC;IAGlC;IAFJ,MAAM,GAAG,IAAI,eAAM,CAAC,aAAW,CAAC,IAAI,CAAC,CAAC;IACvD,YACqB,qBAA4C,EAC7D,MAAgC;QAEhC,KAAK,CAAC;YACF,mBAAmB,EAAE,IAAA,4BAAiB,EAAC;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,yBAAU,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,yBAAU,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,MAAM,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAC9D,OAAO,EACP,cAAc,CACjB,CAAC;QAEF,MAAM,eAAe,GAAG,EAAC,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,EAAE,EAAC,CAAC;QACjE,2DAA2D;QAC3D,MAAM,EAAE,GAAG,EAAC,GAAG,YAAY,EAAE,GAAG,eAAe,EAAkB,CAAC;QAClE,OAAO,EAAE,CAAC;IACd,CAAC;CACJ,CAAA;AA3CY,WAAW;IADvB,IAAA,mBAAU,GAAE;qCAImC,8CAAqB;QACrD,mDAAwB;GAJ3B,WAAW,CA2CvB;AA3CY,kCAAW"}
+{"version":3,"file":"authzstrategy.js","sourceRoot":"","sources":["../../src/authz/authzstrategy.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAkD;AAClD,+CAAkD;AAClD,+CAAkD;AAClD,uCAA2C;AAG3C,yEAAoE;AAEpE,qEAA+D;AAGxD,IAAM,WAAW,mBAAjB,MAAM,WAAY,SAAQ,IAAA,2BAAgB,EAAC,uBAAQ,CAAC;IAGlC;IAFJ,MAAM,GAAG,IAAI,eAAM,CAAC,aAAW,CAAC,IAAI,CAAC,CAAC;IACvD,YACqB,qBAA4C,EAC7D,MAAgC;QAEhC,KAAK,CAAC;YACF,mBAAmB,EAAE,IAAA,4BAAiB,EAAC;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,yBAAU,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,yBAAU,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,UAAU,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAC5D,OAAO,EACP,cAAc,CACjB,CAAC;QAEF,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;AA3CY,WAAW;IADvB,IAAA,mBAAU,GAAE;qCAImC,8CAAqB;QACrD,mDAAwB;GAJ3B,WAAW,CA2CvB;AA3CY,kCAAW"}

package/dist/database-postgres/PostgresTypeOrmConfigurationProvider.js

@@ -17,11 +17,10 @@ class PostgresTypeOrmConfigurationProvider {
         process.env.CORE_MODULE_ENTITY_PATH || "..", "**", "*.entity.{ts,js}");
         const appModulePath = path_1.default.join(
         // __dirname,
-        process.env.APP_MODULE_ENTITY_PATH ||
-            "../../../../../apps/backend/dist", "**", "*.entity.{ts,js}");
+        process.env.APP_MODULE_ENTITY_PATH || "dist", "**", "*.entity.{ts,js}");
         const migrationsPath = path_1.default.join(
         // __dirname,
-        process.env.MIGRATIONS_PATH || "../../../../../apps/backend/dist", "**", "migrations", "*.{ts,js}");
+        process.env.MIGRATIONS_PATH || "dist", "**", "migrations", "*.{ts,js}");
         console.log("Using database configuration paths", {
             appModulePath,
             moduleLocalDirName: __dirname,

package/dist/database-postgres/PostgresTypeOrmConfigurationProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"PostgresTypeOrmConfigurationProvider.js","sourceRoot":"","sources":["../../src/database-postgres/PostgresTypeOrmConfigurationProvider.ts"],"names":[],"mappings":";;;;;;AAGA,gDAAwB;AAGxB,MAAa,oCAAoC;IAC7C;;;;OAIG;IACI,MAAM,CAAC,gBAAgB;QAC1B,MAAM,kBAAkB,GAAG,cAAI,CAAC,IAAI;QAChC,aAAa;QACb,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,IAAI,EAC3C,IAAI,EACJ,kBAAkB,CACrB,CAAC;QAEF,MAAM,aAAa,GAAG,cAAI,CAAC,IAAI;QAC3B,aAAa;QACb,OAAO,CAAC,GAAG,CAAC,sBAAsB;YAC9B,kCAAkC,EACtC,IAAI,EACJ,kBAAkB,CACrB,CAAC;QAEF,MAAM,cAAc,GAAG,cAAI,CAAC,IAAI;QAC5B,aAAa;QACb,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,kCAAkC,EACjE,IAAI,EACJ,YAAY,EACZ,WAAW,CACd,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,oCAAoC,EAAE;YAC9C,aAAa;YACb,kBAAkB,EAAE,SAAS;YAC7B,cAAc;YACd,kBAAkB;YAClB,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;SACrB,CAAC,CAAC;QACH,gCAAgC;QAChC,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE;YAC1B,OAAO;gBACH,IAAI,EAAE,UAAU;gBAChB,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY;gBAC7B,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,KAAK,MAAM;gBACpD,mBAAmB,EAAE,YAAY;gBACjC,aAAa,EAAE,IAAI;gBACnB,WAAW,EAAE,KAAK;gBAClB,QAAQ,EAAE,CAAC,kBAAkB,EAAE,aAAa,CAAC;gBAC7C,UAAU,EAAE,CAAC,cAAc,CAAC;aAC/B,CAAC;SACL;QACD,iDAAiD;QACjD,OAAO;YACH,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;YACnC,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,MAAM,EAAE,EAAE,CAAC;YAClE,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;YACvC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;YAC3C,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;YAC3C,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;YACvC,mBAAmB,EAAE,YAAY;YACjC,aAAa,EAAE,IAAI;YACnB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,KAAK,MAAM;YACpD,WAAW,EAAE,KAAK;YAClB,QAAQ,EAAE,CAAC,kBAAkB,EAAE,aAAa,CAAC;YAC7C,UAAU,EAAE,CAAC,cAAc,CAAC;YAC5B,GAAG,EAAE;gBACD,aAAa,EAAE,gBAAgB;aAClC;SACiB,CAAC,CAAC,kDAAkD;IAC9E,CAAC;IAEM,MAAM,CAAC,oBAAoB;QAC9B,OAAO;YACH,GAAG,oCAAoC,CAAC,gBAAgB,EAAE;YAC1D,gBAAgB,EAAE,IAAI;SACzB,CAAC;IACN,CAAC;CACJ;AA5ED,oFA4EC"}
+{"version":3,"file":"PostgresTypeOrmConfigurationProvider.js","sourceRoot":"","sources":["../../src/database-postgres/PostgresTypeOrmConfigurationProvider.ts"],"names":[],"mappings":";;;;;;AAGA,gDAAwB;AAGxB,MAAa,oCAAoC;IAC7C;;;;OAIG;IACI,MAAM,CAAC,gBAAgB;QAC1B,MAAM,kBAAkB,GAAG,cAAI,CAAC,IAAI;QAChC,aAAa;QACb,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,IAAI,EAC3C,IAAI,EACJ,kBAAkB,CACrB,CAAC;QAEF,MAAM,aAAa,GAAG,cAAI,CAAC,IAAI;QAC3B,aAAa;QACb,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,MAAM,EAC5C,IAAI,EACJ,kBAAkB,CACrB,CAAC;QAEF,MAAM,cAAc,GAAG,cAAI,CAAC,IAAI;QAC5B,aAAa;QACb,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,MAAM,EACrC,IAAI,EACJ,YAAY,EACZ,WAAW,CACd,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,oCAAoC,EAAE;YAC9C,aAAa;YACb,kBAAkB,EAAE,SAAS;YAC7B,cAAc;YACd,kBAAkB;YAClB,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;SACrB,CAAC,CAAC;QACH,gCAAgC;QAChC,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE;YAC1B,OAAO;gBACH,IAAI,EAAE,UAAU;gBAChB,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY;gBAC7B,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,KAAK,MAAM;gBACpD,mBAAmB,EAAE,YAAY;gBACjC,aAAa,EAAE,IAAI;gBACnB,WAAW,EAAE,KAAK;gBAClB,QAAQ,EAAE,CAAC,kBAAkB,EAAE,aAAa,CAAC;gBAC7C,UAAU,EAAE,CAAC,cAAc,CAAC;aAC/B,CAAC;SACL;QACD,iDAAiD;QACjD,OAAO;YACH,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;YACnC,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,MAAM,EAAE,EAAE,CAAC;YAClE,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;YACvC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;YAC3C,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;YAC3C,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;YACvC,mBAAmB,EAAE,YAAY;YACjC,aAAa,EAAE,IAAI;YACnB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,KAAK,MAAM;YACpD,WAAW,EAAE,KAAK;YAClB,QAAQ,EAAE,CAAC,kBAAkB,EAAE,aAAa,CAAC;YAC7C,UAAU,EAAE,CAAC,cAAc,CAAC;YAC5B,GAAG,EAAE;gBACD,aAAa,EAAE,gBAAgB;aAClC;SACiB,CAAC,CAAC,kDAAkD;IAC9E,CAAC;IAEM,MAAM,CAAC,oBAAoB;QAC9B,OAAO;YACH,GAAG,oCAAoC,CAAC,gBAAgB,EAAE;YAC1D,gBAAgB,EAAE,IAAI;SACzB,CAAC;IACN,CAAC;CACJ;AA3ED,oFA2EC"}

package/dist/index.d.ts

@@ -21,5 +21,5 @@ export * from "./organisation-subscriptions/index";
 export * from "./organisation/index";
 export * from "./authz/index";
 export * from "./invitations/index";
-export * from "./person-internal/index";
-export * from "./person-external/index";
+export * from "./user-internal/index";
+export * from "./user-external/index";

package/dist/index.js

@@ -54,6 +54,6 @@ __exportStar(require("./organisation-subscriptions/index"), exports);
 __exportStar(require("./organisation/index"), exports);
 __exportStar(require("./authz/index"), exports);
 __exportStar(require("./invitations/index"), exports);
-__exportStar(require("./person-internal/index"), exports);
-__exportStar(require("./person-external/index"), exports);
+__exportStar(require("./user-internal/index"), exports);
+__exportStar(require("./user-external/index"), exports);
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,+CAA+C;AAC/C,8FAAwF;AAgCpF,yGAhCI,oDAAwB,OAgCJ;AA/B5B,oFAA6E;AA6BzE,qGA7BI,6CAAoB,OA6BJ;AA5BxB,2FAAmF;AAiB/E,sGAjBI,gDAAqB,OAiBJ;AAhBzB,mDAA+C;AA4B3C,gGA5BI,gCAAe,OA4BJ;AA3BnB,iGAA4F;AAsBxF,8GAtBI,6DAA6B,OAsBJ;AArBjC,qFAAgF;AAa5E,yGAbI,mDAAwB,OAaJ;AAZ5B,yFAAmF;AAiBrD,+FAjBtB,gDAAsB,OAiBc;AAhB5C,mHAA8G;AAiBlE,6GAjBpC,2EAAoC,OAiB4B;AAhBxE,mFAA6E;AAmBzE,qGAnBI,4CAAoB,OAmBJ;AAlBxB,6GAAwG;AAmBpG,mHAnBI,uEAAkC,OAmBJ;AAlBtC,mFAAyE;AAerE,gGAfI,sCAAe,OAeJ;AAdnB,gEAAsD;AASlD,2FATI,4BAAU,OASJ;AARd,sDAAiD;AAU7C,2FAVI,uBAAU,OAUJ;AATd,6FAAsF;AAgBlF,qGAhBI,6CAAoB,OAgBJ;AAfxB,uEAAiE;AAO7D,iGAPI,oCAAgB,OAOJ;AANpB,8EAAyE;AAkBrE,kGAlBI,qCAAiB,OAkBJ;AAGrB,wDAAsC;AACtC,mEAAiD;AACjD,qEAAmD;AACnD,uDAAqC;AACrC,gDAA8B;AAC9B,sDAAoC;AACpC,0DAAwC;AACxC,0DAAwC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,+CAA+C;AAC/C,8FAAwF;AAgCpF,yGAhCI,oDAAwB,OAgCJ;AA/B5B,oFAA6E;AA6BzE,qGA7BI,6CAAoB,OA6BJ;AA5BxB,2FAAmF;AAiB/E,sGAjBI,gDAAqB,OAiBJ;AAhBzB,mDAA+C;AA4B3C,gGA5BI,gCAAe,OA4BJ;AA3BnB,iGAA4F;AAsBxF,8GAtBI,6DAA6B,OAsBJ;AArBjC,qFAAgF;AAa5E,yGAbI,mDAAwB,OAaJ;AAZ5B,yFAAmF;AAiBrD,+FAjBtB,gDAAsB,OAiBc;AAhB5C,mHAA8G;AAiBlE,6GAjBpC,2EAAoC,OAiB4B;AAhBxE,mFAA6E;AAmBzE,qGAnBI,4CAAoB,OAmBJ;AAlBxB,6GAAwG;AAmBpG,mHAnBI,uEAAkC,OAmBJ;AAlBtC,mFAAyE;AAerE,gGAfI,sCAAe,OAeJ;AAdnB,gEAAsD;AASlD,2FATI,4BAAU,OASJ;AARd,sDAAiD;AAU7C,2FAVI,uBAAU,OAUJ;AATd,6FAAsF;AAgBlF,qGAhBI,6CAAoB,OAgBJ;AAfxB,uEAAiE;AAO7D,iGAPI,oCAAgB,OAOJ;AANpB,8EAAyE;AAkBrE,kGAlBI,qCAAiB,OAkBJ;AAGrB,wDAAsC;AACtC,mEAAiD;AACjD,qEAAmD;AACnD,uDAAqC;AACrC,gDAA8B;AAC9B,sDAAoC;AACpC,wDAAsC;AACtC,wDAAsC"}

package/dist/invitations/invitation.service.d.ts

@@ -4,13 +4,13 @@ import { Invitation } from "./entities/invitation.entity";
 import { SmtpEmailClient } from "../smtp-email-client/email-client.service";
 import { Organisation } from "../organisation/entities/organisation.entity";
 import { InvitationsConfigurationService } from "./InvitationConfigurationService";
-import { RequestPerson } from "../authz/RequestWithUser";
+import { RequestUser } from "../authz/RequestWithUser";
 export declare class InvitationService {
     private invitationRepository;
     private organisationRepository;
     private readonly emailClient;
     private readonly configService;
     constructor(invitationRepository: Repository<Invitation>, organisationRepository: Repository<Organisation>, emailClient: SmtpEmailClient, configService: InvitationsConfigurationService);
-    create(createDto: CreateInvitationDto, createdBy: RequestPerson): Promise<Invitation>;
+    create(createDto: CreateInvitationDto, createdBy: RequestUser): Promise<Invitation>;
     remove(uuid: string, currentUserId: number): Promise<Invitation>;
 }

package/dist/invitations/invitation.service.js

@@ -71,7 +71,7 @@ let InvitationService = class InvitationService {
                 uuid,
                 organisation: {
                     memberships: {
-                        person: {
+                        user: {
                             id: currentUserId,
                         },
                         roles: {

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/dto/create-organisation.dto.d.ts

@@ -1,6 +1,6 @@
-import { Person } from "../../person-internal/entities/person.entity";
+import { User } from "../../user-internal/entities/user.entity";
 export declare class CreateOrganisationDto {
-    members: Person[];
-    owner: Person;
+    members: User[];
+    owner: User;
     name: string;
 }

package/dist/organisation/dto/create-organisation.dto.js

@@ -11,19 +11,19 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreateOrganisationDto = void 0;
 const swagger_1 = require("@nestjs/swagger");
-const person_entity_1 = require("../../person-internal/entities/person.entity");
+const user_entity_1 = require("../../user-internal/entities/user.entity");
 class CreateOrganisationDto {
     members;
     owner;
     name;
 }
 __decorate([
-    (0, swagger_1.ApiProperty)({ type: person_entity_1.Person, isArray: true }),
+    (0, swagger_1.ApiProperty)({ type: user_entity_1.User, isArray: true }),
     __metadata("design:type", Array)
 ], CreateOrganisationDto.prototype, "members", void 0);
 __decorate([
-    (0, swagger_1.ApiProperty)({ type: person_entity_1.Person }),
-    __metadata("design:type", person_entity_1.Person)
+    (0, swagger_1.ApiProperty)({ type: user_entity_1.User }),
+    __metadata("design:type", user_entity_1.User)
 ], CreateOrganisationDto.prototype, "owner", void 0);
 __decorate([
     (0, swagger_1.ApiProperty)(),

package/dist/organisation/dto/create-organisation.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-organisation.dto.js","sourceRoot":"","sources":["../../../src/organisation/dto/create-organisation.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA4C;AAC5C,gFAAoE;AAEpE,MAAa,qBAAqB;IAE9B,OAAO,CAAY;IAGnB,KAAK,CAAU;IAGf,IAAI,CAAU;CACjB;AARG;IAAC,IAAA,qBAAW,EAAC,EAAC,IAAI,EAAE,sBAAM,EAAE,OAAO,EAAE,IAAI,EAAC,CAAC;;sDACxB;AAEnB;IAAC,IAAA,qBAAW,EAAC,EAAC,IAAI,EAAE,sBAAM,EAAC,CAAC;8BACpB,sBAAM;oDAAC;AAEf;IAAC,IAAA,qBAAW,GAAE;;mDACA;AARlB,sDASC"}
+{"version":3,"file":"create-organisation.dto.js","sourceRoot":"","sources":["../../../src/organisation/dto/create-organisation.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA4C;AAC5C,0EAA8D;AAE9D,MAAa,qBAAqB;IAE9B,OAAO,CAAU;IAGjB,KAAK,CAAQ;IAGb,IAAI,CAAU;CACjB;AARG;IAAC,IAAA,qBAAW,EAAC,EAAC,IAAI,EAAE,kBAAI,EAAE,OAAO,EAAE,IAAI,EAAC,CAAC;;sDACxB;AAEjB;IAAC,IAAA,qBAAW,EAAC,EAAC,IAAI,EAAE,kBAAI,EAAC,CAAC;8BAClB,kBAAI;oDAAC;AAEb;IAAC,IAAA,qBAAW,GAAE;;mDACA;AARlB,sDASC"}

package/dist/organisation/organisation.service.js

@@ -33,7 +33,7 @@ let OrganisationService = class OrganisationService {
         unsavedOrganisation.memberships = [];
         // add the owner
         const ownerMembership = new organisation_membership_entity_1.OrganisationMembership();
-        ownerMembership.person = createOrganisationDto.owner;
+        ownerMembership.user = createOrganisationDto.owner;
         const ownerRole = new member_role_entity_1.MembershipRole();
         ownerRole.name = RolesEnum_1.Roles.owner;
         ownerMembership.roles.push(ownerRole);
@@ -41,7 +41,7 @@ let OrganisationService = class OrganisationService {
         // add all the others
         const normalMemberships = createOrganisationDto.members.map((member) => {
             const membership = new organisation_membership_entity_1.OrganisationMembership();
-            membership.person = member;
+            membership.user = member;
             const memberRole = new member_role_entity_1.MembershipRole();
             memberRole.name = RolesEnum_1.Roles.member;
             membership.roles.push(memberRole);
@@ -54,7 +54,7 @@ let OrganisationService = class OrganisationService {
         return this.repository.find({
             where: {
                 memberships: {
-                    person: {
+                    user: {
                         id: currentUserId,
                     },
                 },
@@ -66,7 +66,7 @@ let OrganisationService = class OrganisationService {
             where: {
                 uuid,
                 memberships: {
-                    person: {
+                    user: {
                         id: currentUserId,
                     },
                 },
@@ -82,7 +82,7 @@ let OrganisationService = class OrganisationService {
             where: {
                 uuid,
                 memberships: {
-                    person: {
+                    user: {
                         id: currentUserId,
                     },
                     roles: {
@@ -99,7 +99,7 @@ let OrganisationService = class OrganisationService {
             where: {
                 uuid,
                 memberships: {
-                    person: {
+                    user: {
                         id: currentUserId,
                     },
                     roles: {

package/dist/organisation/organisation.service.js.map

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

package/dist/organisation-memberships/dtos/create-membership-dto.d.ts

@@ -1,4 +1,4 @@
 export declare class CreateUpdateMembershipDto {
-    personId: number;
+    userId: number;
     roles: string[];
 }

package/dist/organisation-memberships/dtos/create-membership-dto.js

@@ -12,13 +12,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreateUpdateMembershipDto = void 0;
 const swagger_1 = require("@nestjs/swagger");
 class CreateUpdateMembershipDto {
-    personId;
+    userId;
     roles;
 }
 __decorate([
     (0, swagger_1.ApiProperty)(),
     __metadata("design:type", Number)
-], CreateUpdateMembershipDto.prototype, "personId", void 0);
+], CreateUpdateMembershipDto.prototype, "userId", void 0);
 __decorate([
     (0, swagger_1.ApiProperty)({ type: String, isArray: true }),
     __metadata("design:type", Array)

package/dist/organisation-memberships/dtos/create-membership-dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-membership-dto.js","sourceRoot":"","sources":["../../../src/organisation-memberships/dtos/create-membership-dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA4C;AAE5C,MAAa,yBAAyB;IAElC,QAAQ,CAAU;IAGlB,KAAK,CAAY;CACpB;AALG;IAAC,IAAA,qBAAW,GAAE;;2DACI;AAElB;IAAC,IAAA,qBAAW,EAAC,EAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAC,CAAC;;wDAC1B;AALrB,8DAMC"}
+{"version":3,"file":"create-membership-dto.js","sourceRoot":"","sources":["../../../src/organisation-memberships/dtos/create-membership-dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA4C;AAE5C,MAAa,yBAAyB;IAElC,MAAM,CAAU;IAGhB,KAAK,CAAY;CACpB;AALG;IAAC,IAAA,qBAAW,GAAE;;yDACE;AAEhB;IAAC,IAAA,qBAAW,EAAC,EAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAC,CAAC;;wDAC1B;AALrB,8DAMC"}

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

@@ -1,11 +1,11 @@
 import { MembershipRole } from "../../organisation/entities/member-role.entity";
 import { Organisation } from "../../organisation/entities/organisation.entity";
-import { Person } from "../../person-internal/entities/person.entity";
+import { User } from "../../user-internal/entities/user.entity";
 export declare class OrganisationMembership {
     id: number;
     uuid: string;
-    person: Person;
-    personId: number;
+    user: User;
+    userId: number;
     organisation: Organisation;
     organisationId: number;
     roles: MembershipRole[];

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

@@ -15,12 +15,12 @@ const class_transformer_1 = require("class-transformer");
 const typeorm_1 = require("typeorm");
 const member_role_entity_1 = require("../../organisation/entities/member-role.entity");
 const organisation_entity_1 = require("../../organisation/entities/organisation.entity");
-const person_entity_1 = require("../../person-internal/entities/person.entity");
+const user_entity_1 = require("../../user-internal/entities/user.entity");
 let OrganisationMembership = class OrganisationMembership {
     id;
     uuid;
-    person;
-    personId;
+    user;
+    userId;
     organisation;
     organisationId;
     roles;
@@ -50,18 +50,18 @@ __decorate([
     __metadata("design:type", String)
 ], OrganisationMembership.prototype, "uuid", void 0);
 __decorate([
-    (0, typeorm_1.ManyToOne)(() => person_entity_1.Person, (person) => person.memberships, {
+    (0, typeorm_1.ManyToOne)(() => user_entity_1.User, (user) => user.memberships, {
         eager: true,
         cascade: ["insert", "update"],
     }),
-    __metadata("design:type", person_entity_1.Person)
-], OrganisationMembership.prototype, "person", void 0);
+    __metadata("design:type", user_entity_1.User)
+], OrganisationMembership.prototype, "user", void 0);
 __decorate([
     (0, typeorm_1.Column)(),
     (0, swagger_1.ApiProperty)(),
-    (0, typeorm_1.RelationId)((membership) => membership.person),
+    (0, typeorm_1.RelationId)((membership) => membership.user),
     __metadata("design:type", Number)
-], OrganisationMembership.prototype, "personId", void 0);
+], OrganisationMembership.prototype, "userId", void 0);
 __decorate([
     (0, typeorm_1.ManyToOne)(() => organisation_entity_1.Organisation, (org) => org.memberships, {
         eager: true,

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,gFAAoE;AAG7D,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAG/B,EAAE,CAAU;IASL,IAAI,CAAU;IAMrB,MAAM,CAAU;IAKT,QAAQ,CAAU;IAMzB,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,sBAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE;QACrD,KAAK,EAAE,IAAI;QACX,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;KAChC,CAAC;8BACO,sBAAM;sDAAC;AAEhB;IAAC,IAAA,gBAAM,GAAE;IACR,IAAA,qBAAW,GAAE;IACb,IAAA,oBAAU,EAAC,CAAC,UAAkC,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC;;wDAC7C;AAEzB;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":";;;;;;;;;;;;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"}

package/dist/organisation-memberships/organisation-memberships.service.js

@@ -40,8 +40,8 @@ let OrganisationMembershipsService = class OrganisationMembershipsService {
                 roles: true,
             },
         });
-        // is the person a member of the organisation?
-        const isAMember = memberships.some((m) => m.person.id === currentUserId);
+        // is the user a member of the organisation?
+        const isAMember = memberships.some((m) => m.user.id === currentUserId);
         if (!isAMember) {
             throw new Error("You are not a member of this organisation");
         }
@@ -65,8 +65,8 @@ let OrganisationMembershipsService = class OrganisationMembershipsService {
         }
         // check if the user is allowed to work with memberships
         this.currentUserIsOwnerGuard(org, currentUserId);
-        // existing membership for this person?
-        const existingMembership = org.memberships.find((m) => m.person.id === createOmDto.personId);
+        // existing membership for this user?
+        const existingMembership = org.memberships.find((m) => m.user.id === createOmDto.userId);
         if (existingMembership) {
             // add all roles to the existing membership
             for (const role of createOmDto.roles) {
@@ -83,7 +83,7 @@ let OrganisationMembershipsService = class OrganisationMembershipsService {
         else {
             // create a new membership
             const newMembership = new organisation_membership_entity_1.OrganisationMembership();
-            newMembership.personId = createOmDto.personId;
+            newMembership.userId = createOmDto.userId;
             for (const role of createOmDto.roles) {
                 const newRole = new member_role_entity_1.MembershipRole();
                 newRole.name = role;
@@ -94,7 +94,7 @@ let OrganisationMembershipsService = class OrganisationMembershipsService {
         return await this.orgRepo.save(org);
     }
     currentUserIsOwnerGuard(org, currentUserId) {
-        const membership = org.memberships.find((m) => m.person.id === currentUserId &&
+        const membership = org.memberships.find((m) => m.user.id === currentUserId &&
             m.roles.some((r) => r.name === RolesEnum_1.Roles.owner));
         if (!membership) {
             throw new common_1.NotFoundException("You are not allowed to add a member to this organisation");

package/dist/organisation-memberships/organisation-memberships.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"organisation-memberships.service.js","sourceRoot":"","sources":["../../src/organisation-memberships/organisation-memberships.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"organisation-memberships.service.js","sourceRoot":"","sources":["../../src/organisation-memberships/organisation-memberships.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA6D;AAC7D,6CAAiD;AACjD,qCAAiD;AACjD,6DAAoD;AACpD,oFAA2E;AAC3E,sFAA0E;AAE1E,8FAAiF;AAG1E,IAAM,8BAA8B,GAApC,MAAM,8BAA8B;IAG3B;IAEA;IAJZ,YAEY,OAAiC,EAEjC,cAAkD;QAFlD,YAAO,GAAP,OAAO,CAA0B;QAEjC,mBAAc,GAAd,cAAc,CAAoC;IAC3D,CAAC;IACI,eAAe,GACnB,mDAAmD,CAAC;IACxD,KAAK,CAAC,iBAAiB,CACnB,OAAe,EACf,aAAqB;QAErB,0BAA0B;QAC1B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;YAC/C,KAAK,EAAE;gBACH,YAAY,EAAE;oBACV,IAAI,EAAE,OAAO;iBAChB;aACJ;YACD,SAAS,EAAE;gBACP,KAAK,EAAE,IAAI;aACd;SACJ,CAAC,CAAC;QAEH,4CAA4C;QAC5C,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,aAAa,CAAC,CAAC;QAEvE,IAAI,CAAC,SAAS,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;SAChE;QACD,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;QACxC,OAAO,WAAW,CAAC;IACvB,CAAC;IACD,KAAK,CAAC,cAAc,CAChB,OAAe,EACf,WAAsC,EACtC,aAAqB;QAErB,eAAe;QACf,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;YACnC,KAAK,EAAE;gBACH,IAAI,EAAE,OAAO;aAChB;YACD,SAAS,EAAE;gBACP,WAAW,EAAE;oBACT,KAAK,EAAE,IAAI;iBACd;aACJ;SACJ,CAAC,CAAC;QACH,IAAI,CAAC,GAAG,EAAE;YACN,MAAM,IAAI,0BAAiB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;SACrD;QACD,wDAAwD;QACxD,IAAI,CAAC,uBAAuB,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;QAEjD,qCAAqC;QACrC,MAAM,kBAAkB,GAAG,GAAG,CAAC,WAAW,CAAC,IAAI,CAC3C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,WAAW,CAAC,MAAM,CAC1C,CAAC;QACF,IAAI,kBAAkB,EAAE;YACpB,2CAA2C;YAC3C,KAAK,MAAM,IAAI,IAAI,WAAW,CAAC,KAAK,EAAE;gBAClC,MAAM,YAAY,GAAG,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAC9C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CACzB,CAAC;gBACF,IAAI,CAAC,YAAY,EAAE;oBACf,MAAM,OAAO,GAAG,IAAI,mCAAc,EAAE,CAAC;oBACrC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;oBACpB,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;iBAC1C;aACJ;YACD,2CAA2C;YAC3C,kBAAkB,CAAC,KAAK,GAAG,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAC7D,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CACrC,CAAC;SACL;aAAM;YACH,0BAA0B;YAC1B,MAAM,aAAa,GAAG,IAAI,uDAAsB,EAAE,CAAC;YACnD,aAAa,CAAC,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;YAC1C,KAAK,MAAM,IAAI,IAAI,WAAW,CAAC,KAAK,EAAE;gBAClC,MAAM,OAAO,GAAG,IAAI,mCAAc,EAAE,CAAC;gBACrC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;gBACpB,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aACrC;YACD,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;SACvC;QAED,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACxC,CAAC;IAEO,uBAAuB,CAAC,GAAiB,EAAE,aAAqB;QACpE,MAAM,UAAU,GAAG,GAAG,CAAC,WAAW,CAAC,IAAI,CACnC,CAAC,CAAC,EAAE,EAAE,CACF,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,aAAa;YAC3B,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,iBAAK,CAAC,KAAK,CAAC,CAClD,CAAC;QACF,IAAI,CAAC,UAAU,EAAE;YACb,MAAM,IAAI,0BAAiB,CACvB,0DAA0D,CAC7D,CAAC;SACL;IACL,CAAC;IAED,KAAK,CAAC,MAAM,CACR,OAAe,EACf,cAAsB,EACtB,aAAqB;QAErB,eAAe;QACf,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;YACnC,KAAK,EAAE;gBACH,IAAI,EAAE,OAAO;aAChB;YACD,SAAS,EAAE;gBACP,WAAW,EAAE;oBACT,KAAK,EAAE,IAAI;iBACd;aACJ;SACJ,CAAC,CAAC;QACH,IAAI,CAAC,GAAG,EAAE;YACN,MAAM,IAAI,0BAAiB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;SACrD;QACD,wDAAwD;QACxD,IAAI,CAAC,uBAAuB,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;QAEjD,wBAAwB;QACxB,MAAM,UAAU,GAAG,GAAG,CAAC,WAAW,CAAC,IAAI,CACnC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,cAAc,CACnC,CAAC;QACF,IAAI,CAAC,UAAU,EAAE;YACb,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;SAC3C;QACD,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IAC3D,CAAC;CACJ,CAAA;AAvIY,8BAA8B;IAD1C,IAAA,mBAAU,GAAE;IAGJ,WAAA,IAAA,0BAAgB,EAAC,kCAAY,CAAC,CAAA;IAE9B,WAAA,IAAA,0BAAgB,EAAC,uDAAsB,CAAC,CAAA;qCADxB,oBAAU;QAEH,oBAAU;GAL7B,8BAA8B,CAuI1C;AAvIY,wEAA8B"}

package/dist/organisation-subscriptions/organisation-subscriptions.service.js

@@ -38,7 +38,7 @@ let OrganisationSubscriptionService = OrganisationSubscriptionService_1 = class
             where: {
                 id: orgId,
                 memberships: {
-                    personId: currentUserId,
+                    userId: currentUserId,
                     roles: {
                         name: RolesEnum_1.Roles.owner,
                     },