@nymphjs/tilmeld 1.0.0-beta.51 → 1.0.0-beta.53

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 (25) hide show
  1. package/CHANGELOG.md +10 -0
  2. package/dist/AbleObject.js +1 -1
  3. package/dist/AbleObject.js.map +1 -1
  4. package/dist/Group.js +10 -7
  5. package/dist/Group.js.map +1 -1
  6. package/dist/Group.test.js +2 -2
  7. package/dist/Group.test.js.map +1 -1
  8. package/dist/Tilmeld.js +23 -14
  9. package/dist/Tilmeld.js.map +1 -1
  10. package/dist/User.js +69 -39
  11. package/dist/User.js.map +1 -1
  12. package/dist/User.test.js +2 -2
  13. package/dist/User.test.js.map +1 -1
  14. package/dist/conf/d.d.ts +2 -2
  15. package/dist/conf/defaults.js +120 -90
  16. package/dist/conf/defaults.js.map +1 -1
  17. package/package.json +7 -7
  18. package/src/AbleObject.ts +1 -1
  19. package/src/Group.test.ts +2 -2
  20. package/src/Group.ts +16 -7
  21. package/src/Tilmeld.ts +33 -14
  22. package/src/User.test.ts +2 -2
  23. package/src/User.ts +103 -39
  24. package/src/conf/d.ts +2 -2
  25. package/src/conf/defaults.ts +120 -90
package/dist/conf/defaults.js CHANGED
@@ -147,23 +147,41 @@ exports.default = {
147
147
  }
148
148
  },
149
149
  userRegisteredRecipient: null,
