@unchainedshop/core-users 3.0.0-rc1 → 3.0.0-rc11
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 +85 -48
- package/lib/module/configureUsersModule.d.ts.map +1 -1
- package/lib/module/configureUsersModule.js +49 -20
- 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 -1
- package/lib/users-index.d.ts.map +1 -1
- package/lib/users-index.js +3 -1
- 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 +20 -9
- 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 +83 -105
- package/src/module/configureUsersWebAuthnModule.ts +47 -43
- package/src/module/pbkdf2.ts +1 -1
- package/src/module/removeConfidentialServiceHashes.test.ts +1 -1
- package/src/users-index.ts +3 -1
- package/src/users-settings.ts +1 -2
- package/lib/module/configureUsersModule_BACKUP_57123.d.ts +0 -73
- package/lib/module/configureUsersModule_BACKUP_57123.d.ts.map +0 -1
- package/lib/module/configureUsersModule_BACKUP_57123.js +0 -567
- package/lib/module/configureUsersModule_BACKUP_57123.js.map +0 -1
- package/lib/module/configureUsersModule_BASE_57123.d.ts +0 -131
- package/lib/module/configureUsersModule_BASE_57123.d.ts.map +0 -1
- package/lib/module/configureUsersModule_BASE_57123.js +0 -563
- package/lib/module/configureUsersModule_BASE_57123.js.map +0 -1
- package/lib/module/configureUsersModule_LOCAL_57123.d.ts +0 -131
- package/lib/module/configureUsersModule_LOCAL_57123.d.ts.map +0 -1
- package/lib/module/configureUsersModule_LOCAL_57123.js +0 -564
- package/lib/module/configureUsersModule_LOCAL_57123.js.map +0 -1
- package/lib/module/configureUsersModule_REMOTE_57123.d.ts +0 -74
- package/lib/module/configureUsersModule_REMOTE_57123.d.ts.map +0 -1
- package/lib/module/configureUsersModule_REMOTE_57123.js +0 -567
- package/lib/module/configureUsersModule_REMOTE_57123.js.map +0 -1
- 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/types.d.ts +0 -91
- package/lib/types.d.ts.map +0 -1
- package/lib/types.js +0 -2
- package/lib/types.js.map +0 -1
- package/src/types.ts +0 -104
|
@@ -1,12 +1,25 @@
|
|
|
1
1
|
import { ModuleInput } from '@unchainedshop/mongodb';
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
verifyCredentialRequest: (userPublicKeys: any[], username: string, credentials: any) => Promise<any>;
|
|
8
|
-
}
|
|
2
|
+
import type { PublicKeyCredentialCreationOptions, PublicKeyCredentialRequestOptions } from 'fido2-lib';
|
|
3
|
+
type SerializedOptions<T> = Omit<T, 'challenge' | 'requestId'> & {
|
|
4
|
+
challenge: string;
|
|
5
|
+
requestId: number;
|
|
6
|
+
};
|
|
9
7
|
export declare function toArrayBuffer(buffer: any): any;
|
|
10
8
|
export declare function buf2hex(buffer: any): any;
|
|
11
|
-
export declare const configureUsersWebAuthnModule: ({ db
|
|
9
|
+
export declare const configureUsersWebAuthnModule: ({ db }: ModuleInput<any>) => Promise<{
|
|
10
|
+
findMDSMetadataForAAGUID: (aaguid: string) => Promise<any>;
|
|
11
|
+
createCredentialCreationOptions: (origin: string, username: string, extensionOptions?: any) => Promise<SerializedOptions<PublicKeyCredentialCreationOptions>>;
|
|
12
|
+
createCredentialRequestOptions: (origin: string, username?: string, extensionOptions?: any) => Promise<SerializedOptions<PublicKeyCredentialRequestOptions>>;
|
|
13
|
+
verifyCredentialCreation: (username: string, credentials: any) => Promise<{
|
|
14
|
+
publicKey: any;
|
|
15
|
+
counter: any;
|
|
16
|
+
id: any;
|
|
17
|
+
aaguid: string;
|
|
18
|
+
created: Date;
|
|
19
|
+
}>;
|
|
20
|
+
verifyCredentialRequest: (userPublicKeys: any[], username: string, credentials: any) => Promise<{
|
|
21
|
+
userHandle: any;
|
|
22
|
+
}>;
|
|
23
|
+
}>;
|
|
24
|
+
export {};
|
|
12
25
|
//# sourceMappingURL=configureUsersWebAuthnModule.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configureUsersWebAuthnModule.d.ts","sourceRoot":"","sources":["../../src/module/configureUsersWebAuthnModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"configureUsersWebAuthnModule.d.ts","sourceRoot":"","sources":["../../src/module/configureUsersWebAuthnModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAIrD,OAAO,KAAK,EAAE,kCAAkC,EAAE,iCAAiC,EAAE,MAAM,WAAW,CAAC;AAMvG,KAAK,iBAAiB,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,WAAW,GAAG,WAAW,CAAC,GAAG;IAC/D,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAyBF,wBAAgB,aAAa,CAAC,MAAM,KAAA,OAEnC;AAED,wBAAgB,OAAO,CAAC,MAAM,KAAA,OAK7B;AAqBD,eAAO,MAAM,4BAA4B,WAAkB,WAAW,CAAC,GAAG,CAAC;uCAI9B,MAAM;8CASrC,MAAM,YACJ,MAAM,qBACG,GAAG;6CAsBd,MAAM,aACH,MAAM,qBACE,GAAG;yCAqBmB,MAAM,eAAe,GAAG;;;;;;;8CAiDnB,GAAG,EAAE,YAAY,MAAM,eAAe,GAAG;;;EA8C5F,CAAC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { Fido2Lib, } from 'fido2-lib';
|
|
2
1
|
import { createLogger } from '@unchainedshop/logger';
|
|
3
2
|
import { WebAuthnCredentialsCreationRequestsCollection } from '../db/WebAuthnCredentialsCreationRequestsCollection.js';
|
|
4
3
|
const logger = createLogger('unchained:core-users');
|
|
@@ -8,6 +7,9 @@ const setupMDSCollection = async () => {
|
|
|
8
7
|
try {
|
|
9
8
|
const tocResult = await fetch('https://mds.fidoalliance.org');
|
|
10
9
|
const tocBase64 = await tocResult.text();
|
|
10
|
+
// eslint-disable-next-line
|
|
11
|
+
// @ts-ignore
|
|
12
|
+
const { Fido2Lib } = await import('fido2-lib');
|
|
11
13
|
const mc = Fido2Lib.createMdsCollection('FIDO MDS v3'); // createMdsCollection exists but not typed in official package!
|
|
12
14
|
const tocObj = await mc.addToc(tocBase64);
|
|
13
15
|
return tocObj.entries;
|
|
@@ -32,16 +34,27 @@ export function buf2hex(buffer) {
|
|
|
32
34
|
.call(new Uint8Array(buffer), (x) => `00${x.toString(16)}`.slice(-2))
|
|
33
35
|
.join('');
|
|
34
36
|
}
|
|
35
|
-
|
|
37
|
+
const initF2L = async () => {
|
|
38
|
+
try {
|
|
39
|
+
const thisDomain = new URL(ROOT_URL).hostname;
|
|
40
|
+
const { Fido2Lib } = await import('fido2-lib');
|
|
41
|
+
const f2l = new Fido2Lib({
|
|
42
|
+
rpId: thisDomain,
|
|
43
|
+
rpName: EMAIL_WEBSITE_NAME,
|
|
44
|
+
rpIcon: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAARCSURBVHgB7Ve9UxNbFL8fm7yA4ktegHnlMk98dMbOMnR2D6pnGTqtCH+BWFoBpZXQaaelFbGzEztHHF26DKizzijDx+Zef+fu3vXuJgsxztjonQnZOZw993d+5zOM/epHslFO1a/KS/UbuvTnETsKQ/YDh3+XNi72yuVlzVgbL1YhCaOTk2ssDAI24hHDKsrpfxZkufwCj6t0OUAEBMkrlR6wHzjDMVCd872yemeete7gczeKoh2wQTICsyi0DrTWVc55eHqwu8OGPEMCMNSby5hS89H7Nx0Se9NXVvF1J69O7MDwJsKzgfCcmSP9SQhvxcV6S5cnummCHYVH4kJ9DE9NfHx1+HGLxKo0sSOkvIXHSnyz7mjOySufdLmUN3Vp4slZiSoyXk7NrhHVQui1fGzhzTq+QsZ5U07NtowQ3oH2FavDhXjS2389w7W+lrDgI2+2yfaZAEpT/y5LopjztnEkf1F6GXsc38TvWKO9g91NfO3EBGgjpxzooTosCISvXQjAm7zc1Fyvm7IChRHQM+uVcxGBAbstI84bVcqyUE3lAMyVWkrky0UsuGUYRqeni4zQk1cAk15ELxMYy07OqElKqo5ieVWWymsDAbhKGa9Qatag8P5omcQiUEot9nmb1c9cFkm5FJPJWqWp2UYegKkCMf7XHjRaeGwgs+9T1iPTA8ibkM/h5ev4XwVJthEd7D7kF+ozANRI9B9RlpO+lUO/IcZqz0jGPr8PUUFU7k185mwFZUIwBAuGUqWUob8nxCqLQ0H6qbeOnNmQGftOBVHO9QEw+ozZRKLE8y0wxDxFLISIE6n7KsDfjUS8kBoludZbCYBvl8XNaCMPLAOASsde5vYAlFPbeqWV+q/Pq5xR6HRS6zkWzPzIlXdmGKWXFaM/V06zwAGQaVppSJ3yzk7DAqpcb7UQD/q8cuRoxb75dtlxm5Zb3mzALEj7O7I/zWRUBRurHcO7G9Sw5MXJT+rLh+dmRlSqe6iOm1aOC/5nBELr2yTDOw3YO4Z+x3icq7iB01BMXm4j4dbIO+rtVi6nr7xLBg0tIjN20mGGbBPdVs+8J07mvcjzkbnbGf14tNNeYcb4wJVMH358jpo2zSf1lgCM1V4m6CsFXiUG9Iref9txe4kQXgVT9jqXejNZaEKAvFu4D5ikStBjus3bJcPxdjALNE8OduetHep+yIsXGQcZf9wTxyusGwSFS2mCvmaMcn6Lj9d9OV77BGN7iOuCYQFeqcMPT43+peln2IraFH/EdsvuALDTTTthvE0tIRnvsc/x/8/diIq2HnsSFoKEhXUAWM6zYA5VwoDtaLiV7O85XypFy+hVnbRlhCXoo9zZHWkpGWY3/L613D25PZFzeVVxvZqs6ywSYKZ7/ro+2g8TOu6eSBXAGfWIio2z2n871GY8OgN06BcSfitQuZr1CxuQ3Zh/6qkk0/P3GeV8BeBCYUHc/WHIAAAAAElFTkSuQmCC',
|
|
45
|
+
challengeSize: 128,
|
|
46
|
+
attestation: 'none',
|
|
47
|
+
});
|
|
48
|
+
return f2l;
|
|
49
|
+
}
|
|
50
|
+
catch {
|
|
51
|
+
logger.warn(`optional peer npm package 'fido2-lib' not installed, WebAuthn will not work`);
|
|
52
|
+
return null;
|
|
53
|
+
}
|
|
54
|
+
};
|
|
55
|
+
export const configureUsersWebAuthnModule = async ({ db }) => {
|
|
36
56
|
const WebAuthnCredentialsCreationRequests = await WebAuthnCredentialsCreationRequestsCollection(db);
|
|
37
|
-
const
|
|
38
|
-
const f2l = new Fido2Lib({
|
|
39
|
-
rpId: thisDomain,
|
|
40
|
-
rpName: EMAIL_WEBSITE_NAME,
|
|
41
|
-
rpIcon: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAARCSURBVHgB7Ve9UxNbFL8fm7yA4ktegHnlMk98dMbOMnR2D6pnGTqtCH+BWFoBpZXQaaelFbGzEztHHF26DKizzijDx+Zef+fu3vXuJgsxztjonQnZOZw993d+5zOM/epHslFO1a/KS/UbuvTnETsKQ/YDh3+XNi72yuVlzVgbL1YhCaOTk2ssDAI24hHDKsrpfxZkufwCj6t0OUAEBMkrlR6wHzjDMVCd872yemeete7gczeKoh2wQTICsyi0DrTWVc55eHqwu8OGPEMCMNSby5hS89H7Nx0Se9NXVvF1J69O7MDwJsKzgfCcmSP9SQhvxcV6S5cnummCHYVH4kJ9DE9NfHx1+HGLxKo0sSOkvIXHSnyz7mjOySufdLmUN3Vp4slZiSoyXk7NrhHVQui1fGzhzTq+QsZ5U07NtowQ3oH2FavDhXjS2389w7W+lrDgI2+2yfaZAEpT/y5LopjztnEkf1F6GXsc38TvWKO9g91NfO3EBGgjpxzooTosCISvXQjAm7zc1Fyvm7IChRHQM+uVcxGBAbstI84bVcqyUE3lAMyVWkrky0UsuGUYRqeni4zQk1cAk15ELxMYy07OqElKqo5ieVWWymsDAbhKGa9Qatag8P5omcQiUEot9nmb1c9cFkm5FJPJWqWp2UYegKkCMf7XHjRaeGwgs+9T1iPTA8ibkM/h5ev4XwVJthEd7D7kF+ozANRI9B9RlpO+lUO/IcZqz0jGPr8PUUFU7k185mwFZUIwBAuGUqWUob8nxCqLQ0H6qbeOnNmQGftOBVHO9QEw+ozZRKLE8y0wxDxFLISIE6n7KsDfjUS8kBoludZbCYBvl8XNaCMPLAOASsde5vYAlFPbeqWV+q/Pq5xR6HRS6zkWzPzIlXdmGKWXFaM/V06zwAGQaVppSJ3yzk7DAqpcb7UQD/q8cuRoxb75dtlxm5Zb3mzALEj7O7I/zWRUBRurHcO7G9Sw5MXJT+rLh+dmRlSqe6iOm1aOC/5nBELr2yTDOw3YO4Z+x3icq7iB01BMXm4j4dbIO+rtVi6nr7xLBg0tIjN20mGGbBPdVs+8J07mvcjzkbnbGf14tNNeYcb4wJVMH358jpo2zSf1lgCM1V4m6CsFXiUG9Iref9txe4kQXgVT9jqXejNZaEKAvFu4D5ikStBjus3bJcPxdjALNE8OduetHep+yIsXGQcZf9wTxyusGwSFS2mCvmaMcn6Lj9d9OV77BGN7iOuCYQFeqcMPT43+peln2IraFH/EdsvuALDTTTthvE0tIRnvsc/x/8/diIq2HnsSFoKEhXUAWM6zYA5VwoDtaLiV7O85XypFy+hVnbRlhCXoo9zZHWkpGWY3/L613D25PZFzeVVxvZqs6ywSYKZ7/ro+2g8TOu6eSBXAGfWIio2z2n871GY8OgN06BcSfitQuZr1CxuQ3Zh/6qkk0/P3GeV8BeBCYUHc/WHIAAAAAElFTkSuQmCC',
|
|
42
|
-
challengeSize: 128,
|
|
43
|
-
attestation: 'none',
|
|
44
|
-
});
|
|
57
|
+
const f2l = await initF2L();
|
|
45
58
|
return {
|
|
46
59
|
findMDSMetadataForAAGUID: async (aaguid) => {
|
|
47
60
|
const mdsCollection = await fetchMDS();
|
|
@@ -51,6 +64,8 @@ export const configureUsersWebAuthnModule = async ({ db, }) => {
|
|
|
51
64
|
return foundEntry?.metadataStatement;
|
|
52
65
|
},
|
|
53
66
|
createCredentialCreationOptions: async (origin, username, extensionOptions) => {
|
|
67
|
+
if (!f2l)
|
|
68
|
+
return null;
|
|
54
69
|
const registrationOptions = await f2l.attestationOptions(extensionOptions);
|
|
55
70
|
const challenge = Buffer.from(registrationOptions.challenge).toString('base64');
|
|
56
71
|
const { insertedId } = await WebAuthnCredentialsCreationRequests.insertOne({
|
|
@@ -67,6 +82,8 @@ export const configureUsersWebAuthnModule = async ({ db, }) => {
|
|
|
67
82
|
};
|
|
68
83
|
},
|
|
69
84
|
createCredentialRequestOptions: async (origin, username, extensionOptions) => {
|
|
85
|
+
if (!f2l)
|
|
86
|
+
return null;
|
|
70
87
|
const loginOptions = await f2l.assertionOptions(extensionOptions);
|
|
71
88
|
const challenge = Buffer.from(loginOptions.challenge).toString('base64');
|
|
72
89
|
const { insertedId } = await WebAuthnCredentialsCreationRequests.insertOne({
|
|
@@ -83,6 +100,8 @@ export const configureUsersWebAuthnModule = async ({ db, }) => {
|
|
|
83
100
|
};
|
|
84
101
|
},
|
|
85
102
|
verifyCredentialCreation: async (username, credentials) => {
|
|
103
|
+
if (!f2l)
|
|
104
|
+
return null;
|
|
86
105
|
const request = await WebAuthnCredentialsCreationRequests.findOne({
|
|
87
106
|
username,
|
|
88
107
|
}, { sort: { _id: -1 } });
|
|
@@ -110,6 +129,8 @@ export const configureUsersWebAuthnModule = async ({ db, }) => {
|
|
|
110
129
|
return { publicKey, counter, id: credentials.id, aaguid, created: new Date() };
|
|
111
130
|
},
|
|
112
131
|
verifyCredentialRequest: async (userPublicKeys, username, credentials) => {
|
|
132
|
+
if (!f2l)
|
|
133
|
+
return null;
|
|
113
134
|
const request = await WebAuthnCredentialsCreationRequests.findOne({
|
|
114
135
|
_id: credentials.requestId,
|
|
115
136
|
}, { sort: { _id: -1 } });
|
|
@@ -122,7 +143,7 @@ export const configureUsersWebAuthnModule = async ({ db, }) => {
|
|
|
122
143
|
return credentials.id === publicCredentials.id;
|
|
123
144
|
}) || {};
|
|
124
145
|
if (!publicKey)
|
|
125
|
-
|
|
146
|
+
return null;
|
|
126
147
|
const assertionExpectations = {
|
|
127
148
|
challenge: request.challenge,
|
|
128
149
|
origin: request.origin,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configureUsersWebAuthnModule.js","sourceRoot":"","sources":["../../src/module/configureUsersWebAuthnModule.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"configureUsersWebAuthnModule.js","sourceRoot":"","sources":["../../src/module/configureUsersWebAuthnModule.ts"],"names":[],"mappings":"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"}
|
package/lib/module/pbkdf2.js
CHANGED
|
@@ -3,7 +3,7 @@ const PBKDF2_ITERATIONS = 300000; // Iterations, > 210'000
|
|
|
3
3
|
const PBKDF2_KEY_LENGTH = 256; // Bytes
|
|
4
4
|
const PBKDF2_SALT_LENGTH = 16; // Bytes
|
|
5
5
|
export function generateSalt(saltLength = PBKDF2_SALT_LENGTH) {
|
|
6
|
-
const array = new
|
|
6
|
+
const array = new Uint8Array(saltLength);
|
|
7
7
|
return Buffer.from(crypto.getRandomValues(array)).toString('hex');
|
|
8
8
|
}
|
|
9
9
|
export async function getDerivedKey(salt, password, iterations = PBKDF2_ITERATIONS, keyLength = PBKDF2_KEY_LENGTH) {
|
package/lib/module/pbkdf2.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pbkdf2.js","sourceRoot":"","sources":["../../src/module/pbkdf2.ts"],"names":[],"mappings":"AAAA,0FAA0F;AAC1F,MAAM,iBAAiB,GAAG,MAAM,CAAC,CAAC,wBAAwB;AAC1D,MAAM,iBAAiB,GAAG,GAAG,CAAC,CAAC,QAAQ;AACvC,MAAM,kBAAkB,GAAG,EAAE,CAAC,CAAC,QAAQ;AAEvC,MAAM,UAAU,YAAY,CAAC,UAAU,GAAG,kBAAkB;IAC1D,MAAM,KAAK,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"pbkdf2.js","sourceRoot":"","sources":["../../src/module/pbkdf2.ts"],"names":[],"mappings":"AAAA,0FAA0F;AAC1F,MAAM,iBAAiB,GAAG,MAAM,CAAC,CAAC,wBAAwB;AAC1D,MAAM,iBAAiB,GAAG,GAAG,CAAC,CAAC,QAAQ;AACvC,MAAM,kBAAkB,GAAG,EAAE,CAAC,CAAC,QAAQ;AAEvC,MAAM,UAAU,YAAY,CAAC,UAAU,GAAG,kBAAkB;IAC1D,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,UAAU,CAAC,CAAC;IACzC,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AACpE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,IAAY,EACZ,QAAgB,EAChB,UAAU,GAAG,iBAAiB,EAC9B,SAAS,GAAG,iBAAiB;IAE7B,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;IACtC,MAAM,cAAc,GAAG,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACpD,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,KAAK,EAAE;QACxF,YAAY;KACb,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,UAAU,CACzC;QACE,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC;QAC9B,UAAU;KACX,EACD,WAAW,EACX,SAAS,CACV,CAAC;IACF,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC3C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,QAAgB,EAAE,IAAY,EAAE,IAAY;IACxE,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC3D,OAAO,cAAc,KAAK,IAAI,CAAC;AACjC,CAAC"}
|
package/lib/users-index.d.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
export * from './
|
|
1
|
+
export * from './db/UsersCollection.js';
|
|
2
|
+
export * from './db/WebAuthnCredentialsCreationRequestsCollection.js';
|
|
2
3
|
export * from './module/configureUsersModule.js';
|
|
4
|
+
export * from './module/configureUsersWebAuthnModule.js';
|
|
3
5
|
export * from './users-settings.js';
|
|
4
6
|
//# sourceMappingURL=users-index.d.ts.map
|
package/lib/users-index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users-index.d.ts","sourceRoot":"","sources":["../src/users-index.ts"],"names":[],"mappings":"AAAA,cAAc,
|
|
1
|
+
{"version":3,"file":"users-index.d.ts","sourceRoot":"","sources":["../src/users-index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,uDAAuD,CAAC;AACtE,cAAc,kCAAkC,CAAC;AACjD,cAAc,0CAA0C,CAAC;AACzD,cAAc,qBAAqB,CAAC"}
|
package/lib/users-index.js
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
export * from './
|
|
1
|
+
export * from './db/UsersCollection.js';
|
|
2
|
+
export * from './db/WebAuthnCredentialsCreationRequestsCollection.js';
|
|
2
3
|
export * from './module/configureUsersModule.js';
|
|
4
|
+
export * from './module/configureUsersWebAuthnModule.js';
|
|
3
5
|
export * from './users-settings.js';
|
|
4
6
|
//# sourceMappingURL=users-index.js.map
|
package/lib/users-index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users-index.js","sourceRoot":"","sources":["../src/users-index.ts"],"names":[],"mappings":"AAAA,cAAc,
|
|
1
|
+
{"version":3,"file":"users-index.js","sourceRoot":"","sources":["../src/users-index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,uDAAuD,CAAC;AACtE,cAAc,kCAAkC,CAAC;AACjD,cAAc,0CAA0C,CAAC;AACzD,cAAc,qBAAqB,CAAC"}
|
package/lib/users-settings.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users-settings.d.ts","sourceRoot":"","sources":["../src/users-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"users-settings.d.ts","sourceRoot":"","sources":["../src/users-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAC/C,MAAM,WAAW,mBAAmB;IAClC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,8BAA8B,CAAC,EAAE,OAAO,CAAC;IACzC,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACpD,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1D,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACzD,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAC3D;AACD,MAAM,WAAW,YAAY;IAC3B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,8BAA8B,EAAE,OAAO,CAAC;IACxC,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACnD,gBAAgB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACzD,eAAe,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACxD,gBAAgB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACzD,iBAAiB,EAAE,CAAC,OAAO,EAAE,mBAAmB,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,KAAK,IAAI,CAAC;CAC3E;AAED,eAAO,MAAM,YAAY,EAAE,YAwD1B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users-settings.js","sourceRoot":"","sources":["../src/users-settings.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"users-settings.js","sourceRoot":"","sources":["../src/users-settings.ts"],"names":[],"mappings":"AAoBA,MAAM,CAAC,MAAM,YAAY,GAAiB;IACxC,8BAA8B,EAAE,IAAI;IACpC,qBAAqB,EAAE,IAAI;IAC3B,aAAa,EAAE,IAAI;IACnB,gBAAgB,EAAE,IAAI;IACtB,eAAe,EAAE,IAAI;IACrB,gBAAgB,EAAE,IAAI;IAEtB,iBAAiB,EAAE,CACjB,EACE,qBAAqB,EACrB,8BAA8B,EAC9B,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,gBAAgB,GACI,EACtB,EAAc,EACd,EAAE;QACF,MAAM,qCAAqC,GAAG,IAAI,CAAC;QACnD,MAAM,4BAA4B,GAAG,IAAI,CAAC;QAE1C,MAAM,oBAAoB,GAAG,KAAK,EAAE,QAAgB,EAAE,EAAE;YACtD,MAAM,KAAK,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;YAC5C,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC;gBAAE,OAAO,KAAK,CAAC;YAC1C,MAAM,kBAAkB,GAAG,MAAM,EAAE;iBAChC,UAAU,CAAC,OAAO,CAAC;iBACnB,cAAc,CAAC,EAAE,gBAAgB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;YACxF,IAAI,kBAAkB;gBAAE,OAAO,KAAK,CAAC;YACrC,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QACF,MAAM,uBAAuB,GAAG,KAAK,EAAE,WAAmB,EAAE,EAAE;YAC5D,MAAM,QAAQ,GAAG,WAAW,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;YAClD,IAAI,QAAQ,EAAE,MAAM,GAAG,CAAC;gBAAE,OAAO,KAAK,CAAC;YACvC,MAAM,qBAAqB,GAAG,MAAM,EAAE;iBACnC,UAAU,CAAC,OAAO,CAAC;iBACnB,cAAc,CAAC,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;YACnF,IAAI,qBAAqB;gBAAE,OAAO,KAAK,CAAC;YACxC,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QACF,MAAM,sBAAsB,GAAG,KAAK,EAAE,IAAU,EAAE,EAAE;YAClD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEF,MAAM,uBAAuB,GAAG,KAAK,EAAE,QAAgB,EAAE,EAAE;YACzD,OAAO,QAAQ,EAAE,MAAM,IAAI,CAAC,CAAC;QAC/B,CAAC,CAAC;QAEF,YAAY,CAAC,qBAAqB,GAAG,qBAAqB,IAAI,4BAA4B,CAAC;QAC3F,YAAY,CAAC,8BAA8B;YACzC,8BAA8B,IAAI,qCAAqC,CAAC;QAC1E,YAAY,CAAC,aAAa,GAAG,aAAa,IAAI,oBAAoB,CAAC;QACnE,YAAY,CAAC,gBAAgB,GAAG,gBAAgB,IAAI,uBAAuB,CAAC;QAC5E,YAAY,CAAC,eAAe,GAAG,eAAe,IAAI,sBAAsB,CAAC;QACzE,YAAY,CAAC,gBAAgB,GAAG,gBAAgB,IAAI,uBAAuB,CAAC;IAC9E,CAAC;CACF,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@unchainedshop/core-users",
|
|
3
|
-
"version": "3.0.0-
|
|
3
|
+
"version": "3.0.0-rc11",
|
|
4
4
|
"main": "lib/users-index.js",
|
|
5
5
|
"types": "lib/users-index.d.ts",
|
|
6
6
|
"type": "module",
|
|
@@ -21,7 +21,10 @@
|
|
|
21
21
|
"ecommerce",
|
|
22
22
|
"core"
|
|
23
23
|
],
|
|
24
|
-
"
|
|
24
|
+
"authors": [
|
|
25
|
+
"Joël Meiller",
|
|
26
|
+
"Pascal Kaufmann"
|
|
27
|
+
],
|
|
25
28
|
"license": "EUPL-1.2",
|
|
26
29
|
"bugs": {
|
|
27
30
|
"url": "https://github.com/unchainedshop/unchained/issues"
|
|
@@ -29,16 +32,24 @@
|
|
|
29
32
|
"homepage": "https://github.com/unchainedshop/unchained#readme",
|
|
30
33
|
"dependencies": {
|
|
31
34
|
"@node-rs/bcrypt": "^1.10.7",
|
|
32
|
-
"@unchainedshop/events": "^3.0.0-
|
|
33
|
-
"@unchainedshop/file-upload": "^3.0.0-
|
|
34
|
-
"@unchainedshop/logger": "^3.0.0-
|
|
35
|
-
"@unchainedshop/mongodb": "^3.0.0-
|
|
36
|
-
"@unchainedshop/roles": "^3.0.0-
|
|
37
|
-
"@unchainedshop/utils": "^3.0.0-
|
|
38
|
-
|
|
35
|
+
"@unchainedshop/events": "^3.0.0-rc11",
|
|
36
|
+
"@unchainedshop/file-upload": "^3.0.0-rc11",
|
|
37
|
+
"@unchainedshop/logger": "^3.0.0-rc11",
|
|
38
|
+
"@unchainedshop/mongodb": "^3.0.0-rc11",
|
|
39
|
+
"@unchainedshop/roles": "^3.0.0-rc11",
|
|
40
|
+
"@unchainedshop/utils": "^3.0.0-rc11"
|
|
41
|
+
},
|
|
42
|
+
"peerDependencies": {
|
|
43
|
+
"fido2-lib": ">= 3.5 < 4"
|
|
44
|
+
},
|
|
45
|
+
"peerDependenciesMeta": {
|
|
46
|
+
"fido2-lib": {
|
|
47
|
+
"optional": true
|
|
48
|
+
}
|
|
39
49
|
},
|
|
40
50
|
"devDependencies": {
|
|
41
51
|
"@types/node": "^22.10.2",
|
|
52
|
+
"fido2-lib": "^3.5.3",
|
|
42
53
|
"jest": "^29.7.0",
|
|
43
54
|
"ts-jest": "^29.2.5",
|
|
44
55
|
"typescript": "^5.7.2"
|
|
@@ -1,5 +1,62 @@
|
|
|
1
|
-
import { mongodb, buildDbIndexes } from '@unchainedshop/mongodb';
|
|
2
|
-
import {
|
|
1
|
+
import { TimestampFields, Address, Contact, mongodb, buildDbIndexes } from '@unchainedshop/mongodb';
|
|
2
|
+
import { DateFilterInput } from '@unchainedshop/utils';
|
|
3
|
+
|
|
4
|
+
export interface UserProfile {
|
|
5
|
+
displayName?: string;
|
|
6
|
+
birthday?: Date;
|
|
7
|
+
phoneMobile?: string;
|
|
8
|
+
gender?: string;
|
|
9
|
+
address?: Address;
|
|
10
|
+
}
|
|
11
|
+
export interface UserLastLogin {
|
|
12
|
+
timestamp?: Date;
|
|
13
|
+
locale?: string;
|
|
14
|
+
countryCode?: string;
|
|
15
|
+
remoteAddress?: string;
|
|
16
|
+
remotePort?: string;
|
|
17
|
+
userAgent?: string;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
export interface PushSubscriptionObject {
|
|
21
|
+
userAgent: string;
|
|
22
|
+
endpoint: string;
|
|
23
|
+
expirationTime?: number;
|
|
24
|
+
keys: {
|
|
25
|
+
auth: string;
|
|
26
|
+
p256dh: string;
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
export interface Email {
|
|
31
|
+
address: string;
|
|
32
|
+
verified: boolean;
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
export type User = {
|
|
36
|
+
_id: string;
|
|
37
|
+
deleted?: Date;
|
|
38
|
+
avatarId?: string;
|
|
39
|
+
emails: Array<Email>;
|
|
40
|
+
guest: boolean;
|
|
41
|
+
initialPassword: boolean;
|
|
42
|
+
lastBillingAddress?: Address;
|
|
43
|
+
lastContact?: Contact;
|
|
44
|
+
lastLogin?: UserLastLogin;
|
|
45
|
+
profile?: UserProfile;
|
|
46
|
+
roles: Array<string>;
|
|
47
|
+
services: any;
|
|
48
|
+
tags?: Array<string>;
|
|
49
|
+
pushSubscriptions: Array<PushSubscriptionObject>;
|
|
50
|
+
username?: string;
|
|
51
|
+
meta?: any;
|
|
52
|
+
} & TimestampFields;
|
|
53
|
+
|
|
54
|
+
export type UserQuery = mongodb.Filter<User> & {
|
|
55
|
+
includeGuests?: boolean;
|
|
56
|
+
queryString?: string;
|
|
57
|
+
emailVerified?: boolean;
|
|
58
|
+
lastLogin?: DateFilterInput;
|
|
59
|
+
};
|
|
3
60
|
|
|
4
61
|
export const UsersCollection = async (db: mongodb.Db) => {
|
|
5
62
|
const Users = db.collection<User>('users');
|
|
@@ -1,6 +1,12 @@
|
|
|
1
|
-
import { WebAuthnCredentialsCreationRequest } from '../types.js';
|
|
2
1
|
import { mongodb, buildDbIndexes } from '@unchainedshop/mongodb';
|
|
3
2
|
|
|
3
|
+
export interface WebAuthnCredentialsCreationRequest {
|
|
4
|
+
challenge: string;
|
|
5
|
+
username: string;
|
|
6
|
+
origin: string;
|
|
7
|
+
factor: 'first' | 'second' | 'either';
|
|
8
|
+
}
|
|
9
|
+
|
|
4
10
|
type Collection = WebAuthnCredentialsCreationRequest & { _id: number };
|
|
5
11
|
|
|
6
12
|
export const WebAuthnCredentialsCreationRequestsCollection = async (db: mongodb.Db) => {
|
|
@@ -1,60 +1,8 @@
|
|
|
1
1
|
import { MigrationRepository } from '@unchainedshop/mongodb';
|
|
2
2
|
import { UsersCollection } from '../db/UsersCollection.js';
|
|
3
|
-
|
|
4
|
-
const convertTagsToLowerCase = async (collection: Awaited<ReturnType<typeof UsersCollection>>) => {
|
|
5
|
-
let bulk = collection.initializeUnorderedBulkOp();
|
|
6
|
-
let count = 0;
|
|
7
|
-
|
|
8
|
-
const cursor = await collection.find({ tags: { $regex: '.*[A-Z]' } });
|
|
9
|
-
// eslint-disable-next-line no-restricted-syntax
|
|
10
|
-
for await (const doc of cursor) {
|
|
11
|
-
const transformedTags = doc.tags.map((tag) => tag.toLowerCase());
|
|
12
|
-
count += 1;
|
|
13
|
-
bulk.find({ _id: doc._id }).updateOne({ $set: { tags: transformedTags } });
|
|
14
|
-
if (count % 500 === 0) {
|
|
15
|
-
bulk.execute();
|
|
16
|
-
bulk = collection.initializeUnorderedBulkOp();
|
|
17
|
-
count = 0;
|
|
18
|
-
}
|
|
19
|
-
}
|
|
20
|
-
if (count > 0) bulk.execute();
|
|
21
|
-
};
|
|
3
|
+
import { systemLocale } from '@unchainedshop/utils';
|
|
22
4
|
|
|
23
5
|
export default function addMigrations(repository: MigrationRepository) {
|
|
24
|
-
repository?.register({
|
|
25
|
-
id: 20220603115000,
|
|
26
|
-
name: 'Copy user.profile.customFields to user.meta',
|
|
27
|
-
up: async () => {
|
|
28
|
-
const Users = await UsersCollection(repository.db);
|
|
29
|
-
const users = await Users.find(
|
|
30
|
-
{ meta: { $exists: false }, 'profile.customFields': { $exists: true } },
|
|
31
|
-
{ projection: { _id: true, profile: true, meta: true } },
|
|
32
|
-
).toArray();
|
|
33
|
-
|
|
34
|
-
await Promise.all(
|
|
35
|
-
users.map(async (user) => {
|
|
36
|
-
await Users.updateOne(
|
|
37
|
-
{
|
|
38
|
-
_id: user._id,
|
|
39
|
-
},
|
|
40
|
-
{
|
|
41
|
-
$set: { meta: (user.profile as any).customFields },
|
|
42
|
-
},
|
|
43
|
-
);
|
|
44
|
-
}),
|
|
45
|
-
);
|
|
46
|
-
},
|
|
47
|
-
});
|
|
48
|
-
|
|
49
|
-
repository?.register({
|
|
50
|
-
id: 20220920122500,
|
|
51
|
-
name: 'Convert user tags to lower case for easy search',
|
|
52
|
-
up: async () => {
|
|
53
|
-
const Users = await UsersCollection(repository.db);
|
|
54
|
-
await convertTagsToLowerCase(Users);
|
|
55
|
-
},
|
|
56
|
-
});
|
|
57
|
-
|
|
58
6
|
repository?.register({
|
|
59
7
|
id: 20230719105000,
|
|
60
8
|
name: 'Rename user.lastLogin.countryContext to user.lastLogin.countryCode',
|
|
@@ -70,4 +18,43 @@ export default function addMigrations(repository: MigrationRepository) {
|
|
|
70
18
|
);
|
|
71
19
|
},
|
|
72
20
|
});
|
|
21
|
+
|
|
22
|
+
repository?.register({
|
|
23
|
+
id: 20241218092300,
|
|
24
|
+
name: 'Convert user.lastLogin.locale',
|
|
25
|
+
up: async () => {
|
|
26
|
+
const Users = await UsersCollection(repository.db);
|
|
27
|
+
|
|
28
|
+
const users = await Users.find(
|
|
29
|
+
{
|
|
30
|
+
'lastLogin.locale': { $exists: true },
|
|
31
|
+
},
|
|
32
|
+
{ projection: { _id: true, lastLogin: true } },
|
|
33
|
+
).toArray();
|
|
34
|
+
|
|
35
|
+
for (const user of users) {
|
|
36
|
+
let newLocale;
|
|
37
|
+
try {
|
|
38
|
+
newLocale = new Intl.Locale(user.lastLogin.locale).baseName;
|
|
39
|
+
} catch {
|
|
40
|
+
/* */
|
|
41
|
+
try {
|
|
42
|
+
newLocale = new Intl.Locale(user.lastLogin.locale.split('_').join('-')).baseName;
|
|
43
|
+
} catch {
|
|
44
|
+
/* */
|
|
45
|
+
newLocale = systemLocale.baseName;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
await Users.updateOne(
|
|
50
|
+
{
|
|
51
|
+
_id: user._id,
|
|
52
|
+
},
|
|
53
|
+
{
|
|
54
|
+
$set: { 'lastLogin.locale': newLocale },
|
|
55
|
+
},
|
|
56
|
+
);
|
|
57
|
+
}
|
|
58
|
+
},
|
|
59
|
+
});
|
|
73
60
|
}
|