npm - @stamhoofd/models - Versions diffs - 2.89.1 → 2.90.0 - Mend

@stamhoofd/models 2.89.1 → 2.90.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (46) hide show

package/dist/src/helpers/MemberMerger.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MemberMerger.d.ts","sourceRoot":"","sources":["../../../src/helpers/MemberMerger.ts"],"names":[],"mappings":"AAWA,OAAO,EAGH,MAAM,EAMT,MAAM,WAAW,CAAC;AAEnB,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,iBAU3D;AAED,wBAAsB,gBAAgB,CAAC,EACnC,SAAS,EACT,QAAQ,EACR,QAAQ,GACX,EAAE;IACC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAMpB;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAoChF;AA8HD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,~~CAyFpE~~;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG;IACjD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,EAAE,CAAC;CACpB,CASA"}
1	+ {"version":3,"file":"MemberMerger.d.ts","sourceRoot":"","sources":["../../../src/helpers/MemberMerger.ts"],"names":[],"mappings":"AAWA,OAAO,EAGH,MAAM,EAMT,MAAM,WAAW,CAAC;AAEnB,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,iBAU3D;AAED,wBAAsB,gBAAgB,CAAC,EACnC,SAAS,EACT,QAAQ,EACR,QAAQ,GACX,EAAE;IACC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAMpB;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAoChF;AA8HD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAgGpE;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG;IACjD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,EAAE,CAAC;CACpB,CASA"}

package/dist/src/helpers/MemberMerger.js CHANGED Viewed