150
- validatorGroup: (group) => {
150
+ validatorGroup: (tilmeld, group) => {
151
+ const nameFields = tilmeld.config.userFields.includes('name')
152
+ ? {
153
+ name: joi_1.default.string()
154
+ .trim(false)
155
+ .pattern(/[\x01-\x1F\x7F]/, {
156
+ name: 'control characters',
157
+ invert: true,
158
+ })
159
+ .max(512)
160
+ .required(),
161
+ }
162
+ : {};
163
+ const emailFields = tilmeld.config.userFields.includes('email')
164
+ ? {
165
+ email: joi_1.default.string()
166
+ .trim(false)
167
+ .email({ minDomainSegments: 1, tlds: false })
168
+ .required(),
169
+ }
170
+ : {};
171
+ const phoneFields = tilmeld.config.userFields.includes('phone')
172
+ ? {
173
+ phone: joi_1.default.string()
174
+ .trim(false)
175
+ .pattern(/^[0-9]+$/, 'numbers'),
176
+ }
177
+ : {};
151
178
  joi_1.default.attempt(group.$getValidatable(), joi_1.default.object().keys({
152
179
  ...nymph_1.nymphJoiProps,
180
+ ...nameFields,
181
+ ...emailFields,
182
+ ...phoneFields,
153
183
  groupname: joi_1.default.string().trim(false).required(),
154
184
  enabled: joi_1.default.boolean().required(),
155
- email: joi_1.default.string()
156
- .trim(false)
157
- .email({ minDomainSegments: 1, tlds: false })
158
- .required(),
159
- name: joi_1.default.string()
160
- .trim(false)
161
- .pattern(/[\x01-\x1F\x7F]/, {
162
- name: 'control characters',
163
- invert: true,
164
- })
165
- .max(512)
166
- .required(),
167
185
  avatar: joi_1.default.string()
168
186
  .trim(false)
169
187
  .uri()
@@ -172,9 +190,6 @@ exports.default = {
172
190
  invert: true,
173
191
  })
174
192
  .max(1024),
175
- phone: joi_1.default.string()
176
- .trim(false)
177
- .pattern(/^[0-9]+$/, 'numbers'),
178
193
  parent: joi_1.default.object().instance(Group_1.default),
179
194
  user: joi_1.default.object().instance(User_1.default),
180
195
  abilities: joi_1.default.array().items(joi_1.default.string()
@@ -188,45 +203,99 @@ exports.default = {
188
203
  unverifiedSecondary: joi_1.default.boolean(),
189
204
  }), 'Invalid Group: ');
190
205
  },
191
- validatorUser: (user) => {
206
+ validatorUser: (tilmeld, user) => {
207
+ const nameFields = tilmeld.config.userFields.includes('name')
208
+ ? {
209
+ nameFirst: joi_1.default.string()
210
+ .trim(false)
211
+ .pattern(/[\x01-\x1F\x7F]/, {
212
+ name: 'control characters',
213
+ invert: true,
214
+ })
215
+ .max(512)
216
+ .required(),
217
+ nameMiddle: joi_1.default.string()
218
+ .trim(false)
219
+ .pattern(/[\x01-\x1F\x7F]/, {
220
+ name: 'control characters',
221
+ invert: true,
222
+ })
223
+ .max(512),
224
+ nameLast: joi_1.default.string()
225
+ .trim(false)
226
+ .pattern(/[\x01-\x1F\x7F]/, {
227
+ name: 'control characters',
228
+ invert: true,
229
+ })
230
+ .max(512),
231
+ name: joi_1.default.string()
232
+ .trim(false)
233
+ .pattern(/[\x01-\x1F\x7F]/, {
234
+ name: 'control characters',
235
+ invert: true,
236
+ })
237
+ .max(512)
238
+ .required(),
239
+ }
240
+ : {};
241
+ const emailFields = tilmeld.config.userFields.includes('email')
242
+ ? {
243
+ email: joi_1.default.string()
244
+ .trim(false)
245
+ .email({ minDomainSegments: 1, tlds: false })
246
+ .required(),
247
+ secret: joi_1.default.string()
248
+ .trim(false)
249
+ .pattern(/[\x01-\x1F\x7F]/, {
250
+ name: 'control characters',
251
+ invert: true,
252
+ })
253
+ .length(21),
254
+ emailChangeDate: joi_1.default.number(),
255
+ newEmailSecret: joi_1.default.string()
256
+ .trim(false)
257
+ .pattern(/[\x01-\x1F\x7F]/, {
258
+ name: 'control characters',
259
+ invert: true,
260
+ })
261
+ .length(21),
262
+ newEmailAddress: joi_1.default.string()
263
+ .trim(false)
264
+ .email({ minDomainSegments: 1, tlds: false }),
265
+ cancelEmailSecret: joi_1.default.string()
266
+ .trim(false)
267
+ .pattern(/[\x01-\x1F\x7F]/, {
268
+ name: 'control characters',
269
+ invert: true,
270
+ })
271
+ .length(21),
272
+ cancelEmailAddress: joi_1.default.string()
273
+ .trim(false)
274
+ .email({ minDomainSegments: 1, tlds: false }),
275
+ recoverSecret: joi_1.default.string()
276
+ .trim(false)
277
+ .pattern(/[\x01-\x1F\x7F]/, {
278
+ name: 'control characters',
279
+ invert: true,
280
+ })
281
+ .length(10),
282
+ recoverSecretDate: joi_1.default.number(),
283
+ }
284
+ : {};
285
+ const phoneFields = tilmeld.config.userFields.includes('phone')
286
+ ? {
287
+ phone: joi_1.default.string()
288
+ .trim(false)
289
+ .pattern(/^[0-9]+$/, 'numbers'),
290
+ }
291
+ : {};
192
292
  joi_1.default.attempt(user.$getValidatable(), joi_1.default.object().keys({
193
293
  ...nymph_1.nymphJoiProps,
294
+ ...nameFields,
295
+ ...emailFields,
296
+ ...phoneFields,
194
297
  username: joi_1.default.string().trim(false).required(),
195
298
  enabled: joi_1.default.boolean().required(),
196
- email: joi_1.default.string()
197
- .trim(false)
198
- .email({ minDomainSegments: 1, tlds: false })
199
- .required(),
200
- nameFirst: joi_1.default.string()
201
- .trim(false)
202
- .pattern(/[\x01-\x1F\x7F]/, {
203
- name: 'control characters',
204
- invert: true,
205
- })
206
- .max(512)
207
- .required(),
208
- nameMiddle: joi_1.default.string()
209
- .trim(false)
210
- .pattern(/[\x01-\x1F\x7F]/, {
211
- name: 'control characters',
212
- invert: true,
213
- })
214
- .max(512),
215
- nameLast: joi_1.default.string()
216
- .trim(false)
217
- .pattern(/[\x01-\x1F\x7F]/, {
218
- name: 'control characters',
219
- invert: true,
220
- })
221
- .max(512),
222
- name: joi_1.default.string()
223
- .trim(false)
224
- .pattern(/[\x01-\x1F\x7F]/, {
225
- name: 'control characters',
226
- invert: true,
227
- })
228
- .max(512)
229
- .required(),
230
299
  avatar: joi_1.default.string()
231
300
  .trim(false)
232
301
  .uri()
@@ -235,9 +304,6 @@ exports.default = {
235
304
  invert: true,
236
305
  })
237
306
  .max(1024),
238
- phone: joi_1.default.string()
239
- .trim(false)
240
- .pattern(/^[0-9]+$/, 'numbers'),
241
307
  group: joi_1.default.object().instance(Group_1.default),
242
308
  groups: joi_1.default.array().items(joi_1.default.object().instance(Group_1.default)).required(),
243
309
  abilities: joi_1.default.array().items(joi_1.default.string()
@@ -247,42 +313,6 @@ exports.default = {
247
313
  })
248
314
  .max(256)),
249
315
  inheritAbilities: joi_1.default.boolean(),
250
- secret: joi_1.default.string()
251
- .trim(false)
252
- .pattern(/[\x01-\x1F\x7F]/, {
253
- name: 'control characters',
254
- invert: true,
255
- })
256
- .length(21),
257
- emailChangeDate: joi_1.default.number(),
258
- newEmailSecret: joi_1.default.string()
259
- .trim(false)
260
- .pattern(/[\x01-\x1F\x7F]/, {
261
- name: 'control characters',
262
- invert: true,
263
- })
264
- .length(21),
265
- newEmailAddress: joi_1.default.string()
266
- .trim(false)
267
- .email({ minDomainSegments: 1, tlds: false }),
268
- cancelEmailSecret: joi_1.default.string()
269
- .trim(false)
270
- .pattern(/[\x01-\x1F\x7F]/, {
271
- name: 'control characters',
272
- invert: true,
273
- })
274
- .length(21),
275
- cancelEmailAddress: joi_1.default.string()
276
- .trim(false)
277
- .email({ minDomainSegments: 1, tlds: false }),
278
- recoverSecret: joi_1.default.string()
279
- .trim(false)
280
- .pattern(/[\x01-\x1F\x7F]/, {
281
- name: 'control characters',
282
- invert: true,
283
- })
284
- .length(10),
285
- recoverSecretDate: joi_1.default.number(),
286
316
  salt: joi_1.default.string().trim(false),
287
317
  password: joi_1.default.string().trim(false).required(),
288
318
  revokeTokenDate: joi_1.default.number(),
package/dist/conf/defaults.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../src/conf/defaults.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../src/conf/defaults.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nymphjs/tilmeld",
3
- "version": "1.0.0-beta.51",
3
+ "version": "1.0.0-beta.53",
4
4
  "description": "Nymph.js - Tilmeld User and Group System",
5
5
  "type": "commonjs",
6
6
  "main": "dist/index.js",
@@ -31,8 +31,8 @@
31
31
  },
32
32
  "license": "Apache-2.0",
33
33
  "dependencies": {
34
- "@nymphjs/guid": "^1.0.0-beta.51",
35
- "@nymphjs/nymph": "^1.0.0-beta.51",
34
+ "@nymphjs/guid": "^1.0.0-beta.53",
35
+ "@nymphjs/nymph": "^1.0.0-beta.53",
36
36
  "crypto-js": "^4.2.0",
37
37
  "email-templates": "^11.1.1",
38
38
  "express": "^4.18.3",
@@ -45,9 +45,9 @@
45
45
  "qrcode": "^1.5.3"
46
46
  },
47
47
  "devDependencies": {
48
- "@nymphjs/client": "^1.0.0-beta.51",
49
- "@nymphjs/client-node": "^1.0.0-beta.51",
50
- "@nymphjs/driver-sqlite3": "^1.0.0-beta.51",
48
+ "@nymphjs/client": "^1.0.0-beta.53",
49
+ "@nymphjs/client-node": "^1.0.0-beta.53",
50
+ "@nymphjs/driver-sqlite3": "^1.0.0-beta.53",
51
51
  "@tsconfig/recommended": "^1.0.3",
52
52
  "@types/crypto-js": "^4.2.2",
53
53
  "@types/email-templates": "^10.0.4",
@@ -61,5 +61,5 @@
61
61
  "ts-jest": "^29.1.2",
62
62
  "typescript": "^5.3.3"
63
63
  },
64
- "gitHead": "2e0d0c5470edef84323ce9d176fba6a71b468d18"
64
+ "gitHead": "63d4dc32644157cf92db547b02cc9e48fd5a9eef"
65
65
  }
package/src/AbleObject.ts CHANGED
@@ -17,7 +17,7 @@ export default abstract class AbleObject<
17
17
  if (!Array.isArray(this.$data.abilities)) {
18
18
  this.$data.abilities = [];
19
19
  }
20
- if (this.$data.abilities.indexOf(ability) === -1) {
20
+ if (!this.$data.abilities.includes(ability)) {
21
21
  this.$data.abilities.push(ability);
22
22
  }
23
23
  }
package/src/Group.test.ts CHANGED
@@ -41,7 +41,7 @@ describe('Group', () => {
41
41
  const validGroup = await makeNewGroup();
42
42
 
43
43
  expect(() => {
44
- defaults.validatorGroup(validGroup);
44
+ defaults.validatorGroup({ config: defaults } as Tilmeld, validGroup);
45
45
  }).not.toThrow();
46
46
  });
47
47
 
@@ -52,7 +52,7 @@ describe('Group', () => {
52
52
  invalidGroup.unknown = 'I should cause an error.';
53
53
 
54
54
  expect(() => {
55
- defaults.validatorGroup(invalidGroup);
55
+ defaults.validatorGroup({ config: defaults } as Tilmeld, invalidGroup);
56
56
  }).toThrow('Invalid Group: "unknown" is not allowed');
57
57
  });
58
58
  });
package/src/Group.ts CHANGED
@@ -360,8 +360,8 @@ export default class Group extends AbleObject<GroupData> {
360
360
 
361
361
  if (
362
362
  user != null &&
363
- ((user.abilities?.indexOf('tilmeld/admin') ?? -1) !== -1 ||
364
- (user.abilities?.indexOf('system/admin') ?? -1) !== -1)
363
+ (user.abilities?.includes('tilmeld/admin') ||
364
+ user.abilities?.includes('system/admin'))
365
365
  ) {
366
366
  // Users who can edit groups can see their data.
367
367
  this.$privateData = [];
@@ -689,16 +689,22 @@ export default class Group extends AbleObject<GroupData> {
689
689
  this.$data.enabled = !!this.$data.enabled;
690
690
 
691
691
  // Clear empty values.
692
- if (this.$data.name === '') {
692
+ if (this.$data.name === '' || !tilmeld.config.userFields.includes('name')) {
693
693
  delete this.$data.name;
694
694
  }
695
- if (this.$data.email === '') {
695
+ if (
696
+ this.$data.email === '' ||
697
+ !tilmeld.config.userFields.includes('email')
698
+ ) {
696
699
  delete this.$data.email;
697
700
  }
698
701
  if (this.$data.avatar === '') {
699
702
  delete this.$data.avatar;
700
703
  }
701
- if (this.$data.phone === '') {
704
+ if (
705
+ this.$data.phone === '' ||
706
+ !tilmeld.config.userFields.includes('phone')
707
+ ) {
702
708
  delete this.$data.phone;
703
709
  }
704
710
  if (this.$data.parent == null) {
@@ -732,7 +738,10 @@ export default class Group extends AbleObject<GroupData> {
732
738
  if (!unCheck.result) {
733
739
  throw new BadUsernameError(unCheck.message);
734
740
  }
735
- if (!tilmeld.config.emailUsernames) {
741
+ if (
742
+ !tilmeld.config.emailUsernames &&
743
+ tilmeld.config.userFields.includes('email')
744
+ ) {
736
745
  const emCheck = await this.$checkEmail();
737
746
  if (!emCheck.result) {
738
747
  throw new BadEmailError(emCheck.message);
@@ -754,7 +763,7 @@ export default class Group extends AbleObject<GroupData> {
754
763
  }
755
764
 
756
765
  try {
757
- tilmeld.config.validatorGroup(this);
766
+ tilmeld.config.validatorGroup(tilmeld, this);
758
767
  } catch (e: any) {
759
768
  throw new BadDataError(e?.message);
760
769
  }
package/src/Tilmeld.ts CHANGED
@@ -90,6 +90,24 @@ export default class Tilmeld implements TilmeldInterface {
90
90
  */
91
91
  public constructor(config: Partial<Config> & { jwtSecret: string }) {
92
92
  this.config = { ...defaults, ...config };
93
+
94
+ if (
95
+ this.config.emailUsernames &&
96
+ (!this.config.userFields.includes('email') ||
97
+ !this.config.regFields.includes('email'))
98
+ ) {
99
+ throw new Error(
100
+ 'You must include email in userFields and regFields if you use emailUsernames.',
101
+ );
102
+ }
103
+
104
+ for (let field of this.config.regFields) {
105
+ if (!this.config.userFields.includes(field)) {
106
+ throw new Error(
107
+ `All fields in regFields must also be in userFields: ${field}`,
108
+ );
109
+ }
110
+ }
93
111
  }
94
112
 
95
113
  /**
@@ -348,10 +366,10 @@ export default class Tilmeld implements TilmeldInterface {
348
366
  }
349
367
 
350
368
  if (
351
- (originalAc.user && originalAc.user !== newAc.user) ||
352
- (!originalAc.user &&
353
- newAc.user &&
354
- newAc.user !== tilmeld.currentUser)
369
+ (originalAc.user != null && originalAc.user !== newAc.user) ||
370
+ (originalAc.user == null &&
371
+ newAc.user != null &&
372
+ newAc.user !== tilmeld.currentUser?.guid)
355
373
  ) {
356
374
  throw new AccessControlError(
357
375
  'No permission to assign to another user.',
@@ -359,11 +377,12 @@ export default class Tilmeld implements TilmeldInterface {
359
377
  }
360
378
 
361
379
  if (
362
- newAc.group &&
380
+ newAc.group != null &&
363
381
  newAc.group !== originalAc.group &&
364
- !(newAc.group =
365
- tilmeld.currentUser?.$getGid() ||
366
- (tilmeld.currentUser?.$getGids() ?? []).includes(newAc.group))
382
+ !(
383
+ newAc.group === tilmeld.currentUser?.$getGid() ||
384
+ (tilmeld.currentUser?.$getGids() ?? []).includes(newAc.group)
385
+ )
367
386
  ) {
368
387
  throw new AccessControlError(
369
388
  'No permission to assign to another group.',
@@ -827,21 +846,21 @@ export default class Tilmeld implements TilmeldInterface {
827
846
 
828
847
  if (type === TilmeldAccessLevels.FULL_ACCESS) {
829
848
  return (
830
- this.config.clientSetabledUIDs.indexOf(name) !== -1 ||
849
+ this.config.clientSetabledUIDs.includes(name) ||
831
850
  (await userOrEmpty.$gatekeeper(`uid/set/${name}`))
832
851
  );
833
852
  } else if (type === TilmeldAccessLevels.WRITE_ACCESS) {
834
853
  return (
835
- this.config.clientEnabledUIDs.indexOf(name) !== -1 ||
836
- this.config.clientSetabledUIDs.indexOf(name) !== -1 ||
854
+ this.config.clientEnabledUIDs.includes(name) ||
855
+ this.config.clientSetabledUIDs.includes(name) ||
837
856
  (await userOrEmpty.$gatekeeper(`uid/new/${name}`)) ||
838
857
  (await userOrEmpty.$gatekeeper(`uid/set/${name}`))
839
858
  );
840
859
  } else if (type === TilmeldAccessLevels.READ_ACCESS) {
841
860
  return (
842
- this.config.clientReadableUIDs.indexOf(name) !== -1 ||
843
- this.config.clientEnabledUIDs.indexOf(name) !== -1 ||
844
- this.config.clientSetabledUIDs.indexOf(name) !== -1 ||
861
+ this.config.clientReadableUIDs.includes(name) ||
862
+ this.config.clientEnabledUIDs.includes(name) ||
863
+ this.config.clientSetabledUIDs.includes(name) ||
845
864
  (await userOrEmpty.$gatekeeper(`uid/get/${name}`)) ||
846
865
  (await userOrEmpty.$gatekeeper(`uid/new/${name}`)) ||
847
866
  (await userOrEmpty.$gatekeeper(`uid/set/${name}`))
package/src/User.test.ts CHANGED
@@ -44,7 +44,7 @@ describe('User', () => {
44
44
  const validUser = await makeNewUser();
45
45
 
46
46
  expect(() => {
47
- defaults.validatorUser(validUser);
47
+ defaults.validatorUser({ config: defaults } as Tilmeld, validUser);
48
48
  }).not.toThrow();
49
49
  });
50
50
 
@@ -55,7 +55,7 @@ describe('User', () => {
55
55
  invalidUser.unknown = 'I should cause an error.';
56
56
 
57
57
  expect(() => {
58
- defaults.validatorUser(invalidUser);
58
+ defaults.validatorUser({ config: defaults } as Tilmeld, invalidUser);
59
59
  }).toThrow('Invalid User: "unknown" is not allowed');
60
60
  });
61
61
  });