@stamhoofd/models 2.3.0 → 2.5.0

package/src/models/User.ts

@@ -1,11 +1,11 @@
 
 import { column, Database, ManyToOneRelation, Model } from "@simonbackx/simple-database";
 import { EmailInterfaceRecipient } from "@stamhoofd/email";
-import { LoginProviderType, NewUser, Permissions, User as UserStruct,UserMeta, UserPermissions } from "@stamhoofd/structures";
+import { LoginProviderType, NewUser, Permissions, UserMeta, UserPermissions, User as UserStruct } from "@stamhoofd/structures";
 import argon2 from "argon2";
 import { v4 as uuidv4 } from "uuid";
 
-import { Organization, Platform } from "./";
+import { Organization } from "./";
 
 export class User extends Model {
     static table = "users";
@@ -21,6 +21,9 @@ export class User extends Model {
     @column({ foreignKey: User.organization, type: "string", nullable: true })
     organizationId: string|null;
 
+    @column({ type: "string", nullable: true })
+    memberId: string|null = null
+
     @column({ type: "string", nullable: true })
     firstName: string | null = null;
 
@@ -347,6 +350,11 @@ export class User extends Model {
             throw new Error("Missing organization")
         }
 
+        if (await User.getForAuthentication(organization?.id ?? null, email, {allowWithoutAccount: true})) {
+            // Already exists
+            return;
+        }
+
         const user = new User();
         user.organizationId = STAMHOOFD.userMode === 'platform' ? null : (organization?.id ?? null)
         user.id = id ?? uuidv4()
@@ -429,7 +437,9 @@ export class User extends Model {
             email: this.email,
             verified: this.verified,
             permissions: this.permissions,
-            hasAccount: this.hasAccount()
+            hasAccount: this.hasAccount(),
+            memberId: this.memberId,
+            organizationId: this.organizationId
         });
     }
 

package/src/models/index.ts

@@ -48,3 +48,6 @@ export * from "./MemberResponsibilityRecord"
 export * from "./OrganizationRegistrationPeriod"
 export * from "./RegistrationPeriod"
 export * from "./MemberPlatformMembership"
+export * from "./Email"
+export * from "./EmailRecipient"
+export * from "./Event"