@@ -149,19 +149,19 @@ function mergeMemberDetails(base, other) {
     mergeStringIfBaseNotSet(baseDetails, otherDetails, 'firstName');
     mergeStringIfBaseNotSet(baseDetails, otherDetails, 'lastName');
     mergeStringIfBaseNotSet(baseDetails, otherDetails, 'memberNumber');
-    mergeStringIfBaseNotSet(baseDetails, otherDetails, 'uitpasNumber');
+    mergeString(baseDetails, otherDetails, 'uitpasNumber');
     // email
     mergeEmail(baseDetails, otherDetails);
     // phone
     mergePhone(baseDetails, otherDetails, baseDetails);
     // gender
-    if (baseDetails.gender === structures_1.Gender.Other) {
+    if (otherDetails.gender !== structures_1.Gender.Other) {
         baseDetails.gender = otherDetails.gender;
     }
     // notes
     mergeNotes(baseDetails, otherDetails);
     // date
-    mergeIfBaseNotSet(baseDetails, otherDetails, 'birthDay');
+    merge(baseDetails, otherDetails, 'birthDay');
     // boolean status
     mergeBooleanStatusIfBaseNotSet(baseDetails, otherDetails, 'requiresFinancialSupport');
     mergeBooleanStatusIfBaseNotSet(baseDetails, otherDetails, 'dataPermissions');
@@ -187,6 +187,11 @@ function mergeMemberDetails(base, other) {
             baseDetails.unverifiedAddresses.push(address);
         }
     }
+    // Ids
+    baseDetails.oldIds = utility_1.Formatter.uniqueArray([...baseDetails.oldIds, ...otherDetails.oldIds]).filter(b => b !== base.id);
+    if (other.id) {
+        baseDetails.oldIds = utility_1.Formatter.uniqueArray([...baseDetails.oldIds, other.id]);
+    }
 }
 function selectBaseMember(members) {
     if (members.length < 2) {
@@ -213,14 +218,12 @@ function mergeAnswers(base, other) {
     base.recordAnswers = newAnswers;
 }
 function mergeNotes(base, other) {
-    if (base.notes && other.notes) {
+    if (base.notes && other.notes && base.notes !== other.notes) {
         base.notes = `${base.notes}\n${other.notes}`;
     }
-    else if (base.notes) {
-        return;
-    }
-    else {
+    else if (other.notes) {
         base.notes = other.notes;
+        return;
     }
 }
 function mergeParents(base, other) {
@@ -240,61 +243,66 @@ function mergeParents(base, other) {
     base.parents = baseParents.concat(parentsToAdd);
 }
 function mergeParent(base, other, baseDetails) {
-    if (base.type === structures_1.ParentType.Other) {
+    if (other.type !== structures_1.ParentType.Other) {
         base.type = other.type;
     }
-    mergeStringIfBaseNotSet(base, other, 'firstName');
-    mergeStringIfBaseNotSet(base, other, 'lastName');
+    mergeString(base, other, 'firstName');
+    mergeString(base, other, 'lastName');
     // add other emails to alternative emails
     mergeEmail(base, other);
     mergePhone(base, other, baseDetails);
     mergeAddress(base, other, baseDetails);
 }
 function mergeEmail(base, other) {
-    const allEmails = utility_1.Formatter.uniqueArray([base.email, ...base.alternativeEmails, other.email, ...other.alternativeEmails]
+    const allEmails = utility_1.Formatter.uniqueArray([other.email, ...other.alternativeEmails, base.email, ...base.alternativeEmails]
         .filter(f => f !== null)
         .filter(f => !isNullOrEmpty(f)));
     base.email = allEmails.shift() ?? null;
     base.alternativeEmails = allEmails;
 }
 function mergePhone(base, other, baseDetails) {
-    const isPhoneMerged = mergeStringIfBaseNotSet(base, other, 'phone');
-    const otherPhone = other.phone;
-    if (!isPhoneMerged && !isNullOrEmpty(otherPhone)) {
-        if (!baseDetails.unverifiedPhones.some(phone => phone === otherPhone)) {
-            baseDetails.unverifiedPhones.push(otherPhone);
+    const originalPhone = base.phone;
+    const isPhoneMerged = mergeString(base, other, 'phone');
+    if (isPhoneMerged && !isNullOrEmpty(originalPhone)) {
+        if (!baseDetails.unverifiedPhones.some(phone => phone === originalPhone)) {
+            baseDetails.unverifiedPhones.push(originalPhone);
         }
     }
 }
 function mergeAddress(base, other, baseDetails) {
     const baseAddress = base.address;
     const otherAddress = other.address;
-    if (!baseAddress) {
-        base.address = otherAddress;
+    if (!otherAddress) {
+        return;
     }
-    else if (otherAddress && baseAddress.id !== otherAddress.id) {
-        // add other address to unverified addresses
-        if (!baseDetails.unverifiedAddresses.some(address => address.id === otherAddress.id)) {
-            baseDetails.unverifiedAddresses.push(otherAddress);
+    base.address = otherAddress;
+    if (baseAddress && baseAddress.id !== otherAddress.id) {
+        // add base address to unverified addresses
+        if (!baseDetails.unverifiedAddresses.some(address => address.id === baseAddress.id)) {
+            baseDetails.unverifiedAddresses.push(baseAddress);
         }
     }
 }
-function mergeStringIfBaseNotSet(base, other, key) {
-    const baseValue = base[key];
-    if (!isNullOrEmpty(baseValue)) {
+function mergeString(base, other, key) {
+    const otherValue = other[key];
+    if (isNullOrEmpty(otherValue)) {
         return false;
     }
+    base[key] = otherValue;
+    return true;
+}
+function mergeStringIfBaseNotSet(base, other, key) {
     const otherValue = other[key];
     if (isNullOrEmpty(otherValue)) {
         return false;
     }
+    if (!isNullOrEmpty(base[key])) {
+        return false;
+    }
     base[key] = otherValue;
     return true;
 }
-function mergeIfBaseNotSet(base, other, key) {
-    const baseValue = base[key];
-    if (!(baseValue === null || baseValue === undefined))
-        return false;
+function merge(base, other, key) {
     const otherValue = other[key];
     if (otherValue === null || otherValue === undefined)
         return false;
@@ -306,15 +314,15 @@ function mergeBooleanStatusIfBaseNotSet(base, other, key) {
     if (otherValue === null || otherValue === undefined)
         return false;
     const baseValue = base[key];
-    if (!(baseValue === null || baseValue === undefined)) {
-        if (baseValue.date < otherValue.date) {
-            base[key] = otherValue;
-            return true;
-        }
-        return false;
+    if (baseValue === undefined || baseValue === null) {
+        base[key] = otherValue;
+        return true;
     }
-    base[key] = otherValue;
-    return true;
+    if (baseValue.date < otherValue.date) {
+        base[key] = otherValue;
+        return true;
+    }
+    return false;
 }
 /**
  * Returns true if the values of the key for a and b

package/dist/src/helpers/MemberMerger.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MemberMerger.js","sourceRoot":"","sources":["../../../src/helpers/MemberMerger.ts"],"names":[],"mappings":";;AAsBA,oDAUC;AAED,4CAcC;AAED,0CAoCC;AA8HD,gDAyFC;AAED,4CAYC;AA3TD,wCAAqD;AACrD,sDAQ+B;AAC/B,gDAA+C;AAC/C,sCASmB;AAEZ,KAAK,UAAU,oBAAoB,CAAC,OAAiB;IACxD,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAEnD,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACzB,MAAM,KAAK,CAAC,wCAAwC,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACzB,MAAM,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACvC,CAAC;AACL,CAAC;AAEM,KAAK,UAAU,gBAAgB,CAAC,EACnC,SAAS,EACT,QAAQ,EACR,QAAQ,GAKX;IACG,OAAO,MAAM,eAAM,CAAC,KAAK,CAAC;QACtB,SAAS;QACT,QAAQ;QACR,QAAQ;KACX,CAAC,CAAC;AACP,CAAC;AAEM,KAAK,UAAU,eAAe,CAAC,IAAY,EAAE,KAAa;IAC7D,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5F,IAAI,IAAI,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;IACnF,CAAC;IAED,kBAAkB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAEhC,IAAI,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACzB,MAAM,kBAAkB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACtC,MAAM,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC9B,MAAM,qBAAqB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACzC,MAAM,iBAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACrC,MAAM,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAClC,MAAM,8BAA8B,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACtD,CAAC;IAED,8BAA8B;IAC9B,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;IAEpC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;IAElB,IAAI,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACzB,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAEvE,4CAA4C;QAC5C,MAAM,YAAY,GAAG,qBAAY,CAAC,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7D,MAAM,YAAY,CAAC,IAAI,EAAE,CAAC;QAE1B,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC;IACzB,CAAC;AACL,CAAC;AAED,KAAK,UAAU,kBAAkB,CAAC,IAAY,EAAE,KAAa;IACzD,MAAM,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,qBAAY,CAAC,CAAC;AACjD,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,IAAY,EAAE,KAAa;IACjD,MAAM,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,aAAI,CAAC,CAAC;AACzC,CAAC;AAED,KAAK,UAAU,qBAAqB,CAAC,IAAY,EAAE,KAAa;IAC5D,KAAK,UAAU,mBAAmB,CAAC,QAAgB;QAC/C,MAAM,IAAI,GAAG,MAAM,SAAG,CAAC,MAAM,EAAE;aAC1B,IAAI,CAAC,SAAG,CAAC,KAAK,CAAC,mCAA0B,CAAC,KAAK,CAAC,CAAC;aACjD,KAAK,CAAC,SAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC;aACvC,KAAK,EAAE,CAAC;QAEb,OAAO,mCAA0B,CAAC,QAAQ,CACtC,IAAI,EACJ,mCAA0B,CAAC,KAAK,CACnC,CAAC;IACN,CAAC;IAED,MAAM,qBAAqB,GAAG,MAAM,mBAAmB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAClE,MAAM,oBAAoB,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAEhE,wGAAwG;IACxG,KAAK,MAAM,mBAAmB,IAAI,qBAAqB,EAAE,CAAC;QACtD,wCAAwC;QACxC,MAAM,mCAAmC,GACnC,qBAAqB,CAAC,MAAM,CAC1B,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,mBAAmB,CAAC,EAAE,CACvC,CAAC;QACN,MAAM,qBAAqB,GAAG,oBAAoB;aAC7C,MAAM,CAAC,mCAAmC,CAAC;aAC3C,MAAM,CAAC,CAAC,kBAAkB,EAAE,EAAE;YAC3B,OAAO,CACH,kBAAkB,CAAC,gBAAgB;oBAC/B,mBAAmB,CAAC,gBAAgB;mBACrC,kBAAkB,CAAC,cAAc;wBAChC,mBAAmB,CAAC,cAAc;mBACnC,kBAAkB,CAAC,OAAO;wBACzB,mBAAmB,CAAC,OAAO;mBAC5B,kBAAkB,CAAC,OAAO,KAAK,IAAI;mBACnC,mBAAmB,CAAC,OAAO,KAAK,IAAI,CAC1C,CAAC;QACN,CAAC,CAAC,CAAC;QAEP,IAAI,qBAAqB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnC,MAAM,wBAAwB,GAAG;gBAC7B,GAAG,qBAAqB;gBACxB,mBAAmB;aACtB;gBACG,oBAAoB;iBACnB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;YAEnE,MAAM,iCAAiC,GACjC,wBAAwB,CAAC,CAAC,CAAC,CAAC;YAElC,MAAM,wBAAwB,GAAG,wBAAwB,CAAC,KAAK,CAC3D,CAAC,EACD,SAAS,CACZ,CAAC;YAEF,KAAK,MAAM,sBAAsB,IAAI,wBAAwB,EAAE,CAAC;gBAC5D,MAAM,SAAS,GAAG,oBAAoB,CAAC,OAAO,CAC1C,sBAAsB,CACzB,CAAC;gBACF,IAAI,SAAS,KAAK,CAAC,CAAC;oBAAE,oBAAoB,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;qBAC3D,CAAC;oBACF,MAAM,UAAU,GAAG,qBAAqB,CAAC,OAAO,CAC5C,sBAAsB,CACzB,CAAC;oBACF,IAAI,UAAU,KAAK,CAAC,CAAC;wBACjB,qBAAqB,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;gBACpD,CAAC;gBAED,IAAI,sBAAsB,CAAC,gBAAgB,EAAE,CAAC;oBAC1C,MAAM,sBAAsB,CAAC,MAAM,EAAE,CAAC;gBAC1C,CAAC;YACL,CAAC;YAED,IAAI,iCAAiC,CAAC,QAAQ,KAAK,IAAI,CAAC,EAAE,EAAE,CAAC;gBACzD,iCAAiC,CAAC,QAAQ,GAAG,IAAI,CAAC,EAAE,CAAC;gBACrD,MAAM,iCAAiC,CAAC,IAAI,EAAE,CAAC;YACnD,CAAC;QACL,CAAC;aACI,CAAC;YACF,mBAAmB,CAAC,QAAQ,GAAG,IAAI,CAAC,EAAE,CAAC;YACvC,MAAM,mBAAmB,CAAC,IAAI,EAAE,CAAC;QACrC,CAAC;IACL,CAAC;AACL,CAAC;AAED,KAAK,UAAU,iBAAiB,CAAC,IAAY,EAAE,KAAa;IACxD,MAAM,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,oBAAW,CAAC,CAAC;AAChD,CAAC;AAED,KAAK,UAAU,cAAc,CAAC,IAAY,EAAE,KAAa;IACrD,MAAM,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,iBAAQ,CAAC,CAAC;AAC7C,CAAC;AAED,KAAK,UAAU,8BAA8B,CAAC,IAAY,EAAE,KAAa;IACrE,MAAM,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,iCAAwB,CAAC,CAAC;AAC7D,CAAC;AAED,MAAM,iBAAkB,SAAQ,oBAAc;IAC1C,QAAQ,CAAgB;CAC3B;AAED,KAAK,UAAU,WAAW,CACtB,IAAY,EACZ,KAAa,EACb,KAAQ;IAER,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;IACvB,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;QAClC,QAAQ,EAAE,KAAK,CAAC,EAAE;KACrB,CAAC,CAAC;IAEH,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACnC,UAAU,CAAC,QAAQ,GAAG,MAAM,CAAC;QAC7B,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC;IAC5B,CAAC;AACL,CAAC;AAED,SAAgB,kBAAkB,CAAC,IAAY,EAAE,KAAa;IAC1D,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC;IACjC,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC;IACnC,WAAW,CAAC,SAAS,EAAE,CAAC;IACxB,YAAY,CAAC,SAAS,EAAE,CAAC;IAEzB,iBAAiB;IACjB,uBAAuB,CAAC,WAAW,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;IAChE,uBAAuB,CAAC,WAAW,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;IAE/D,uBAAuB,CAAC,WAAW,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;IACnE,uBAAuB,CAAC,WAAW,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;IAEnE,QAAQ;IACR,UAAU,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IAEtC,QAAQ;IACR,UAAU,CAAC,WAAW,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;IAEnD,SAAS;IACT,IAAI,WAAW,CAAC,MAAM,KAAK,mBAAM,CAAC,KAAK,EAAE,CAAC;QACtC,WAAW,CAAC,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;IAC7C,CAAC;IAED,QAAQ;IACR,UAAU,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IAEtC,OAAO;IACP,iBAAiB,CAAC,WAAW,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;IAEzD,iBAAiB;IACjB,8BAA8B,CAC1B,WAAW,EACX,YAAY,EACZ,0BAA0B,CAC7B,CAAC;IAEF,8BAA8B,CAC1B,WAAW,EACX,YAAY,EACZ,iBAAiB,CACpB,CAAC;IAEF,UAAU;IACV,YAAY,CAAC,WAAW,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;IAErD,UAAU;IACV,YAAY,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IAExC,qBAAqB;IACrB,WAAW,CAAC,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC,MAAM;IAChE,4CAA4C;IAC5C,YAAY,CAAC,iBAAiB,CAAC,MAAM,CACjC,YAAY,CAAC,EAAE,CACX,CAAC,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAC9C,WAAW,CAAC,OAAO,CAAC,YAAY,CAAC,CACpC,CACR,CACJ,CAAC;IAEF,eAAe;IACf,yBAAyB;IACzB,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;IAExD,UAAU;IACV,YAAY,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IAExC,kBAAkB;IAClB,WAAW,CAAC,gBAAgB,GAAG,mBAAS,CAAC,WAAW,CAChD,WAAW,CAAC,gBAAgB,CAAC,MAAM,CAC/B,YAAY,CAAC,gBAAgB,CAAC,MAAM,CAChC,KAAK,CAAC,EAAE,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CACjC,CACJ,CACJ,CAAC;IACF,WAAW,CAAC,gBAAgB,GAAG,mBAAS,CAAC,WAAW,CAChD,WAAW,CAAC,gBAAgB,CAAC,MAAM,CAC/B,YAAY,CAAC,gBAAgB,CAAC,MAAM,CAChC,KAAK,CAAC,EAAE,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CACjC,CACJ,CACJ,CAAC;IAEF,uBAAuB;IACvB,KAAK,MAAM,OAAO,IAAI,YAAY,CAAC,mBAAmB,EAAE,CAAC;QACrD,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;YAClE,WAAW,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAClD,CAAC;IACL,CAAC;AACL,CAAC;AAED,SAAgB,gBAAgB,CAAC,OAAiB;IAI9C,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrB,MAAM,KAAK,CAAC,sCAAsC,CAAC,CAAC;IACxD,CAAC;IACD,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CACvB,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CACtH,CAAC;IAEF,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE,CAAC;AACnE,CAAC;AAED,SAAS,YAAY,CAAC,IAAmB,EAAE,KAAoB;IAC3D,MAAM,UAAU,GAA8B,IAAI,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC1E,KAAK,MAAM,WAAW,IAAI,KAAK,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,CAAC;QACrD,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC;QACxC,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAE3C,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QACzC,CAAC;aACI,IAAI,WAAW,CAAC,IAAI,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;YAC3C,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QACzC,CAAC;aACI,CAAC;YACF,yEAAyE;QAC7E,CAAC;IACL,CAAC;IACD,IAAI,CAAC,aAAa,GAAG,UAAU,CAAC;AACpC,CAAC;AAED,SAAS,UAAU,CAAC,IAAmB,EAAE,KAAoB;IACzD,IAAI,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QAC5B,IAAI,CAAC,KAAK,GAAG,GAAG,IAAI,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,EAAE,CAAC;IACjD,CAAC;SACI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QAClB,OAAO;IACX,CAAC;SACI,CAAC;QACF,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;IAC7B,CAAC;AACL,CAAC;AAED,SAAS,YAAY,CAAC,IAAmB,EAAE,KAAoB;IAC3D,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC;IACjC,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC;IACnC,MAAM,YAAY,GAAa,EAAE,CAAC;IAElC,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACrC,oCAAoC;QACpC,MAAM,eAAe,GAAG,WAAW,CAAC,IAAI,CACpC,UAAU,CAAC,EAAE,CACT,mBAAmB,CAAC,UAAU,EAAE,WAAW,EAAE,WAAW,CAAC;eACtD,mBAAmB,CAAC,UAAU,EAAE,WAAW,EAAE,UAAU,CAAC,CAClE,CAAC;QAEF,IAAI,CAAC,eAAe,EAAE,CAAC;YACnB,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC/B,SAAS;QACb,CAAC;QAED,WAAW,CAAC,eAAe,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,CAAC,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;AACpD,CAAC;AAED,SAAS,WAAW,CAAC,IAAY,EAAE,KAAa,EAAE,WAA0B;IACxE,IAAI,IAAI,CAAC,IAAI,KAAK,uBAAU,CAAC,KAAK,EAAE,CAAC;QACjC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;IAC3B,CAAC;IACD,uBAAuB,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;IAClD,uBAAuB,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;IACjD,yCAAyC;IACzC,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACxB,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;IACrC,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;AAC3C,CAAC;AAED,SAAS,UAAU,CACf,IAA2D,EAC3D,KAA4D;IAE5D,MAAM,SAAS,GAAG,mBAAS,CAAC,WAAW,CACnC,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,iBAAiB,EAAE,KAAK,CAAC,KAAK,EAAE,GAAG,KAAK,CAAC,iBAAiB,CAAC;SAC3E,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC;SACvB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CACtC,CAAC;IACF,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC;IACvC,IAAI,CAAC,iBAAiB,GAAG,SAAS,CAAC;AACvC,CAAC;AAED,SAAS,UAAU,CACf,IAA0C,EAC1C,KAA2C,EAC3C,WAA0B;IAE1B,MAAM,aAAa,GAAG,uBAAuB,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACpE,MAAM,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC;IAC/B,IAAI,CAAC,aAAa,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/C,IACI,CAAC,WAAW,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,UAAU,CAAC,EACnE,CAAC;YACC,WAAW,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAW,CAAC,CAAC;QACnD,CAAC;IACL,CAAC;AACL,CAAC;AAED,SAAS,YAAY,CACjB,IAA6C,EAC7C,KAA8C,EAC9C,WAA0B;IAE1B,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC;IACjC,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC;IAEnC,IAAI,CAAC,WAAW,EAAE,CAAC;QACf,IAAI,CAAC,OAAO,GAAG,YAAY,CAAC;IAChC,CAAC;SACI,IAAI,YAAY,IAAI,WAAW,CAAC,EAAE,KAAK,YAAY,CAAC,EAAE,EAAE,CAAC;QAC1D,4CAA4C;QAC5C,IACI,CAAC,WAAW,CAAC,mBAAmB,CAAC,IAAI,CACjC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,KAAK,YAAY,CAAC,EAAE,CAC5C,EACH,CAAC;YACC,WAAW,CAAC,mBAAmB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACvD,CAAC;IACL,CAAC;AACL,CAAC;AAED,SAAS,uBAAuB,CAC5B,IAAO,EACP,KAAQ,EACR,GAA6D;IAE7D,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAA8B,CAAC;IACzD,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAA8B,CAAC;IAC3D,IAAI,aAAa,CAAC,UAAU,CAAC,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAC;IACjB,CAAC;IAEA,IAAI,CAAC,GAAG,CAA+B,GAAG,UAAU,CAAC;IAEtD,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAS,iBAAiB,CACtB,IAAO,EACP,KAAQ,EACR,GACyE;IAEzE,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAA+C,CAAC;IAC1E,IAAI,CAAC,CAAC,SAAS,KAAK,IAAI,IAAI,SAAS,KAAK,SAAS,CAAC;QAAE,OAAO,KAAK,CAAC;IACnE,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAA+C,CAAC;IAC5E,IAAI,UAAU,KAAK,IAAI,IAAI,UAAU,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IACjE,IAAI,CAAC,GAAG,CAAgD,GAAG,UAAU,CAAC;IACvE,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAS,8BAA8B,CACnC,IAAO,EACP,KAAQ,EACR,GAAoE;IAEpE,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAqC,CAAC;IAClE,IAAI,UAAU,KAAK,IAAI,IAAI,UAAU,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAClE,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAqC,CAAC;IAChE,IAAI,CAAC,CAAC,SAAS,KAAK,IAAI,IAAI,SAAS,KAAK,SAAS,CAAC,EAAE,CAAC;QACnD,IAAI,SAAS,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;YAClC,IAAI,CAAC,GAAG,CAAsC,GAAG,UAAU,CAAC;YAC7D,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEA,IAAI,CAAC,GAAG,CAAsC,GAAG,UAAU,CAAC;IAC7D,OAAO,IAAI,CAAC;AAChB,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,mBAAmB,CACxB,CAAI,EACJ,CAAI,EACJ,GAA6D;IAE7D,OAAO,kBAAkB,CACrB,CAAC,CAAC,GAAG,CAA8B,EACnC,CAAC,CAAC,GAAG,CAA8B,CACtC,CAAC;AACN,CAAC;AAED,SAAS,kBAAkB,CACvB,CAA4B,EAC5B,CAA4B;IAE5B,IAAI,aAAa,CAAC,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IACvD,OAAO,aAAa,CAAC,CAAW,EAAE,CAAW,CAAC,CAAC;AACnD,CAAC;AAED,SAAS,aAAa,CAAC,CAAS,EAAE,CAAS;IACvC,OAAO,WAAW,CAAC,CAAC,CAAC,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC;AAC7C,CAAC;AAED,SAAS,WAAW,CAAC,IAAY;IAC7B,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;AACrC,CAAC;AAED,SAAS,aAAa,CAAC,KAAgC;IACnD,OAAO,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC;AACxE,CAAC"}
1	+ {"version":3,"file":"MemberMerger.js","sourceRoot":"","sources":["../../../src/helpers/MemberMerger.ts"],"names":[],"mappings":"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"}

package/dist/src/helpers/MemberMerger.test.js CHANGED Viewed

@@ -355,8 +355,8 @@ describe('member merge', () => {
                 }),
             });
             const d1Old = structures_1.MemberDetails.create({
-                firstName: 'John',
-                lastName: 'Doe',
+                firstName: 'Jöhn',
+                lastName: 'Dôe',
                 birthDay: new Date(1990, 1, 1),
                 memberNumber: '123',
                 uitpasNumber: '56',
@@ -511,22 +511,22 @@ describe('member merge', () => {
                 expect(d1.memberNumber).toBe(d1Old.memberNumber);
             });
             test('uitpasNumber', () => {
-                expect(d1.uitpasNumber).toBe(d1Old.uitpasNumber);
+                expect(d1.uitpasNumber).toBe(d2Old.uitpasNumber);
             });
             test('email', () => {
-                expect(d1.email).toBe(d1Old.email);
-                expect(d1.alternativeEmails).toContain(d2Old.email);
-                expect(d1.unverifiedEmails).not.toContain(d2Old.email);
+                expect(d1.email).toBe(d2Old.email);
+                expect(d1.alternativeEmails).toContain(d1Old.email);
+                expect(d1.unverifiedEmails).not.toContain(d1Old.email);
             });
             test('phone', () => {
-                expect(d1.phone).toBe(d1Old.phone);
-                expect(d1.unverifiedPhones).toContain(d2Old.phone);
+                expect(d1.phone).toBe(d2Old.phone);
+                expect(d1.unverifiedPhones).toContain(d1Old.phone);
             });
             test('gender', () => {
-                expect(d1.gender).toBe(d1Old.gender);
+                expect(d1.gender).toBe(d2Old.gender);
             });
             test('birthDay', () => {
-                expect(d1.birthDay?.getTime() ?? -1).toBe(d1Old.birthDay?.getTime() ?? -1);
+                expect(d1.birthDay?.getTime() ?? -1).toBe(d2Old.birthDay?.getTime() ?? -1);
             });
             test('requires financial support', () => {
                 expect(d1.requiresFinancialSupport?.date.getTime() ?? -1).toBe(d1Old.requiresFinancialSupport?.date.getTime() ?? -1);
@@ -535,18 +535,18 @@ describe('member merge', () => {
                 expect(d1.dataPermissions?.date.getTime() ?? -1).toBe(d2Old.dataPermissions?.date.getTime() ?? -1);
             });
             test('address', () => {
-                expect(d1.address?.id).toBe(d1Old.address?.id);
-                expect(d1.unverifiedAddresses.map(a => a.id)).toContain(d2Old.address?.id);
+                expect(d1.address?.id).toBe(d2Old.address?.id);
+                expect(d1.unverifiedAddresses.map(a => a.id)).toContain(d1Old.address?.id);
             });
             test('parents', () => {
                 expect(d1.parents.length).toBe(2);
                 expect(parent1.firstName).toBe(parent1Alt.firstName);
                 expect(parent1.lastName).toBe(parent1Alt.lastName);
-                expect(parent1.email).toBe(oldParent1.email);
-                expect(parent1.phone).toBe(oldParent1.phone);
+                expect(parent1.email).toBe(parent1Alt.email?.toLowerCase());
+                expect(parent1.phone).toBe(parent1Alt.phone);
                 expect(parent1.address?.id).toBe(parent1Alt.address?.id);
-                expect(d1.unverifiedPhones).toContain(parent1Alt.phone);
-                expect(parent1.alternativeEmails).toContain(parent1Alt.email.toLocaleLowerCase());
+                expect(d1.unverifiedPhones).toContain(oldParent1.phone);
+                expect(parent1.alternativeEmails).toContain(oldParent1.email.toLocaleLowerCase());
             });
             test('emergency contacts', () => {
                 expect(d1.emergencyContacts.length).toBe(3);
@@ -572,7 +572,7 @@ describe('member merge', () => {
                 // Should be combination of unverified addresses + address of the second member (which coulnd't be merged)
                 const addressIds = d1.unverifiedAddresses.map(a => a.id);
                 expect(addressIds.sort()).toEqual([
-                    d2Old.address.id,
+                    d1Old.address.id,
                     d1Old.unverifiedAddresses[0].id,
                     d2Old.unverifiedAddresses[0].id,
                 ].sort());

package/dist/src/helpers/MemberMerger.test.js.map CHANGED Viewed

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

package/dist/src/migrations/1752655335-events-webshop-id.sql ADDED Viewed

@@ -0,0 +1,3 @@
+ALTER TABLE `events`
+ADD COLUMN `webshopId` varchar(36) NULL AFTER `groupId`,
+ADD FOREIGN KEY (`webshopId`) REFERENCES `webshops` (`id`) ON UPDATE CASCADE ON DELETE CASCADE;

package/dist/src/migrations/1752678047-confirmation-email.sql ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ ALTER TABLE `registrations`
2	+ ADD COLUMN `sendConfirmationEmail` tinyint(1) NOT NULL DEFAULT '1' AFTER `canRegister`;

package/dist/src/models/EmailVerificationCode.js CHANGED Viewed

@@ -288,7 +288,7 @@ class EmailVerificationCode extends sql_1.QueryableModel {
         }
         else {
             verificationCode = verificationCodes[0];
-            if (verificationCode.expiresAt < new Date(new Date().getTime() - 15 * 60 * 1000) || verificationCode.tries >= EmailVerificationCode.MAX_TRIES) {
+            if (verificationCode.email !== email || verificationCode.expiresAt < new Date(new Date().getTime() - 15 * 60 * 1000) || verificationCode.tries >= EmailVerificationCode.MAX_TRIES) {
                 // Expired: also update the token
                 await verificationCode.generateCode();
             }

package/dist/src/models/EmailVerificationCode.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"EmailVerificationCode.js","sourceRoot":"","sources":["../../../src/models/EmailVerificationCode.ts"],"names":[],"mappings":";;;;AAAA,iEAAqD;AACrD,6DAAwD;AAExD,wCAAgD;AAChD,sDAAkF;AAClF,4DAA2B;AAC3B,4DAA4B;AAC5B,+BAAoC;AACpC,0DAA4D;AAC5D,yCAAsC;AAEtC,MAAM,QAAQ,GAAG,4DAA4D,CAAC;AAC9E,MAAM,IAAI,GAAG,IAAA,gBAAK,EAAC,QAAQ,CAAC,CAAC;AAE7B,KAAK,UAAU,WAAW,CAAC,IAAY;IACnC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,gBAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,GAAiB,EAAE,GAAW,EAAE,EAAE;YACxD,IAAI,GAAG,EAAE,CAAC;gBACN,MAAM,CAAC,GAAG,CAAC,CAAC;gBACZ,OAAO;YACX,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAED,KAAK,UAAU,SAAS,CAAC,GAAW;IAChC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,gBAAM,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,GAAiB,EAAE,CAAS,EAAE,EAAE;YACnD,IAAI,GAAG,EAAE,CAAC;gBACN,MAAM,CAAC,GAAG,CAAC,CAAC;gBACZ,OAAO;YACX,CAAC;YACD,OAAO,CAAC,CAAC,CAAC,CAAC;QACf,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAED;;GAEG;AACH,MAAa,qBAAsB,SAAQ,oBAAc;IACrD,MAAM,CAAC,KAAK,GAAG,0BAA0B,CAAC;IAO1C,EAAE,CAAU;IAGZ,cAAc,GAAkB,IAAI,CAAC;IAGrC,MAAM,CAAS;IAEf;;;OAGG;IAEH,KAAK,CAAS;IAEd;;OAEG;IAEH,KAAK,GAAG,EAAE,CAAC;IAGX,IAAI,GAAG,EAAE,CAAC;IAEV;;OAEG;IAEH,cAAc,GAAG,CAAC,CAAC;IAEnB;;OAEG;IAEH,KAAK,GAAG,CAAC,CAAC;IAGV,SAAS,CAAO;IAEhB;;OAEG;IAQH,SAAS,CAAO;IAEhB,MAAM,CAAC,WAAW,GAAG,CAAC,CAAC;IACvB,MAAM,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,0BAA0B;IAEhD,KAAK,CAAC,YAAY;QACd,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,MAAM,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,qBAAqB,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,qBAAqB,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;QACvI,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QAE/D,iDAAiD;QACjD,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC;YACjB,qEAAqE;YACrE,IAAI,CAAC,cAAc,EAAE,CAAC;QAC1B,CAAC;QAED,uBAAuB;QACvB,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;QAEf,qBAAqB;QACrB,IAAI,CAAC,SAAS,GAAG,IAAI,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;IAC1E,CAAC;IAED,uBAAuB,CAAC,IAA2B,EAAE,YAA0D,EAAE,IAAU;QACvH,IAAI,IAAY,CAAC;QACjB,IAAI,IAAI,CAAC,WAAW,IAAI,CAAC,YAAY,IAAI,SAAS,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;YACzE,IAAI,GAAG,UAAU,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,IAAI,eAAe,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC;QAC7F,CAAC;aACI,CAAC;YACF,yCAAyC;YACzC,IAAI,GAAG,UAAU,GAAG,YAAY,CAAC,OAAO,EAAE,CAAC;YAE3C,IAAI,IAAI,CAAC,QAAQ,KAAK,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAC/C,IAAI,IAAI,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC;YAChC,CAAC;QACL,CAAC;QAED,OAAO,IAAI,GAAG,eAAe,GAAG,CAAC,IAAI,CAAC,uBAAuB,IAAI,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,GAAG,kBAAkB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,QAAQ,GAAG,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,SAAS,GAAG,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvO,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,cAA6B,EAAE,KAAa;QAC1D,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC;YACvC,KAAK;YACL,cAAc,EAAE;gBACZ,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,CAAC,cAAc,EAAE,IAAI,CAAC;aAChC;SACJ,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QAEjB,IAAI,iBAAiB,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAChC,OAAO,KAAK,CAAC,CAAC,uBAAuB;QACzC,CAAC;QAED,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;QAE9C,IAAI,gBAAgB,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;YACnC,gCAAgC;YAChC,OAAO,CAAC,KAAK,CAAC,4DAA4D,CAAC,CAAC;YAC5E,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,IAAI,gBAAgB,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,EAAE,CAAC;YAC1C,WAAW;YACX,wEAAwE;YACxE,+CAA+C;YAC/C,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,IAAI,gBAAgB,CAAC,KAAK,IAAI,qBAAqB,CAAC,SAAS,EAAE,CAAC;YAC5D,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,cAA6B,EAAE,KAAa,EAAE,IAAY;QAC1E,IAAI,IAAI,CAAC,MAAM,KAAK,qBAAqB,CAAC,WAAW,EAAE,CAAC;YACpD,OAAO;QACX,CAAC;QAED,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC;YACvC,KAAK;YACL,cAAc,EAAE;gBACZ,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,CAAC,cAAc,EAAE,IAAI,CAAC;aAChC;SACJ,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QAEjB,IAAI,iBAAiB,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAChC,OAAO,CAAC,uBAAuB;QACnC,CAAC;QAED,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;QAE9C,IAAI,gBAAgB,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;YACnC,gCAAgC;YAChC,OAAO,CAAC,KAAK,CAAC,4DAA4D,CAAC,CAAC;YAC5E,OAAO;QACX,CAAC;QAED,IAAI,gBAAgB,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,EAAE,CAAC;YAC1C,WAAW;YACX,wEAAwE;YACxE,+CAA+C;YAC/C,OAAO;QACX,CAAC;QAED,IAAI,gBAAgB,CAAC,KAAK,IAAI,qBAAqB,CAAC,SAAS,EAAE,CAAC;YAC5D,6EAA6E;YAC7E,MAAM,IAAI,2BAAW,CAAC;gBAClB,IAAI,EAAE,mBAAmB;gBACzB,OAAO,EAAE,mBAAmB;gBAC5B,KAAK,EAAE,EAAE,CAAC,sCAAsC,CAAC;gBACjD,UAAU,EAAE,GAAG;aAClB,CAAC,CAAC;QACP,CAAC;QAED,IAAI,gBAAgB,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,SAAS,CAAC,WAAW,KAAK,aAAa,CAAC,EAAE,CAAC;YACnG,oCAAoC;YACpC,wEAAwE;YACxE,MAAM,gBAAgB,CAAC,MAAM,EAAE,CAAC;YAEhC,OAAO,gBAAgB,CAAC;QAC5B,CAAC;QAED,gBAAgB,CAAC,KAAK,EAAE,CAAC;QACzB,MAAM,gBAAgB,CAAC,IAAI,EAAE,CAAC;QAE9B,IAAI,gBAAgB,CAAC,KAAK,IAAI,qBAAqB,CAAC,SAAS,EAAE,CAAC;YAC5D,6EAA6E;YAC7E,MAAM,IAAI,2BAAW,CAAC;gBAClB,IAAI,EAAE,mBAAmB;gBACzB,OAAO,EAAE,mBAAmB;gBAC5B,KAAK,EAAE,EAAE,CAAC,sCAAsC,CAAC;gBACjD,UAAU,EAAE,GAAG;aAClB,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,IAA2B,EAAE,YAA0D,EAAE,IAAU,EAAE,QAAQ,GAAG,IAAI;QAC3H,MAAM,GAAG,GAAG,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;QAEnE,MAAM,IAAI,GAAG,YAAY,EAAE,IAAI,IAAI,CAAC,MAAM,mBAAQ,CAAC,sBAAsB,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC;QAEzF,MAAM,YAAY,GAAkB;YAChC,wBAAW,CAAC,MAAM,CAAC;gBACf,KAAK,EAAE,kBAAkB;gBACzB,KAAK,EAAE,IAAI;aACd,CAAC;YACF,wBAAW,CAAC,MAAM,CAAC;gBACf,KAAK,EAAE,iBAAiB;gBACxB,KAAK,EAAE,GAAG;aACb,CAAC;SACL,CAAC;QAEF,IAAI,QAAQ,EAAE,CAAC;YACX,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAEzE,MAAM,IAAA,gCAAiB,EAAC,YAAY,EAAE;gBAClC,UAAU,EAAE;oBACR,sBAAS,CAAC,MAAM,CAAC;wBACb,KAAK,EAAE,IAAI,CAAC,KAAK;wBACjB,YAAY,EAAE;4BACV,GAAG,YAAY;4BACf,wBAAW,CAAC,MAAM,CAAC;gCACf,KAAK,EAAE,kBAAkB;gCACzB,KAAK,EAAE,aAAa;6BACvB,CAAC;yBACL;qBACJ,CAAC;iBACL;gBACD,QAAQ,EAAE;oBACN,IAAI,EAAE,8BAAiB,CAAC,WAAW;iBACtC;gBACD,IAAI,EAAE,eAAe;aACxB,CAAC,CAAC;QACP,CAAC;aACI,CAAC;YACF,MAAM,IAAA,gCAAiB,EAAC,YAAY,EAAE;gBAClC,UAAU,EAAE;oBACR,sBAAS,CAAC,MAAM,CAAC;wBACb,KAAK,EAAE,IAAI,CAAC,KAAK;wBACjB,YAAY;qBACf,CAAC;iBACL;gBACD,QAAQ,EAAE;oBACN,IAAI,EAAE,8BAAiB,CAAC,sBAAsB;iBACjD;gBACD,IAAI,EAAE,eAAe;aACxB,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,YAA0D,EAAE,KAAa,EAAE,IAAU;QACrG,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC;YACvC,KAAK;YACL,cAAc,EAAE,YAAY;gBACxB,CAAC,CAAC;oBACM,IAAI,EAAE,IAAI;oBACV,KAAK,EAAE,CAAC,YAAY,CAAC,EAAE,EAAE,IAAI,CAAC;iBACjC;gBACL,CAAC,CAAC,IAAI;SACb,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QAEjB,IAAI,iBAAiB,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAChC,OAAO,CAAC,GAAG,CAAC,6CAA6C,EAAE,KAAK,CAAC,CAAC;YAClE,oCAAoC;YACpC,OAAO;QACX,CAAC;QAED,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;QAE9C,IAAI,gBAAgB,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,EAAE,CAAC;YAC1C,4CAA4C;YAC5C,OAAO,CAAC,GAAG,CAAC,qCAAqC,EAAE,KAAK,CAAC,CAAC;YAC1D,OAAO;QACX,CAAC;QAED,MAAM,EAAE,IAAI,EAAE,GAAG,gEAAa,QAAQ,GAAC,CAAC;QACxC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACzD,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,OAAO;QACX,CAAC;QACD,MAAM,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;IAC1D,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,IAA2B,EAAE,KAAa;QAC7D,6FAA6F;QAC7F,wDAAwD;QAExD,+CAA+C;QAC/C,sFAAsF;QACtF,8GAA8G;QAC9G,mFAAmF;QACnF,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QAE9E,IAAI,gBAAuC,CAAC;QAC5C,IAAI,iBAAiB,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAChC,gBAAgB,GAAG,IAAI,qBAAqB,EAAE,CAAC;YAC/C,gBAAgB,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;YACtD,MAAM,gBAAgB,CAAC,YAAY,EAAE,CAAC;YAEtC,uBAAuB;YACvB,gBAAgB,CAAC,KAAK,GAAG,CAAC,CAAC;YAE3B,oBAAoB;YACpB,gBAAgB,CAAC,SAAS,GAAG,IAAI,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;QACrF,CAAC;aACI,CAAC;YACF,gBAAgB,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;YAExC,IAAI,gBAAgB,CAAC,SAAS,GAAG,IAAI,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,gBAAgB,CAAC,KAAK,IAAI,qBAAqB,CAAC,SAAS,EAAE,CAAC;~~gBAC5I~~,iCAAiC;gBACjC,MAAM,gBAAgB,CAAC,YAAY,EAAE,CAAC;YAC1C,CAAC;QACL,CAAC;QAED,gBAAgB,CAAC,KAAK,GAAG,KAAK,CAAC;QAC/B,gBAAgB,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;QAElC,MAAM,gBAAgB,CAAC,IAAI,EAAE,CAAC;QAC9B,OAAO,gBAAgB,CAAC;IAC5B,CAAC;;AA7UL,sDA8UC;AAtUG;IALC,IAAA,wBAAM,EAAC;QACJ,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,KAAK;YAC3C,OAAO,KAAK,IAAI,IAAA,SAAM,GAAE,CAAC;QAC7B,CAAC;KACJ,CAAC;iDACU;AAGZ;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;6DACN;AAGrC;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;qDACZ;AAOf;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;oDACb;AAMd;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;oDAChB;AAGX;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;mDACjB;AAMV;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;6DACT;AAMnB;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;oDAClB;AAGV;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;wDACb;AAYhB;IAPC,IAAA,wBAAM,EAAC;QACJ,IAAI,EAAE,UAAU,EAAE,UAAU;YACxB,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;YACxB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;YACxB,OAAO,IAAI,CAAC;QAChB,CAAC;KACJ,CAAC;wDACc"}
1	+ {"version":3,"file":"EmailVerificationCode.js","sourceRoot":"","sources":["../../../src/models/EmailVerificationCode.ts"],"names":[],"mappings":"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"}

package/dist/src/models/Event.d.ts CHANGED Viewed

@@ -8,6 +8,7 @@ export declare class Event extends QueryableModel {
     typeId: string;
     organizationId: string | null;
     groupId: string | null;
+    webshopId: string | null;
     startDate: Date;
     endDate: Date;
     meta: EventMeta;

package/dist/src/models/Event.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Event.d.ts","sourceRoot":"","sources":["../../../src/models/Event.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,KAAK,IAAI,WAAW,EAA+B,MAAM,uBAAuB,CAAC;AAErG,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,qBAAa,KAAM,SAAQ,cAAc;IACrC,MAAM,CAAC,KAAK,SAAY;IAKxB,EAAE,EAAG,MAAM,CAAC;IAGZ,IAAI,EAAE,MAAM,CAAC;IAGb,MAAM,EAAE,MAAM,CAAC;IAGf,cAAc,EAAE,MAAM,GAAG,IAAI,CAAQ;IAGrC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAQ;IAG9B,SAAS,EAAE,IAAI,CAAC;IAGhB,OAAO,EAAE,IAAI,CAAC;IAGd,IAAI,YAAwB;IAY5B,SAAS,EAAE,IAAI,CAAC;IAUhB,SAAS,EAAE,IAAI,CAAC;IAEhB;;OAEG;IACH,YAAY,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI;IAOjC;;OAEG;IACH,mBAAmB,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI;IAOlC,qBAAqB,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;CA2ClD"}
1	+ {"version":3,"file":"Event.d.ts","sourceRoot":"","sources":["../../../src/models/Event.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,KAAK,IAAI,WAAW,EAA+B,MAAM,uBAAuB,CAAC;AAErG,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,qBAAa,KAAM,SAAQ,cAAc;IACrC,MAAM,CAAC,KAAK,SAAY;IAKxB,EAAE,EAAG,MAAM,CAAC;IAGZ,IAAI,EAAE,MAAM,CAAC;IAGb,MAAM,EAAE,MAAM,CAAC;IAGf,cAAc,EAAE,MAAM,GAAG,IAAI,CAAQ;IAGrC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAQ;IAG9B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAQ;IAGhC,SAAS,EAAE,IAAI,CAAC;IAGhB,OAAO,EAAE,IAAI,CAAC;IAGd,IAAI,YAAwB;IAY5B,SAAS,EAAE,IAAI,CAAC;IAUhB,SAAS,EAAE,IAAI,CAAC;IAEhB;;OAEG;IACH,YAAY,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI;IAOjC;;OAEG;IACH,mBAAmB,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI;IAOlC,qBAAqB,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;CA2ClD"}

package/dist/src/models/Event.js CHANGED Viewed

@@ -14,6 +14,7 @@ class Event extends sql_1.QueryableModel {
     typeId;
     organizationId = null;
     groupId = null;
+    webshopId = null;
     startDate;
     endDate;
     meta = structures_1.EventMeta.create({});
@@ -93,6 +94,9 @@ tslib_1.__decorate([
 tslib_1.__decorate([
     (0, simple_database_1.column)({ type: 'string', nullable: true })
 ], Event.prototype, "groupId", void 0);
+tslib_1.__decorate([
+    (0, simple_database_1.column)({ type: 'string', nullable: true })
+], Event.prototype, "webshopId", void 0);
 tslib_1.__decorate([
     (0, simple_database_1.column)({ type: 'datetime' })
 ], Event.prototype, "startDate", void 0);

package/dist/src/models/Event.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Event.js","sourceRoot":"","sources":["../../../src/models/Event.ts"],"names":[],"mappings":"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~~AAjHL~~,~~sBAkHC~~;~~AA5GG~~;IAHC,IAAA,wBAAM,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,KAAK;YACrD,OAAO,KAAK,IAAI,IAAA,SAAM,GAAE,CAAC;QAC7B,CAAC,EAAE,CAAC;iCACQ;AAGZ;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;mCACd;AAGb;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;qCACZ;AAGf;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;6CACN;AAGrC;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;sCACb;AAG9B;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;wCACb;AAGhB;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;sCACf;AAGd;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,sBAAS,EAAE,CAAC;mCACjB;AAY5B;IAVC,IAAA,wBAAM,EAAC;QACJ,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,GAAS;YAClC,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;gBACpB,OAAO,GAAG,CAAC;YACf,CAAC;YACD,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;YACxB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;YACxB,OAAO,IAAI,CAAC;QAChB,CAAC;KACJ,CAAC;wCACc;AAUhB;IARC,IAAA,wBAAM,EAAC;QACJ,IAAI,EAAE,UAAU,EAAE,UAAU;YACxB,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;YACxB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;YACxB,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,UAAU,EAAE,IAAI;KACnB,CAAC;wCACc"}
1	+ {"version":3,"file":"Event.js","sourceRoot":"","sources":["../../../src/models/Event.ts"],"names":[],"mappings":"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"}

package/dist/src/models/PasswordToken.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"PasswordToken.d.ts","sourceRoot":"","sources":["../../../src/models/PasswordToken.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAClF,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIhD,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAIxC,MAAM,MAAM,qBAAqB,GAAG,aAAa,GAAG;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC;AAcnE,qBAAa,aAAc,SAAQ,cAAc;IAC7C,MAAM,CAAC,KAAK,SAAqB;IAIjC,KAAK,EAAE,MAAM,CAAC;IAGd,UAAU,EAAE,IAAI,CAAC;IAYjB,SAAS,EAAE,IAAI,CAAC;IAGhB,MAAM,EAAE,MAAM,CAAC;IAEf,MAAM,CAAC,IAAI,kCAAuC;IAElD,SAAS,IAAI,OAAO;IAIpB;;;;OAIG;WACU,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,gBAAgB,UAAQ,GAAG,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IAiC1G;;OAEG;WACU,WAAW,CAAC,CAAC,SAAS,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,UAAU,CAAC,EAAE,IAAI,GAAG,OAAO,CAAC,qBAAqB,CAAC;WAgBvF,sBAAsB,CAAC,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,GAAG,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,EAAE,IAAI;~~WAiBnG~~,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY;WAMxD,QAAQ,CAAC,MAAM,EAAE,MAAM;CAIvC"}
1	+ {"version":3,"file":"PasswordToken.d.ts","sourceRoot":"","sources":["../../../src/models/PasswordToken.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAClF,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIhD,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAIxC,MAAM,MAAM,qBAAqB,GAAG,aAAa,GAAG;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC;AAcnE,qBAAa,aAAc,SAAQ,cAAc;IAC7C,MAAM,CAAC,KAAK,SAAqB;IAIjC,KAAK,EAAE,MAAM,CAAC;IAGd,UAAU,EAAE,IAAI,CAAC;IAYjB,SAAS,EAAE,IAAI,CAAC;IAGhB,MAAM,EAAE,MAAM,CAAC;IAEf,MAAM,CAAC,IAAI,kCAAuC;IAElD,SAAS,IAAI,OAAO;IAIpB;;;;OAIG;WACU,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,gBAAgB,UAAQ,GAAG,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IAiC1G;;OAEG;WACU,WAAW,CAAC,CAAC,SAAS,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,UAAU,CAAC,EAAE,IAAI,GAAG,OAAO,CAAC,qBAAqB,CAAC;WAgBvF,sBAAsB,CAAC,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,GAAG,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,EAAE,IAAI;WAoBnG,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY;WAMxD,QAAQ,CAAC,MAAM,EAAE,MAAM;CAIvC"}

package/dist/src/models/PasswordToken.js CHANGED Viewed

@@ -82,7 +82,10 @@ class PasswordToken extends sql_1.QueryableModel {
         let host;
         if (user.permissions || !organization || STAMHOOFD.userMode === 'platform') {
             host = 'https://' + (STAMHOOFD.domains.dashboard) + '/' + i18n.locale;
-            return host + '/reset-password' + ((user.organizationId || organization) ? ('/' + encodeURIComponent(user.organizationId ?? organization.id)) : '') + '?token=' + encodeURIComponent(token.token);
+            if (user.organizationId && organization) {
+                host += '/auto/' + encodeURIComponent(organization.uri);
+            }
+            return host + '/reset-password?token=' + encodeURIComponent(token.token);
         }
         host = 'https://' + organization.getHost(i18n);
         return host + '/reset-password?token=' + encodeURIComponent(token.token);

package/dist/src/models/PasswordToken.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"PasswordToken.js","sourceRoot":"","sources":["../../../src/models/PasswordToken.ts"],"names":[],"mappings":"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~~OAAO,~~IAAI,~~GAAG,iBAAiB,GAAG,CAAC,CAAC,~~IAAI,CAAC,cAAc,IAAI,YAAY,~~CAAC~~,CAAC,~~CAAC~~,~~CAAC~~,~~CAAC~~,GAAG,~~GAAG,~~kBAAkB,CAAC,~~IAAI~~,CAAC,~~cAAc~~,~~IAAI,YAAa,~~CAAC,~~EAAE,~~CAAC,CAAC,~~CAAC~~,~~CAAC~~,~~CAAC,EAAE,CAAC,~~GAAG,~~SAAS~~,GAAG,kBAAkB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;~~QACvM~~,CAAC;QAED,IAAI,GAAG,UAAU,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/C,OAAO,IAAI,GAAG,wBAAwB,GAAG,kBAAkB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC7E,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAU,EAAE,YAA0B;QACjE,2GAA2G;QAC3G,MAAM,IAAI,GAAG,UAAU,GAAG,YAAY,CAAC,OAAO,EAAE,CAAC;QACjD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG,QAAQ,GAAG,SAAS,GAAG,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,cAAc,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACxI,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAc;QAChC,MAAM,KAAK,GAAG,eAAe,IAAI,CAAC,KAAK,mBAAmB,CAAC;QAC3D,MAAM,0BAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3C,CAAC;;~~AAlHL~~,~~sCAmHC~~;~~AA9GG~~;IADC,IAAA,wBAAM,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;4CAC5B;AAGd;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;iDACZ;AAYjB;IAVC,IAAA,wBAAM,EAAC;QACJ,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,GAAS;YAClC,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;gBACpB,OAAO,GAAG,CAAC;YACf,CAAC;YACD,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;YACxB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;YACxB,OAAO,IAAI,CAAC;QAChB,CAAC;KACJ,CAAC;gDACc;AAGhB;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,aAAa,CAAC,IAAI,EAAE,CAAC;6CAC5C"}
1	+ {"version":3,"file":"PasswordToken.js","sourceRoot":"","sources":["../../../src/models/PasswordToken.ts"],"names":[],"mappings":"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"}

package/dist/src/models/Registration.d.ts CHANGED Viewed

@@ -50,6 +50,7 @@ export declare class Registration extends QueryableModel {
      * register normally.
      */
     canRegister: boolean;
+    sendConfirmationEmail: boolean;
     deactivatedAt: Date | null;
     /**
      * @deprecated

package/dist/src/models/Registration.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Registration.d.ts","sourceRoot":"","sources":["../../../src/models/Registration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAClF,OAAO,EAAE,2BAA2B,EAAE,iBAAiB,EAAE,UAAU,EAAiD,SAAS,EAAE,YAAY,EAAuB,kBAAkB,EAAE,YAAY,IAAI,qBAAqB,EAAe,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAK1R,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,EAAS,YAAY,EAAkC,IAAI,EAAE,MAAM,IAAI,CAAC;AAE/E,qBAAa,YAAa,SAAQ,cAAc;IAC5C,MAAM,CAAC,KAAK,SAAmB;IAO/B,EAAE,EAAG,MAAM,CAAC;IAGZ,QAAQ,EAAE,MAAM,CAAC;IAGjB,cAAc,EAAE,MAAM,CAAC;IAGvB,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAQ;IAG3C,QAAQ,EAAE,MAAM,CAAC;IAGjB,OAAO,EAAE,MAAM,CAAC;IAGhB,UAAU,EAAE,UAAU,CAAC;IAGvB,OAAO,EAAE,kBAAkB,EAAE,CAAM;IAGnC,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAErD;;OAEG;IAEH,SAAS,EAAE,MAAM,GAAG,IAAI,CAAQ;IAEhC;;OAEG;IAEH,KAAK,EAAE,MAAM,CAAK;IAElB;;;OAGG;IAEH,KAAK,EAAE,MAAM,GAAG,IAAI,CAAQ;IAY5B,SAAS,EAAE,IAAI,CAAC;IAUhB,SAAS,EAAE,IAAI,CAAC;IAEhB;;OAEG;IAEH,YAAY,EAAE,IAAI,GAAG,IAAI,CAAQ;IAGjC,aAAa,EAAE,IAAI,GAAG,IAAI,CAAQ;IAElC;;OAEG;IAEH,SAAS,EAAE,IAAI,GAAG,IAAI,CAAQ;IAE9B;;OAEG;IAEH,UAAU,EAAE,IAAI,GAAG,IAAI,CAAQ;IAE/B;;OAEG;IAEH,WAAW,UAAS;IAEpB;;;OAGG;IAEH,WAAW,UAAS;IAGpB,aAAa,EAAE,IAAI,GAAG,IAAI,CAAQ;IAElC;;;OAGG;IAEH,SAAS,SAAK;IAEd;;OAEG;IAEH,iBAAiB,EAAE,gBAAgB,EAAE,CAAM;IAE3C;;;;;;;;OAQG;IAEH,SAAS,2CAAkD;IAE3D,MAAM,CAAC,KAAK,EAAE,iBAAiB,CAAC,OAAO,EAAE,OAAO,SAAS,EAAE,KAAK,CAAC,CAAC;IAElE,YAAY,CAAC,IAAI,EAAE,YAAY,GAAG;QAAE,KAAK,EAAE,OAAO,SAAS,EAAE,KAAK,CAAA;KAAE;IAQpE;;;OAGG;WACU,gBAAgB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAkBhE,aAAa,CAAC,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,IAAI,EAAE,KAAK;IAmCnE,iBAAiB,CAAC,IAAI,EAAE;QAC1B,IAAI,EAAE,iBAAiB,CAAC;KAC3B;WA0BY,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,IAAI,EAAE,OAAO;IA+EpG,kBAAkB;CAGrB"}
1	+ {"version":3,"file":"Registration.d.ts","sourceRoot":"","sources":["../../../src/models/Registration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAClF,OAAO,EAAE,2BAA2B,EAAE,iBAAiB,EAAE,UAAU,EAAiD,SAAS,EAAE,YAAY,EAAuB,kBAAkB,EAAE,YAAY,IAAI,qBAAqB,EAAe,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAK1R,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,EAAS,YAAY,EAAkC,IAAI,EAAE,MAAM,IAAI,CAAC;AAE/E,qBAAa,YAAa,SAAQ,cAAc;IAC5C,MAAM,CAAC,KAAK,SAAmB;IAO/B,EAAE,EAAG,MAAM,CAAC;IAGZ,QAAQ,EAAE,MAAM,CAAC;IAGjB,cAAc,EAAE,MAAM,CAAC;IAGvB,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAQ;IAG3C,QAAQ,EAAE,MAAM,CAAC;IAGjB,OAAO,EAAE,MAAM,CAAC;IAGhB,UAAU,EAAE,UAAU,CAAC;IAGvB,OAAO,EAAE,kBAAkB,EAAE,CAAM;IAGnC,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAErD;;OAEG;IAEH,SAAS,EAAE,MAAM,GAAG,IAAI,CAAQ;IAEhC;;OAEG;IAEH,KAAK,EAAE,MAAM,CAAK;IAElB;;;OAGG;IAEH,KAAK,EAAE,MAAM,GAAG,IAAI,CAAQ;IAY5B,SAAS,EAAE,IAAI,CAAC;IAUhB,SAAS,EAAE,IAAI,CAAC;IAEhB;;OAEG;IAEH,YAAY,EAAE,IAAI,GAAG,IAAI,CAAQ;IAGjC,aAAa,EAAE,IAAI,GAAG,IAAI,CAAQ;IAElC;;OAEG;IAEH,SAAS,EAAE,IAAI,GAAG,IAAI,CAAQ;IAE9B;;OAEG;IAEH,UAAU,EAAE,IAAI,GAAG,IAAI,CAAQ;IAE/B;;OAEG;IAEH,WAAW,UAAS;IAEpB;;;OAGG;IAEH,WAAW,UAAS;IAGpB,qBAAqB,UAAQ;IAG7B,aAAa,EAAE,IAAI,GAAG,IAAI,CAAQ;IAElC;;;OAGG;IAEH,SAAS,SAAK;IAEd;;OAEG;IAEH,iBAAiB,EAAE,gBAAgB,EAAE,CAAM;IAE3C;;;;;;;;OAQG;IAEH,SAAS,2CAAkD;IAE3D,MAAM,CAAC,KAAK,EAAE,iBAAiB,CAAC,OAAO,EAAE,OAAO,SAAS,EAAE,KAAK,CAAC,CAAC;IAElE,YAAY,CAAC,IAAI,EAAE,YAAY,GAAG;QAAE,KAAK,EAAE,OAAO,SAAS,EAAE,KAAK,CAAA;KAAE;IAQpE;;;OAGG;WACU,gBAAgB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAkBhE,aAAa,CAAC,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,IAAI,EAAE,KAAK;IAmCnE,iBAAiB,CAAC,IAAI,EAAE;QAC1B,IAAI,EAAE,iBAAiB,CAAC;KAC3B;WA0BY,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,IAAI,EAAE,OAAO;IA+EpG,kBAAkB;CAGrB"}