@nymphjs/tilmeld 1.0.0-alpha.3 → 1.0.0-alpha.33
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.
- package/CHANGELOG.md +151 -0
- package/dist/Group.js +11 -6
- package/dist/Group.js.map +1 -1
- package/dist/Group.test.js +6 -0
- package/dist/Group.test.js.map +1 -1
- package/dist/Tilmeld.d.ts +3 -6
- package/dist/Tilmeld.js +196 -90
- package/dist/Tilmeld.js.map +1 -1
- package/dist/User.d.ts +40 -2
- package/dist/User.js +109 -7
- package/dist/User.js.map +1 -1
- package/dist/User.test.js +6 -0
- package/dist/User.test.js.map +1 -1
- package/dist/conf/d.d.ts +3 -0
- package/dist/conf/defaults.js +25 -101
- package/dist/conf/defaults.js.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/tilmeldJoiProps.d.ts +12 -0
- package/dist/tilmeldJoiProps.js +20 -0
- package/dist/tilmeldJoiProps.js.map +1 -0
- package/package.json +16 -16
- package/src/Group.test.ts +8 -0
- package/src/Group.ts +21 -7
- package/src/Tilmeld.ts +300 -108
- package/src/User.test.ts +8 -0
- package/src/User.ts +235 -10
- package/src/conf/d.ts +30 -0
- package/src/conf/defaults.ts +10 -57
- package/src/index.ts +3 -0
- package/src/tilmeldJoiProps.ts +46 -0
package/dist/conf/defaults.js
CHANGED
|
@@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
const nymph_1 = require("@nymphjs/nymph");
|
|
15
16
|
const path_1 = __importDefault(require("path"));
|
|
16
17
|
const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
|
|
17
18
|
const nanoid_1 = require("nanoid");
|
|
@@ -31,6 +32,9 @@ exports.default = {
|
|
|
31
32
|
allowUsernameChange: true,
|
|
32
33
|
enableUserSearch: false,
|
|
33
34
|
enableGroupSearch: false,
|
|
35
|
+
clientReadableUIDs: [],
|
|
36
|
+
clientEnabledUIDs: [],
|
|
37
|
+
clientSetabledUIDs: [],
|
|
34
38
|
userFields: ['name', 'email', 'phone'],
|
|
35
39
|
regFields: ['name', 'email'],
|
|
36
40
|
verifyEmail: true,
|
|
@@ -127,185 +131,105 @@ exports.default = {
|
|
|
127
131
|
}),
|
|
128
132
|
userRegisteredRecipient: null,
|
|
129
133
|
validatorGroup: (group) => {
|
|
130
|
-
joi_1.default.attempt(group.$getValidatable(), joi_1.default.object().keys({
|
|
131
|
-
guid: joi_1.default.alternatives()
|
|
132
|
-
.try(joi_1.default.any().only().allow(null), joi_1.default.string().trim(false).length(24).hex())
|
|
133
|
-
.required(),
|
|
134
|
-
cdate: joi_1.default.alternatives()
|
|
135
|
-
.try(joi_1.default.any().only().allow(null), joi_1.default.number())
|
|
136
|
-
.required(),
|
|
137
|
-
mdate: joi_1.default.alternatives()
|
|
138
|
-
.try(joi_1.default.any().only().allow(null), joi_1.default.number())
|
|
139
|
-
.required(),
|
|
140
|
-
tags: joi_1.default.array()
|
|
141
|
-
.items(joi_1.default.string()
|
|
142
|
-
.pattern(/[\x01-\x1F\x7F]/, {
|
|
143
|
-
name: 'control characters',
|
|
144
|
-
invert: true,
|
|
145
|
-
})
|
|
146
|
-
.min(1))
|
|
147
|
-
.required(),
|
|
148
|
-
groupname: joi_1.default.string().trim(false).min(1).required(),
|
|
149
|
-
enabled: joi_1.default.boolean().required(),
|
|
150
|
-
email: joi_1.default.string()
|
|
134
|
+
joi_1.default.attempt(group.$getValidatable(), joi_1.default.object().keys(Object.assign(Object.assign({}, nymph_1.nymphJoiProps), { groupname: joi_1.default.string().trim(false).required(), enabled: joi_1.default.boolean().required(), email: joi_1.default.string()
|
|
151
135
|
.trim(false)
|
|
152
136
|
.email({ minDomainSegments: 1, tlds: false })
|
|
153
|
-
.required(),
|
|
154
|
-
name: joi_1.default.string()
|
|
137
|
+
.required(), name: joi_1.default.string()
|
|
155
138
|
.trim(false)
|
|
156
139
|
.pattern(/[\x01-\x1F\x7F]/, {
|
|
157
140
|
name: 'control characters',
|
|
158
141
|
invert: true,
|
|
159
142
|
})
|
|
160
|
-
.min(1)
|
|
161
143
|
.max(512)
|
|
162
|
-
.required(),
|
|
163
|
-
avatar: joi_1.default.string()
|
|
144
|
+
.required(), avatar: joi_1.default.string()
|
|
164
145
|
.trim(false)
|
|
165
146
|
.uri()
|
|
166
147
|
.pattern(/[\x01-\x1F\x7F]/, {
|
|
167
148
|
name: 'control characters',
|
|
168
149
|
invert: true,
|
|
169
150
|
})
|
|
170
|
-
.
|
|
171
|
-
.max(1024),
|
|
172
|
-
phone: joi_1.default.string()
|
|
151
|
+
.max(1024), phone: joi_1.default.string()
|
|
173
152
|
.trim(false)
|
|
174
|
-
.pattern(/^[0-9]+$/, 'numbers'),
|
|
175
|
-
parent: joi_1.default.object().instance(Group_1.default),
|
|
176
|
-
user: joi_1.default.object().instance(User_1.default),
|
|
177
|
-
abilities: joi_1.default.array().items(joi_1.default.string()
|
|
153
|
+
.pattern(/^[0-9]+$/, 'numbers'), parent: joi_1.default.object().instance(Group_1.default), user: joi_1.default.object().instance(User_1.default), abilities: joi_1.default.array().items(joi_1.default.string()
|
|
178
154
|
.pattern(/[\x01-\x1F\x7F]/, {
|
|
179
155
|
name: 'control characters',
|
|
180
156
|
invert: true,
|
|
181
157
|
})
|
|
182
|
-
.
|
|
183
|
-
.max(256)),
|
|
184
|
-
defaultPrimary: joi_1.default.boolean(),
|
|
185
|
-
defaultSecondary: joi_1.default.boolean(),
|
|
186
|
-
unverifiedSecondary: joi_1.default.boolean(),
|
|
187
|
-
}), 'Invalid Group: ');
|
|
158
|
+
.max(256)), defaultPrimary: joi_1.default.boolean(), defaultSecondary: joi_1.default.boolean(), unverifiedSecondary: joi_1.default.boolean() })), 'Invalid Group: ');
|
|
188
159
|
},
|
|
189
160
|
validatorUser: (user) => {
|
|
190
|
-
joi_1.default.attempt(user.$getValidatable(), joi_1.default.object().keys({
|
|
191
|
-
guid: joi_1.default.alternatives()
|
|
192
|
-
.try(joi_1.default.any().only().allow(null), joi_1.default.string().trim(false).length(24).hex())
|
|
193
|
-
.required(),
|
|
194
|
-
cdate: joi_1.default.alternatives()
|
|
195
|
-
.try(joi_1.default.any().only().allow(null), joi_1.default.number())
|
|
196
|
-
.required(),
|
|
197
|
-
mdate: joi_1.default.alternatives()
|
|
198
|
-
.try(joi_1.default.any().only().allow(null), joi_1.default.number())
|
|
199
|
-
.required(),
|
|
200
|
-
tags: joi_1.default.array()
|
|
201
|
-
.items(joi_1.default.string()
|
|
202
|
-
.pattern(/[\x01-\x1F\x7F]/, {
|
|
203
|
-
name: 'control characters',
|
|
204
|
-
invert: true,
|
|
205
|
-
})
|
|
206
|
-
.min(1))
|
|
207
|
-
.required(),
|
|
208
|
-
username: joi_1.default.string().trim(false).min(1).required(),
|
|
209
|
-
enabled: joi_1.default.boolean().required(),
|
|
210
|
-
email: joi_1.default.string()
|
|
161
|
+
joi_1.default.attempt(user.$getValidatable(), joi_1.default.object().keys(Object.assign(Object.assign({}, nymph_1.nymphJoiProps), { username: joi_1.default.string().trim(false).required(), enabled: joi_1.default.boolean().required(), email: joi_1.default.string()
|
|
211
162
|
.trim(false)
|
|
212
163
|
.email({ minDomainSegments: 1, tlds: false })
|
|
213
|
-
.required(),
|
|
214
|
-
nameFirst: joi_1.default.string()
|
|
164
|
+
.required(), nameFirst: joi_1.default.string()
|
|
215
165
|
.trim(false)
|
|
216
166
|
.pattern(/[\x01-\x1F\x7F]/, {
|
|
217
167
|
name: 'control characters',
|
|
218
168
|
invert: true,
|
|
219
169
|
})
|
|
220
|
-
.min(1)
|
|
221
170
|
.max(512)
|
|
222
|
-
.required(),
|
|
223
|
-
nameMiddle: joi_1.default.string()
|
|
171
|
+
.required(), nameMiddle: joi_1.default.string()
|
|
224
172
|
.trim(false)
|
|
225
173
|
.pattern(/[\x01-\x1F\x7F]/, {
|
|
226
174
|
name: 'control characters',
|
|
227
175
|
invert: true,
|
|
228
176
|
})
|
|
229
|
-
.
|
|
230
|
-
.max(512),
|
|
231
|
-
nameLast: joi_1.default.string()
|
|
177
|
+
.max(512), nameLast: joi_1.default.string()
|
|
232
178
|
.trim(false)
|
|
233
179
|
.pattern(/[\x01-\x1F\x7F]/, {
|
|
234
180
|
name: 'control characters',
|
|
235
181
|
invert: true,
|
|
236
182
|
})
|
|
237
|
-
.
|
|
238
|
-
.max(512),
|
|
239
|
-
name: joi_1.default.string()
|
|
183
|
+
.max(512), name: joi_1.default.string()
|
|
240
184
|
.trim(false)
|
|
241
185
|
.pattern(/[\x01-\x1F\x7F]/, {
|
|
242
186
|
name: 'control characters',
|
|
243
187
|
invert: true,
|
|
244
188
|
})
|
|
245
|
-
.min(1)
|
|
246
189
|
.max(512)
|
|
247
|
-
.required(),
|
|
248
|
-
avatar: joi_1.default.string()
|
|
190
|
+
.required(), avatar: joi_1.default.string()
|
|
249
191
|
.trim(false)
|
|
250
192
|
.uri()
|
|
251
193
|
.pattern(/[\x01-\x1F\x7F]/, {
|
|
252
194
|
name: 'control characters',
|
|
253
195
|
invert: true,
|
|
254
196
|
})
|
|
255
|
-
.
|
|
256
|
-
.max(1024),
|
|
257
|
-
phone: joi_1.default.string()
|
|
197
|
+
.max(1024), phone: joi_1.default.string()
|
|
258
198
|
.trim(false)
|
|
259
|
-
.pattern(/^[0-9]+$/, 'numbers'),
|
|
260
|
-
group: joi_1.default.object().instance(Group_1.default),
|
|
261
|
-
groups: joi_1.default.array().items(joi_1.default.object().instance(Group_1.default)).required(),
|
|
262
|
-
abilities: joi_1.default.array().items(joi_1.default.string()
|
|
199
|
+
.pattern(/^[0-9]+$/, 'numbers'), group: joi_1.default.object().instance(Group_1.default), groups: joi_1.default.array().items(joi_1.default.object().instance(Group_1.default)).required(), abilities: joi_1.default.array().items(joi_1.default.string()
|
|
263
200
|
.pattern(/[\x01-\x1F\x7F]/, {
|
|
264
201
|
name: 'control characters',
|
|
265
202
|
invert: true,
|
|
266
203
|
})
|
|
267
|
-
.
|
|
268
|
-
.max(256)),
|
|
269
|
-
inheritAbilities: joi_1.default.boolean(),
|
|
270
|
-
secret: joi_1.default.string()
|
|
204
|
+
.max(256)), inheritAbilities: joi_1.default.boolean(), secret: joi_1.default.string()
|
|
271
205
|
.trim(false)
|
|
272
206
|
.pattern(/[\x01-\x1F\x7F]/, {
|
|
273
207
|
name: 'control characters',
|
|
274
208
|
invert: true,
|
|
275
209
|
})
|
|
276
|
-
.length(21),
|
|
277
|
-
emailChangeDate: joi_1.default.number(),
|
|
278
|
-
newEmailSecret: joi_1.default.string()
|
|
210
|
+
.length(21), emailChangeDate: joi_1.default.number(), newEmailSecret: joi_1.default.string()
|
|
279
211
|
.trim(false)
|
|
280
212
|
.pattern(/[\x01-\x1F\x7F]/, {
|
|
281
213
|
name: 'control characters',
|
|
282
214
|
invert: true,
|
|
283
215
|
})
|
|
284
|
-
.length(21),
|
|
285
|
-
newEmailAddress: joi_1.default.string()
|
|
216
|
+
.length(21), newEmailAddress: joi_1.default.string()
|
|
286
217
|
.trim(false)
|
|
287
|
-
.email({ minDomainSegments: 1, tlds: false }),
|
|
288
|
-
cancelEmailSecret: joi_1.default.string()
|
|
218
|
+
.email({ minDomainSegments: 1, tlds: false }), cancelEmailSecret: joi_1.default.string()
|
|
289
219
|
.trim(false)
|
|
290
220
|
.pattern(/[\x01-\x1F\x7F]/, {
|
|
291
221
|
name: 'control characters',
|
|
292
222
|
invert: true,
|
|
293
223
|
})
|
|
294
|
-
.length(21),
|
|
295
|
-
cancelEmailAddress: joi_1.default.string()
|
|
224
|
+
.length(21), cancelEmailAddress: joi_1.default.string()
|
|
296
225
|
.trim(false)
|
|
297
|
-
.email({ minDomainSegments: 1, tlds: false }),
|
|
298
|
-
recoverSecret: joi_1.default.string()
|
|
226
|
+
.email({ minDomainSegments: 1, tlds: false }), recoverSecret: joi_1.default.string()
|
|
299
227
|
.trim(false)
|
|
300
228
|
.pattern(/[\x01-\x1F\x7F]/, {
|
|
301
229
|
name: 'control characters',
|
|
302
230
|
invert: true,
|
|
303
231
|
})
|
|
304
|
-
.length(10),
|
|
305
|
-
recoverSecretDate: joi_1.default.number(),
|
|
306
|
-
salt: joi_1.default.string().trim(false).min(1),
|
|
307
|
-
password: joi_1.default.string().trim(false).min(1).required(),
|
|
308
|
-
}), 'Invalid User: ');
|
|
232
|
+
.length(10), recoverSecretDate: joi_1.default.number(), salt: joi_1.default.string().trim(false), password: joi_1.default.string().trim(false).required() })), 'Invalid User: ');
|
|
309
233
|
},
|
|
310
234
|
};
|
|
311
235
|
//# sourceMappingURL=defaults.js.map
|
|
@@ -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/dist/index.d.ts
CHANGED
|
@@ -8,6 +8,8 @@ export { Group };
|
|
|
8
8
|
import Tilmeld from './Tilmeld';
|
|
9
9
|
export { Tilmeld };
|
|
10
10
|
export * from './Tilmeld.types';
|
|
11
|
+
import tilmeldJoiProps from './tilmeldJoiProps';
|
|
12
|
+
export { tilmeldJoiProps };
|
|
11
13
|
export * from './User';
|
|
12
14
|
import User from './User';
|
|
13
15
|
export { User };
|
package/dist/index.js
CHANGED
|
@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
14
14
|
};
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
|
-
exports.User = exports.Tilmeld = exports.Group = exports.AbleObject = void 0;
|
|
16
|
+
exports.User = exports.tilmeldJoiProps = exports.Tilmeld = exports.Group = exports.AbleObject = void 0;
|
|
17
17
|
__exportStar(require("./conf"), exports);
|
|
18
18
|
__exportStar(require("./errors"), exports);
|
|
19
19
|
const AbleObject_1 = __importDefault(require("./AbleObject"));
|
|
@@ -24,6 +24,8 @@ exports.Group = Group_1.default;
|
|
|
24
24
|
const Tilmeld_1 = __importDefault(require("./Tilmeld"));
|
|
25
25
|
exports.Tilmeld = Tilmeld_1.default;
|
|
26
26
|
__exportStar(require("./Tilmeld.types"), exports);
|
|
27
|
+
const tilmeldJoiProps_1 = __importDefault(require("./tilmeldJoiProps"));
|
|
28
|
+
exports.tilmeldJoiProps = tilmeldJoiProps_1.default;
|
|
27
29
|
__exportStar(require("./User"), exports);
|
|
28
30
|
const User_1 = __importDefault(require("./User"));
|
|
29
31
|
exports.User = User_1.default;
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAuB;AAEvB,2CAAyB;AAEzB,8DAAsC;AAC7B,qBADF,oBAAU,CACE;AAEnB,0CAAwB;AACxB,oDAA4B;AACnB,gBADF,eAAK,CACE;AAEd,wDAAgC;AACvB,kBADF,iBAAO,CACE;AAEhB,kDAAgC;AAEhC,yCAAuB;AACvB,kDAA0B;AACjB,eADF,cAAI,CACE"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAuB;AAEvB,2CAAyB;AAEzB,8DAAsC;AAC7B,qBADF,oBAAU,CACE;AAEnB,0CAAwB;AACxB,oDAA4B;AACnB,gBADF,eAAK,CACE;AAEd,wDAAgC;AACvB,kBADF,iBAAO,CACE;AAEhB,kDAAgC;AAEhC,wEAAgD;AACvC,0BADF,yBAAe,CACE;AAExB,yCAAuB;AACvB,kDAA0B;AACjB,eADF,cAAI,CACE"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import Joi from 'joi';
|
|
2
|
+
declare const _default: {
|
|
3
|
+
user: Joi.ObjectSchema<any>;
|
|
4
|
+
group: Joi.ObjectSchema<any>;
|
|
5
|
+
acUser: Joi.NumberSchema;
|
|
6
|
+
acGroup: Joi.NumberSchema;
|
|
7
|
+
acOther: Joi.NumberSchema;
|
|
8
|
+
acRead: Joi.ArraySchema;
|
|
9
|
+
acWrite: Joi.ArraySchema;
|
|
10
|
+
acFull: Joi.ArraySchema;
|
|
11
|
+
};
|
|
12
|
+
export default _default;
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const nymph_1 = require("@nymphjs/nymph");
|
|
7
|
+
const joi_1 = __importDefault(require("joi"));
|
|
8
|
+
const User_1 = __importDefault(require("./User"));
|
|
9
|
+
const Group_1 = __importDefault(require("./Group"));
|
|
10
|
+
exports.default = {
|
|
11
|
+
user: joi_1.default.object().instance(User_1.default),
|
|
12
|
+
group: joi_1.default.object().instance(Group_1.default),
|
|
13
|
+
acUser: joi_1.default.number().valid(nymph_1.TilmeldAccessLevels.NO_ACCESS, nymph_1.TilmeldAccessLevels.READ_ACCESS, nymph_1.TilmeldAccessLevels.WRITE_ACCESS, nymph_1.TilmeldAccessLevels.FULL_ACCESS),
|
|
14
|
+
acGroup: joi_1.default.number().valid(nymph_1.TilmeldAccessLevels.NO_ACCESS, nymph_1.TilmeldAccessLevels.READ_ACCESS, nymph_1.TilmeldAccessLevels.WRITE_ACCESS, nymph_1.TilmeldAccessLevels.FULL_ACCESS),
|
|
15
|
+
acOther: joi_1.default.number().valid(nymph_1.TilmeldAccessLevels.NO_ACCESS, nymph_1.TilmeldAccessLevels.READ_ACCESS, nymph_1.TilmeldAccessLevels.WRITE_ACCESS, nymph_1.TilmeldAccessLevels.FULL_ACCESS),
|
|
16
|
+
acRead: joi_1.default.array().items(joi_1.default.alternatives().try(joi_1.default.object().instance(User_1.default), joi_1.default.object().instance(Group_1.default))),
|
|
17
|
+
acWrite: joi_1.default.array().items(joi_1.default.alternatives().try(joi_1.default.object().instance(User_1.default), joi_1.default.object().instance(Group_1.default))),
|
|
18
|
+
acFull: joi_1.default.array().items(joi_1.default.alternatives().try(joi_1.default.object().instance(User_1.default), joi_1.default.object().instance(Group_1.default))),
|
|
19
|
+
};
|
|
20
|
+
//# sourceMappingURL=tilmeldJoiProps.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tilmeldJoiProps.js","sourceRoot":"","sources":["../src/tilmeldJoiProps.ts"],"names":[],"mappings":";;;;;AAAA,0CAAqD;AACrD,8CAAsB;AAEtB,kDAA0B;AAC1B,oDAA4B;AAE5B,kBAAe;IACb,IAAI,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,cAAI,CAAC;IACjC,KAAK,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,eAAK,CAAC;IACnC,MAAM,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CACxB,2BAAmB,CAAC,SAAS,EAC7B,2BAAmB,CAAC,WAAW,EAC/B,2BAAmB,CAAC,YAAY,EAChC,2BAAmB,CAAC,WAAW,CAChC;IACD,OAAO,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CACzB,2BAAmB,CAAC,SAAS,EAC7B,2BAAmB,CAAC,WAAW,EAC/B,2BAAmB,CAAC,YAAY,EAChC,2BAAmB,CAAC,WAAW,CAChC;IACD,OAAO,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CACzB,2BAAmB,CAAC,SAAS,EAC7B,2BAAmB,CAAC,WAAW,EAC/B,2BAAmB,CAAC,YAAY,EAChC,2BAAmB,CAAC,WAAW,CAChC;IACD,MAAM,EAAE,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CACvB,aAAG,CAAC,YAAY,EAAE,CAAC,GAAG,CACpB,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,cAAI,CAAC,EAC3B,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,eAAK,CAAC,CAC7B,CACF;IACD,OAAO,EAAE,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CACxB,aAAG,CAAC,YAAY,EAAE,CAAC,GAAG,CACpB,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,cAAI,CAAC,EAC3B,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,eAAK,CAAC,CAC7B,CACF;IACD,MAAM,EAAE,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CACvB,aAAG,CAAC,YAAY,EAAE,CAAC,GAAG,CACpB,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,cAAI,CAAC,EAC3B,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,eAAK,CAAC,CAC7B,CACF;CACF,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nymphjs/tilmeld",
|
|
3
|
-
"version": "1.0.0-alpha.
|
|
3
|
+
"version": "1.0.0-alpha.33",
|
|
4
4
|
"description": "NymphJS - Tilmeld User and Group System",
|
|
5
5
|
"type": "commonjs",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -31,34 +31,34 @@
|
|
|
31
31
|
},
|
|
32
32
|
"license": "Apache-2.0",
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@nymphjs/nymph": "^1.0.0-alpha.
|
|
34
|
+
"@nymphjs/nymph": "^1.0.0-alpha.33",
|
|
35
35
|
"crypto-js": "^4.1.1",
|
|
36
36
|
"email-templates": "^8.0.8",
|
|
37
|
-
"express": "^4.17.
|
|
38
|
-
"joi": "^17.
|
|
37
|
+
"express": "^4.17.2",
|
|
38
|
+
"joi": "^17.5.0",
|
|
39
39
|
"jsonwebtoken": "^8.5.1",
|
|
40
40
|
"locutus": "^2.0.15",
|
|
41
41
|
"lodash": "^4.17.21",
|
|
42
|
-
"nanoid": "^3.1.
|
|
42
|
+
"nanoid": "^3.1.30",
|
|
43
43
|
"nanoid-dictionary": "^4.3.0",
|
|
44
44
|
"pug": "^3.0.2"
|
|
45
45
|
},
|
|
46
46
|
"devDependencies": {
|
|
47
|
-
"@nymphjs/client": "^1.0.0-alpha.
|
|
48
|
-
"@nymphjs/client-node": "^1.0.0-alpha.
|
|
49
|
-
"@nymphjs/driver-sqlite3": "^1.0.0-alpha.
|
|
47
|
+
"@nymphjs/client": "^1.0.0-alpha.33",
|
|
48
|
+
"@nymphjs/client-node": "^1.0.0-alpha.33",
|
|
49
|
+
"@nymphjs/driver-sqlite3": "^1.0.0-alpha.33",
|
|
50
50
|
"@tsconfig/recommended": "^1.0.1",
|
|
51
|
-
"@types/crypto-js": "^4.0
|
|
51
|
+
"@types/crypto-js": "^4.1.0",
|
|
52
52
|
"@types/email-templates": "^8.0.4",
|
|
53
53
|
"@types/express": "^4.17.13",
|
|
54
|
-
"@types/jest": "^27.0
|
|
55
|
-
"@types/jsonwebtoken": "^8.5.
|
|
54
|
+
"@types/jest": "^27.4.0",
|
|
55
|
+
"@types/jsonwebtoken": "^8.5.6",
|
|
56
56
|
"@types/locutus": "^0.0.6",
|
|
57
|
-
"@types/lodash": "^4.14.
|
|
57
|
+
"@types/lodash": "^4.14.178",
|
|
58
58
|
"@types/nanoid-dictionary": "^4.2.0",
|
|
59
|
-
"jest": "^27.
|
|
60
|
-
"ts-jest": "^27.
|
|
61
|
-
"typescript": "^4.
|
|
59
|
+
"jest": "^27.4.7",
|
|
60
|
+
"ts-jest": "^27.1.2",
|
|
61
|
+
"typescript": "^4.5.4"
|
|
62
62
|
},
|
|
63
|
-
"gitHead": "
|
|
63
|
+
"gitHead": "121b84199a62ae64d614de8d1e8b586cf80e7250"
|
|
64
64
|
}
|
package/src/Group.test.ts
CHANGED
|
@@ -37,6 +37,14 @@ describe('Group', () => {
|
|
|
37
37
|
return newGroup;
|
|
38
38
|
}
|
|
39
39
|
|
|
40
|
+
it('new group passes validation', async () => {
|
|
41
|
+
const validGroup = await makeNewGroup();
|
|
42
|
+
|
|
43
|
+
expect(() => {
|
|
44
|
+
defaults.validatorGroup(validGroup);
|
|
45
|
+
}).not.toThrow();
|
|
46
|
+
});
|
|
47
|
+
|
|
40
48
|
it("doesn't allow unknown keys", async () => {
|
|
41
49
|
const invalidGroup = await makeNewGroup();
|
|
42
50
|
|
package/src/Group.ts
CHANGED
|
@@ -72,11 +72,20 @@ export type GroupData = {
|
|
|
72
72
|
unverifiedSecondary?: boolean;
|
|
73
73
|
};
|
|
74
74
|
|
|
75
|
+
/**
|
|
76
|
+
* A user group data model.
|
|
77
|
+
*
|
|
78
|
+
* Written by Hunter Perrin for SciActive.
|
|
79
|
+
*
|
|
80
|
+
* @author Hunter Perrin <hperrin@gmail.com>
|
|
81
|
+
* @copyright SciActive Inc
|
|
82
|
+
* @see http://nymph.io/
|
|
83
|
+
*/
|
|
75
84
|
export default class Group extends AbleObject<GroupData> {
|
|
76
85
|
/**
|
|
77
86
|
* The instance of Tilmeld to use for queries.
|
|
78
87
|
*/
|
|
79
|
-
|
|
88
|
+
static tilmeld: Tilmeld;
|
|
80
89
|
static ETYPE = 'tilmeld_group';
|
|
81
90
|
static class = 'Group';
|
|
82
91
|
|
|
@@ -97,9 +106,9 @@ export default class Group extends AbleObject<GroupData> {
|
|
|
97
106
|
'getPrimaryGroups',
|
|
98
107
|
'getSecondaryGroups',
|
|
99
108
|
];
|
|
100
|
-
protected $privateData = Group.DEFAULT_PRIVATE_DATA;
|
|
101
|
-
public static searchRestrictedData = Group.DEFAULT_PRIVATE_DATA;
|
|
102
|
-
protected $allowlistData? = Group.DEFAULT_ALLOWLIST_DATA;
|
|
109
|
+
protected $privateData = [...Group.DEFAULT_PRIVATE_DATA];
|
|
110
|
+
public static searchRestrictedData = [...Group.DEFAULT_PRIVATE_DATA];
|
|
111
|
+
protected $allowlistData? = [...Group.DEFAULT_ALLOWLIST_DATA];
|
|
103
112
|
protected $allowlistTags?: string[] = [];
|
|
104
113
|
|
|
105
114
|
/**
|
|
@@ -285,8 +294,8 @@ export default class Group extends AbleObject<GroupData> {
|
|
|
285
294
|
const tilmeld = this.$nymph.tilmeld as Tilmeld;
|
|
286
295
|
let user = givenUser ?? tilmeld.User.current();
|
|
287
296
|
|
|
288
|
-
this.$privateData = Group.DEFAULT_PRIVATE_DATA;
|
|
289
|
-
this.$allowlistData = Group.DEFAULT_ALLOWLIST_DATA;
|
|
297
|
+
this.$privateData = [...Group.DEFAULT_PRIVATE_DATA];
|
|
298
|
+
this.$allowlistData = [...Group.DEFAULT_ALLOWLIST_DATA];
|
|
290
299
|
|
|
291
300
|
if (tilmeld.config.emailUsernames) {
|
|
292
301
|
this.$privateData.push('groupname');
|
|
@@ -743,7 +752,9 @@ export default class Group extends AbleObject<GroupData> {
|
|
|
743
752
|
}
|
|
744
753
|
|
|
745
754
|
const transaction = 'tilmeld-delete-' + this.guid;
|
|
746
|
-
const
|
|
755
|
+
const nymph = this.$nymph;
|
|
756
|
+
const tnymph = await nymph.startTransaction(transaction);
|
|
757
|
+
this.$nymph = tnymph;
|
|
747
758
|
|
|
748
759
|
// Delete descendants.
|
|
749
760
|
const descendants = await this.$getDescendants();
|
|
@@ -751,6 +762,7 @@ export default class Group extends AbleObject<GroupData> {
|
|
|
751
762
|
for (let curGroup of descendants) {
|
|
752
763
|
if (!(await curGroup.$delete())) {
|
|
753
764
|
await tnymph.rollback(transaction);
|
|
765
|
+
this.$nymph = nymph;
|
|
754
766
|
return false;
|
|
755
767
|
}
|
|
756
768
|
}
|
|
@@ -771,6 +783,7 @@ export default class Group extends AbleObject<GroupData> {
|
|
|
771
783
|
delete user.group;
|
|
772
784
|
if (!(await user.$save())) {
|
|
773
785
|
await tnymph.rollback(transaction);
|
|
786
|
+
this.$nymph = nymph;
|
|
774
787
|
return false;
|
|
775
788
|
}
|
|
776
789
|
}
|
|
@@ -801,6 +814,7 @@ export default class Group extends AbleObject<GroupData> {
|
|
|
801
814
|
} else {
|
|
802
815
|
await tnymph.rollback(transaction);
|
|
803
816
|
}
|
|
817
|
+
this.$nymph = nymph;
|
|
804
818
|
return success;
|
|
805
819
|
}
|
|
806
820
|
}
|