@unchainedshop/core-users 3.0.0-alpha6 → 3.0.0-rc.11
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/lib/db/UsersCollection.d.ts +54 -2
- package/lib/db/UsersCollection.d.ts.map +1 -1
- package/lib/db/UsersCollection.js.map +1 -1
- package/lib/db/WebAuthnCredentialsCreationRequestsCollection.d.ts +6 -1
- package/lib/db/WebAuthnCredentialsCreationRequestsCollection.d.ts.map +1 -1
- package/lib/db/WebAuthnCredentialsCreationRequestsCollection.js.map +1 -1
- package/lib/module/addMigrations.d.ts.map +1 -1
- package/lib/module/addMigrations.js +32 -41
- package/lib/module/addMigrations.js.map +1 -1
- package/lib/module/configureUsersModule.d.ts +49 -70
- package/lib/module/configureUsersModule.d.ts.map +1 -1
- package/lib/module/configureUsersModule.js +106 -71
- package/lib/module/configureUsersModule.js.map +1 -1
- package/lib/module/configureUsersWebAuthnModule.d.ts +21 -8
- package/lib/module/configureUsersWebAuthnModule.d.ts.map +1 -1
- package/lib/module/configureUsersWebAuthnModule.js +32 -11
- package/lib/module/configureUsersWebAuthnModule.js.map +1 -1
- package/lib/module/pbkdf2.js +1 -1
- package/lib/module/pbkdf2.js.map +1 -1
- package/lib/users-index.d.ts +3 -2
- package/lib/users-index.d.ts.map +1 -1
- package/lib/users-index.js +3 -2
- package/lib/users-index.js.map +1 -1
- package/lib/users-settings.d.ts +1 -1
- package/lib/users-settings.d.ts.map +1 -1
- package/lib/users-settings.js.map +1 -1
- package/package.json +26 -18
- package/src/db/UsersCollection.ts +59 -2
- package/src/db/WebAuthnCredentialsCreationRequestsCollection.ts +7 -1
- package/src/module/addMigrations.ts +40 -53
- package/src/module/configureUsersModule.ts +153 -169
- package/src/module/configureUsersWebAuthnModule.ts +47 -44
- package/src/module/pbkdf2.ts +1 -1
- package/src/module/removeConfidentialServiceHashes.test.ts +1 -1
- package/src/users-index.ts +3 -2
- package/src/users-settings.ts +1 -2
- package/tests/mock/user-mock.ts +2 -3
- package/tsconfig.json +5 -7
- package/lib/module/sha256.d.ts +0 -2
- package/lib/module/sha256.d.ts.map +0 -1
- package/lib/module/sha256.js +0 -6
- package/lib/module/sha256.js.map +0 -1
- package/lib/services/migrateUserDataService.d.ts +0 -4
- package/lib/services/migrateUserDataService.d.ts.map +0 -1
- package/lib/services/migrateUserDataService.js +0 -18
- package/lib/services/migrateUserDataService.js.map +0 -1
- package/lib/services/updateUserAvatarAfterUploadService.d.ts +0 -15
- package/lib/services/updateUserAvatarAfterUploadService.d.ts.map +0 -1
- package/lib/services/updateUserAvatarAfterUploadService.js +0 -24
- package/lib/services/updateUserAvatarAfterUploadService.js.map +0 -1
- package/lib/services/userServices.d.ts +0 -8
- package/lib/services/userServices.d.ts.map +0 -1
- package/lib/services/userServices.js +0 -7
- package/lib/services/userServices.js.map +0 -1
- package/lib/types.d.ts +0 -88
- package/lib/types.d.ts.map +0 -1
- package/lib/types.js +0 -2
- package/lib/types.js.map +0 -1
- package/src/module/sha256.ts +0 -5
- package/src/services/migrateUserDataService.ts +0 -37
- package/src/services/updateUserAvatarAfterUploadService.ts +0 -42
- package/src/services/userServices.ts +0 -15
- package/src/types.ts +0 -101
|
@@ -1,4 +1,56 @@
|
|
|
1
|
-
import { mongodb } from '@unchainedshop/mongodb';
|
|
2
|
-
import {
|
|
1
|
+
import { TimestampFields, Address, Contact, mongodb } from '@unchainedshop/mongodb';
|
|
2
|
+
import { DateFilterInput } from '@unchainedshop/utils';
|
|
3
|
+
export interface UserProfile {
|
|
4
|
+
displayName?: string;
|
|
5
|
+
birthday?: Date;
|
|
6
|
+
phoneMobile?: string;
|
|
7
|
+
gender?: string;
|
|
8
|
+
address?: Address;
|
|
9
|
+
}
|
|
10
|
+
export interface UserLastLogin {
|
|
11
|
+
timestamp?: Date;
|
|
12
|
+
locale?: string;
|
|
13
|
+
countryCode?: string;
|
|
14
|
+
remoteAddress?: string;
|
|
15
|
+
remotePort?: string;
|
|
16
|
+
userAgent?: string;
|
|
17
|
+
}
|
|
18
|
+
export interface PushSubscriptionObject {
|
|
19
|
+
userAgent: string;
|
|
20
|
+
endpoint: string;
|
|
21
|
+
expirationTime?: number;
|
|
22
|
+
keys: {
|
|
23
|
+
auth: string;
|
|
24
|
+
p256dh: string;
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
export interface Email {
|
|
28
|
+
address: string;
|
|
29
|
+
verified: boolean;
|
|
30
|
+
}
|
|
31
|
+
export type User = {
|
|
32
|
+
_id: string;
|
|
33
|
+
deleted?: Date;
|
|
34
|
+
avatarId?: string;
|
|
35
|
+
emails: Array<Email>;
|
|
36
|
+
guest: boolean;
|
|
37
|
+
initialPassword: boolean;
|
|
38
|
+
lastBillingAddress?: Address;
|
|
39
|
+
lastContact?: Contact;
|
|
40
|
+
lastLogin?: UserLastLogin;
|
|
41
|
+
profile?: UserProfile;
|
|
42
|
+
roles: Array<string>;
|
|
43
|
+
services: any;
|
|
44
|
+
tags?: Array<string>;
|
|
45
|
+
pushSubscriptions: Array<PushSubscriptionObject>;
|
|
46
|
+
username?: string;
|
|
47
|
+
meta?: any;
|
|
48
|
+
} & TimestampFields;
|
|
49
|
+
export type UserQuery = mongodb.Filter<User> & {
|
|
50
|
+
includeGuests?: boolean;
|
|
51
|
+
queryString?: string;
|
|
52
|
+
emailVerified?: boolean;
|
|
53
|
+
lastLogin?: DateFilterInput;
|
|
54
|
+
};
|
|
3
55
|
export declare const UsersCollection: (db: mongodb.Db) => Promise<mongodb.Collection<User>>;
|
|
4
56
|
//# sourceMappingURL=UsersCollection.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UsersCollection.d.ts","sourceRoot":"","sources":["../../src/db/UsersCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAkB,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"UsersCollection.d.ts","sourceRoot":"","sources":["../../src/db/UsersCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAkB,MAAM,wBAAwB,CAAC;AACpG,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,WAAW,WAAW;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,IAAI,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AACD,MAAM,WAAW,aAAa;IAC5B,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE;QACJ,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH;AAED,MAAM,WAAW,KAAK;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,MAAM,IAAI,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACrB,KAAK,EAAE,OAAO,CAAC;IACf,eAAe,EAAE,OAAO,CAAC;IACzB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACrB,QAAQ,EAAE,GAAG,CAAC;IACd,IAAI,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACrB,iBAAiB,EAAE,KAAK,CAAC,sBAAsB,CAAC,CAAC;IACjD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ,GAAG,eAAe,CAAC;AAEpB,MAAM,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG;IAC7C,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,SAAS,CAAC,EAAE,eAAe,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,eAAe,OAAc,OAAO,CAAC,EAAE,sCA4FnD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UsersCollection.js","sourceRoot":"","sources":["../../src/db/UsersCollection.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"UsersCollection.js","sourceRoot":"","sources":["../../src/db/UsersCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8C,cAAc,EAAE,MAAM,wBAAwB,CAAC;AA4DpG,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,EAAc,EAAE,EAAE;IACtD,MAAM,KAAK,GAAG,EAAE,CAAC,UAAU,CAAO,OAAO,CAAC,CAAC;IAE3C,MAAM,cAAc,CAAO,KAAK,EAAE;QAChC;YACE,KAAK,EAAE;gBACL,OAAO,EAAE,CAAC;gBACV,OAAO,EAAE,CAAC;gBACV,KAAK,EAAE,CAAC;aACT;YACD,OAAO,EAAE,EAAE;SACZ;QACD;YACE,KAAK,EAAE;gBACL,KAAK,EAAE,CAAC;aACT;YACD,OAAO,EAAE;gBACP,MAAM,EAAE,IAAI;aACb;SACF;QACD;YACE,KAAK,EAAE;gBACL,OAAO,EAAE,CAAC;aACX;YACD,OAAO,EAAE,EAAE;SACZ;QACD;YACE,KAAK,EAAE;gBACL,QAAQ,EAAE,CAAC;aACZ;YACD,OAAO,EAAE;gBACP,MAAM,EAAE,IAAI;gBACZ,MAAM,EAAE,IAAI;aACb;SACF;QACD;YACE,KAAK,EAAE;gBACL,gBAAgB,EAAE,CAAC;aACb;YACR,OAAO,EAAE;gBACP,MAAM,EAAE,IAAI;gBACZ,MAAM,EAAE,IAAI;aACb;SACF;QAED;YACE,KAAK,EAAE;gBACL,yCAAyC,EAAE,CAAC;aACtC;YACR,OAAO,EAAE;gBACP,MAAM,EAAE,IAAI;aACb;SACF;QAED;YACE,KAAK,EAAE;gBACL,+BAA+B,EAAE,CAAC;aAC5B;YACR,OAAO,EAAE;gBACP,MAAM,EAAE,IAAI;aACb;SACF;QAED;YACE,KAAK,EAAE;gBACL,GAAG,EAAE,MAAM;gBACX,QAAQ,EAAE,MAAM;gBAChB,gBAAgB,EAAE,MAAM;gBACxB,qBAAqB,EAAE,MAAM;gBAC7B,8BAA8B,EAAE,MAAM;gBACtC,6BAA6B,EAAE,MAAM;gBACrC,4BAA4B,EAAE,MAAM;gBACpC,gCAAgC,EAAE,MAAM;gBACxC,iCAAiC,EAAE,MAAM;aACnC;YACR,OAAO,EAAE;gBACP,OAAO,EAAE;oBACP,GAAG,EAAE,CAAC;oBACN,gBAAgB,EAAE,CAAC;oBACnB,qBAAqB,EAAE,CAAC;oBACxB,8BAA8B,EAAE,CAAC;oBACjC,6BAA6B,EAAE,CAAC;oBAChC,4BAA4B,EAAE,CAAC;oBAC/B,gCAAgC,EAAE,CAAC;oBACnC,iCAAiC,EAAE,CAAC;iBACrC;gBACD,IAAI,EAAE,sBAAsB;aAC7B;SACF;KACF,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}
|
|
@@ -1,5 +1,10 @@
|
|
|
1
|
-
import { WebAuthnCredentialsCreationRequest } from '../types.js';
|
|
2
1
|
import { mongodb } from '@unchainedshop/mongodb';
|
|
2
|
+
export interface WebAuthnCredentialsCreationRequest {
|
|
3
|
+
challenge: string;
|
|
4
|
+
username: string;
|
|
5
|
+
origin: string;
|
|
6
|
+
factor: 'first' | 'second' | 'either';
|
|
7
|
+
}
|
|
3
8
|
type Collection = WebAuthnCredentialsCreationRequest & {
|
|
4
9
|
_id: number;
|
|
5
10
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebAuthnCredentialsCreationRequestsCollection.d.ts","sourceRoot":"","sources":["../../src/db/WebAuthnCredentialsCreationRequestsCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kCAAkC,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"WebAuthnCredentialsCreationRequestsCollection.d.ts","sourceRoot":"","sources":["../../src/db/WebAuthnCredentialsCreationRequestsCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAkB,MAAM,wBAAwB,CAAC;AAEjE,MAAM,WAAW,kCAAkC;IACjD,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC;CACvC;AAED,KAAK,UAAU,GAAG,kCAAkC,GAAG;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvE,eAAO,MAAM,6CAA6C,OAAc,OAAO,CAAC,EAAE,4CAcjF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebAuthnCredentialsCreationRequestsCollection.js","sourceRoot":"","sources":["../../src/db/WebAuthnCredentialsCreationRequestsCollection.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"WebAuthnCredentialsCreationRequestsCollection.js","sourceRoot":"","sources":["../../src/db/WebAuthnCredentialsCreationRequestsCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAWjE,MAAM,CAAC,MAAM,6CAA6C,GAAG,KAAK,EAAE,EAAc,EAAE,EAAE;IACpF,MAAM,mCAAmC,GAAG,EAAE,CAAC,UAAU,CACvD,iDAAiD,CAClD,CAAC;IAEF,MAAM,cAAc,CAAa,mCAAmC,EAAE;QACpE;YACE,KAAK,EAAE;gBACL,QAAQ,EAAE,CAAC;aACZ;SACF;KACF,CAAC,CAAC;IAEH,OAAO,mCAAmC,CAAC;AAC7C,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addMigrations.d.ts","sourceRoot":"","sources":["../../src/module/addMigrations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"addMigrations.d.ts","sourceRoot":"","sources":["../../src/module/addMigrations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAI7D,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,UAAU,EAAE,mBAAmB,QAuDpE"}
|
|
@@ -1,46 +1,6 @@
|
|
|
1
1
|
import { UsersCollection } from '../db/UsersCollection.js';
|
|
2
|
-
|
|
3
|
-
let bulk = collection.initializeUnorderedBulkOp();
|
|
4
|
-
let count = 0;
|
|
5
|
-
const cursor = await collection.find({ tags: { $regex: '.*[A-Z]' } });
|
|
6
|
-
// eslint-disable-next-line no-restricted-syntax
|
|
7
|
-
for await (const doc of cursor) {
|
|
8
|
-
const transformedTags = doc.tags.map((tag) => tag.toLowerCase());
|
|
9
|
-
count += 1;
|
|
10
|
-
bulk.find({ _id: doc._id }).updateOne({ $set: { tags: transformedTags } });
|
|
11
|
-
if (count % 500 === 0) {
|
|
12
|
-
bulk.execute();
|
|
13
|
-
bulk = collection.initializeUnorderedBulkOp();
|
|
14
|
-
count = 0;
|
|
15
|
-
}
|
|
16
|
-
}
|
|
17
|
-
if (count > 0)
|
|
18
|
-
bulk.execute();
|
|
19
|
-
};
|
|
2
|
+
import { systemLocale } from '@unchainedshop/utils';
|
|
20
3
|
export default function addMigrations(repository) {
|
|
21
|
-
repository?.register({
|
|
22
|
-
id: 20220603115000,
|
|
23
|
-
name: 'Copy user.profile.customFields to user.meta',
|
|
24
|
-
up: async () => {
|
|
25
|
-
const Users = await UsersCollection(repository.db);
|
|
26
|
-
const users = await Users.find({ meta: { $exists: false }, 'profile.customFields': { $exists: true } }, { projection: { _id: true, profile: true, meta: true } }).toArray();
|
|
27
|
-
await Promise.all(users.map(async (user) => {
|
|
28
|
-
await Users.updateOne({
|
|
29
|
-
_id: user._id,
|
|
30
|
-
}, {
|
|
31
|
-
$set: { meta: user.profile.customFields },
|
|
32
|
-
});
|
|
33
|
-
}));
|
|
34
|
-
},
|
|
35
|
-
});
|
|
36
|
-
repository?.register({
|
|
37
|
-
id: 20220920122500,
|
|
38
|
-
name: 'Convert user tags to lower case for easy search',
|
|
39
|
-
up: async () => {
|
|
40
|
-
const Users = await UsersCollection(repository.db);
|
|
41
|
-
await convertTagsToLowerCase(Users);
|
|
42
|
-
},
|
|
43
|
-
});
|
|
44
4
|
repository?.register({
|
|
45
5
|
id: 20230719105000,
|
|
46
6
|
name: 'Rename user.lastLogin.countryContext to user.lastLogin.countryCode',
|
|
@@ -53,5 +13,36 @@ export default function addMigrations(repository) {
|
|
|
53
13
|
});
|
|
54
14
|
},
|
|
55
15
|
});
|
|
16
|
+
repository?.register({
|
|
17
|
+
id: 20241218092300,
|
|
18
|
+
name: 'Convert user.lastLogin.locale',
|
|
19
|
+
up: async () => {
|
|
20
|
+
const Users = await UsersCollection(repository.db);
|
|
21
|
+
const users = await Users.find({
|
|
22
|
+
'lastLogin.locale': { $exists: true },
|
|
23
|
+
}, { projection: { _id: true, lastLogin: true } }).toArray();
|
|
24
|
+
for (const user of users) {
|
|
25
|
+
let newLocale;
|
|
26
|
+
try {
|
|
27
|
+
newLocale = new Intl.Locale(user.lastLogin.locale).baseName;
|
|
28
|
+
}
|
|
29
|
+
catch {
|
|
30
|
+
/* */
|
|
31
|
+
try {
|
|
32
|
+
newLocale = new Intl.Locale(user.lastLogin.locale.split('_').join('-')).baseName;
|
|
33
|
+
}
|
|
34
|
+
catch {
|
|
35
|
+
/* */
|
|
36
|
+
newLocale = systemLocale.baseName;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
await Users.updateOne({
|
|
40
|
+
_id: user._id,
|
|
41
|
+
}, {
|
|
42
|
+
$set: { 'lastLogin.locale': newLocale },
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
},
|
|
46
|
+
});
|
|
56
47
|
}
|
|
57
48
|
//# sourceMappingURL=addMigrations.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addMigrations.js","sourceRoot":"","sources":["../../src/module/addMigrations.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"addMigrations.js","sourceRoot":"","sources":["../../src/module/addMigrations.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,UAA+B;IACnE,UAAU,EAAE,QAAQ,CAAC;QACnB,EAAE,EAAE,cAAc;QAClB,IAAI,EAAE,oEAAoE;QAC1E,EAAE,EAAE,KAAK,IAAI,EAAE;YACb,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YACnD,MAAM,KAAK,CAAC,UAAU,CACpB;gBACE,0BAA0B,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;aAC9C,EACD;gBACE,OAAO,EAAE,EAAE,0BAA0B,EAAE,uBAAuB,EAAE;aACjE,CACF,CAAC;QACJ,CAAC;KACF,CAAC,CAAC;IAEH,UAAU,EAAE,QAAQ,CAAC;QACnB,EAAE,EAAE,cAAc;QAClB,IAAI,EAAE,+BAA+B;QACrC,EAAE,EAAE,KAAK,IAAI,EAAE;YACb,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YAEnD,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,IAAI,CAC5B;gBACE,kBAAkB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;aACtC,EACD,EAAE,UAAU,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,CAC/C,CAAC,OAAO,EAAE,CAAC;YAEZ,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,IAAI,SAAS,CAAC;gBACd,IAAI,CAAC;oBACH,SAAS,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC;gBAC9D,CAAC;gBAAC,MAAM,CAAC;oBACP,KAAK;oBACL,IAAI,CAAC;wBACH,SAAS,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC;oBACnF,CAAC;oBAAC,MAAM,CAAC;wBACP,KAAK;wBACL,SAAS,GAAG,YAAY,CAAC,QAAQ,CAAC;oBACpC,CAAC;gBACH,CAAC;gBAED,MAAM,KAAK,CAAC,SAAS,CACnB;oBACE,GAAG,EAAE,IAAI,CAAC,GAAG;iBACd,EACD;oBACE,IAAI,EAAE,EAAE,kBAAkB,EAAE,SAAS,EAAE;iBACxC,CACF,CAAC;YACJ,CAAC;QACH,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1,72 +1,42 @@
|
|
|
1
|
-
import { ModuleInput } from '@unchainedshop/mongodb';
|
|
2
|
-
import { User, UserQuery, Email, UserLastLogin, UserProfile
|
|
3
|
-
import { mongodb } from '@unchainedshop/mongodb';
|
|
1
|
+
import { ModuleInput, Address, Contact, mongodb } from '@unchainedshop/mongodb';
|
|
2
|
+
import { User, UserQuery, Email, UserLastLogin, UserProfile } from '../db/UsersCollection.js';
|
|
4
3
|
import { SortOption } from '@unchainedshop/utils';
|
|
5
4
|
import { UserSettingsOptions } from '../users-settings.js';
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
when: Date;
|
|
18
|
-
}>;
|
|
19
|
-
findUserByEmail(email: string): Promise<User>;
|
|
20
|
-
findUserByUsername(username: string): Promise<User>;
|
|
21
|
-
findUser: (selector: UserQuery & {
|
|
22
|
-
sort?: Array<SortOption>;
|
|
23
|
-
}, options?: mongodb.FindOptions) => Promise<User>;
|
|
24
|
-
findUsers: (query: UserQuery & {
|
|
25
|
-
sort?: Array<SortOption>;
|
|
26
|
-
limit?: number;
|
|
27
|
-
offset?: number;
|
|
28
|
-
}) => Promise<Array<User>>;
|
|
29
|
-
userExists: (query: {
|
|
30
|
-
userId: string;
|
|
31
|
-
}) => Promise<boolean>;
|
|
32
|
-
primaryEmail: (user: User) => Email;
|
|
33
|
-
userLocale: (user: User) => Intl.Locale;
|
|
34
|
-
createUser: (userData: UserData, options: {
|
|
35
|
-
skipMessaging?: boolean;
|
|
36
|
-
skipPasswordEnrollment?: boolean;
|
|
37
|
-
}) => Promise<string>;
|
|
38
|
-
addEmail: (userId: string, email: string) => Promise<void>;
|
|
39
|
-
removeEmail: (userId: string, email: string) => Promise<void>;
|
|
40
|
-
sendVerificationEmail: (userId: string, email: string) => Promise<void>;
|
|
41
|
-
sendResetPasswordEmail: (userId: string, email: string, isEnrollment?: boolean) => Promise<void>;
|
|
42
|
-
verifyEmail: (userId: string, email: string) => Promise<void>;
|
|
43
|
-
setUsername: (userId: string, newUsername: string) => Promise<void>;
|
|
44
|
-
setPassword: (userId: string, newPassword?: string) => Promise<void>;
|
|
45
|
-
verifyPassword: (hashObject: Record<string, string>, password: string) => Promise<boolean>;
|
|
46
|
-
addRoles: (userId: string, roles: Array<string>) => Promise<number>;
|
|
47
|
-
updateAvatar: (_id: string, fileId: string) => Promise<User>;
|
|
48
|
-
updateGuest: (user: User, guest: boolean) => Promise<void>;
|
|
49
|
-
updateHeartbeat: (userId: string, doc: UserLastLogin) => Promise<User>;
|
|
50
|
-
updateLastBillingAddress: (_id: string, lastAddress: Address) => Promise<User>;
|
|
51
|
-
updateLastContact: (_id: string, lastContact: Contact) => Promise<User>;
|
|
52
|
-
updateProfile: (_id: string, { profile, meta }: {
|
|
53
|
-
profile?: UserProfile;
|
|
54
|
-
meta?: any;
|
|
55
|
-
}) => Promise<User>;
|
|
56
|
-
delete: (userId: string) => Promise<User>;
|
|
57
|
-
updateRoles: (_id: string, roles: Array<string>) => Promise<User>;
|
|
58
|
-
updateTags: (_id: string, tags: Array<string>) => Promise<User>;
|
|
59
|
-
updateUser: (selector: mongodb.Filter<User>, modifier: mongodb.UpdateFilter<User>, options: mongodb.FindOneAndUpdateOptions) => Promise<User>;
|
|
60
|
-
addPushSubscription: (userId: string, subscription: any, options?: {
|
|
61
|
-
userAgent: string;
|
|
62
|
-
unsubscribeFromOtherUsers: boolean;
|
|
63
|
-
}) => Promise<void>;
|
|
64
|
-
removePushSubscription: (userId: string, p256dh: string) => Promise<void>;
|
|
65
|
-
};
|
|
5
|
+
export interface UserData {
|
|
6
|
+
email?: string;
|
|
7
|
+
guest?: boolean;
|
|
8
|
+
initialPassword?: boolean;
|
|
9
|
+
lastBillingAddress?: User['lastBillingAddress'];
|
|
10
|
+
password: string | null;
|
|
11
|
+
webAuthnPublicKeyCredentials?: any;
|
|
12
|
+
profile?: UserProfile;
|
|
13
|
+
roles?: Array<string>;
|
|
14
|
+
username?: string;
|
|
15
|
+
}
|
|
66
16
|
export declare const removeConfidentialServiceHashes: (rawUser: User) => User;
|
|
67
|
-
export declare const buildFindSelector: ({ includeGuests, queryString, ...rest }: UserQuery) => mongodb.Filter<User>;
|
|
17
|
+
export declare const buildFindSelector: ({ includeGuests, queryString, emailVerified, lastLogin, ...rest }: UserQuery) => mongodb.Filter<User>;
|
|
68
18
|
export declare const configureUsersModule: ({ db, options, migrationRepository, }: ModuleInput<UserSettingsOptions>) => Promise<{
|
|
69
|
-
webAuthn:
|
|
19
|
+
webAuthn: {
|
|
20
|
+
findMDSMetadataForAAGUID: (aaguid: string) => Promise<any>;
|
|
21
|
+
createCredentialCreationOptions: (origin: string, username: string, extensionOptions?: any) => Promise<Omit<import("fido2-lib").PublicKeyCredentialCreationOptions, "challenge" | "requestId"> & {
|
|
22
|
+
challenge: string;
|
|
23
|
+
requestId: number;
|
|
24
|
+
}>;
|
|
25
|
+
createCredentialRequestOptions: (origin: string, username?: string, extensionOptions?: any) => Promise<Omit<import("fido2-lib").PublicKeyCredentialRequestOptions, "challenge" | "requestId"> & {
|
|
26
|
+
challenge: string;
|
|
27
|
+
requestId: number;
|
|
28
|
+
}>;
|
|
29
|
+
verifyCredentialCreation: (username: string, credentials: any) => Promise<{
|
|
30
|
+
publicKey: any;
|
|
31
|
+
counter: any;
|
|
32
|
+
id: any;
|
|
33
|
+
aaguid: string;
|
|
34
|
+
created: Date;
|
|
35
|
+
}>;
|
|
36
|
+
verifyCredentialRequest: (userPublicKeys: any[], username: string, credentials: any) => Promise<{
|
|
37
|
+
userHandle: any;
|
|
38
|
+
}>;
|
|
39
|
+
};
|
|
70
40
|
count(query: UserQuery): Promise<number>;
|
|
71
41
|
findUserById(userId: string): Promise<User>;
|
|
72
42
|
findUserByUsername(username: string): Promise<User>;
|
|
@@ -77,8 +47,12 @@ export declare const configureUsersModule: ({ db, options, migrationRepository,
|
|
|
77
47
|
when: Date;
|
|
78
48
|
}>;
|
|
79
49
|
verifyEmail(userId: string, address: string): Promise<void>;
|
|
80
|
-
|
|
81
|
-
|
|
50
|
+
findResetToken(plainToken: string): Promise<{
|
|
51
|
+
userId: string;
|
|
52
|
+
address: string;
|
|
53
|
+
when: Date;
|
|
54
|
+
}>;
|
|
55
|
+
findUserByToken(plainToken: string): Promise<User>;
|
|
82
56
|
findUser(query: UserQuery & {
|
|
83
57
|
sort?: Array<SortOption>;
|
|
84
58
|
}, findOptions?: mongodb.FindOptions): Promise<User>;
|
|
@@ -96,7 +70,7 @@ export declare const configureUsersModule: ({ db, options, migrationRepository,
|
|
|
96
70
|
skipMessaging?: boolean;
|
|
97
71
|
skipPasswordEnrollment?: boolean;
|
|
98
72
|
}): Promise<string>;
|
|
99
|
-
hashPassword(password:
|
|
73
|
+
hashPassword(password: string): Promise<{
|
|
100
74
|
pbkdf2: string;
|
|
101
75
|
}>;
|
|
102
76
|
verifyPassword({ bcrypt: bcryptHash, pbkdf2: pbkdf2SaltAndHash }: {
|
|
@@ -109,11 +83,15 @@ export declare const configureUsersModule: ({ db, options, migrationRepository,
|
|
|
109
83
|
sendVerificationEmail(userId: string, email: string): Promise<void>;
|
|
110
84
|
addRoles: (userId: string, roles: Array<string>) => Promise<number>;
|
|
111
85
|
setUsername(userId: string, username: string): Promise<void>;
|
|
112
|
-
setPassword(userId: string, plainPassword: string): Promise<
|
|
86
|
+
setPassword(userId: string, plainPassword: string): Promise<User>;
|
|
87
|
+
resetPassword(token: string, newPassword: string): Promise<User>;
|
|
113
88
|
updateAvatar: (_id: string, fileId: string) => Promise<User>;
|
|
114
89
|
updateGuest: (user: User, guest: boolean) => Promise<void>;
|
|
115
90
|
updateHeartbeat: (userId: string, lastLogin: UserLastLogin) => Promise<User>;
|
|
116
|
-
|
|
91
|
+
markDeleted: (userId: string) => Promise<User>;
|
|
92
|
+
deletePermanently: ({ userId }: {
|
|
93
|
+
userId: string;
|
|
94
|
+
}) => Promise<User>;
|
|
117
95
|
updateProfile: (userId: string, updatedData: {
|
|
118
96
|
profile?: UserProfile;
|
|
119
97
|
meta?: any;
|
|
@@ -129,4 +107,5 @@ export declare const configureUsersModule: ({ db, options, migrationRepository,
|
|
|
129
107
|
}) => Promise<void>;
|
|
130
108
|
removePushSubscription: (userId: string, p256dh: string) => Promise<void>;
|
|
131
109
|
}>;
|
|
110
|
+
export type UsersModule = Awaited<ReturnType<typeof configureUsersModule>>;
|
|
132
111
|
//# sourceMappingURL=configureUsersModule.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configureUsersModule.d.ts","sourceRoot":"","sources":["../../src/module/configureUsersModule.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"configureUsersModule.d.ts","sourceRoot":"","sources":["../../src/module/configureUsersModule.ts"],"names":[],"mappings":"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"}
|