@antelopejs/dms 0.4.6 → 0.4.8
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 +40 -0
- package/dist/crons/index.d.ts +1 -0
- package/dist/crons/index.js +7 -1
- package/dist/crons/index.js.map +1 -1
- package/dist/crons/sweep-expired-sessions.d.ts +4 -0
- package/dist/crons/sweep-expired-sessions.js +27 -0
- package/dist/crons/sweep-expired-sessions.js.map +1 -0
- package/dist/db/models/userNotificationPreferences.model.js +17 -11
- package/dist/db/models/userNotificationPreferences.model.js.map +1 -1
- package/dist/db/tables/userNotifications.table.js +3 -0
- package/dist/db/tables/userNotifications.table.js.map +1 -1
- package/dist/pages/settings/users/profile-helpers.d.ts +2 -1
- package/dist/pages/settings/users/profile-helpers.js +9 -0
- package/dist/pages/settings/users/profile-helpers.js.map +1 -1
- package/dist/pages/settings/users/profile.js +2 -2
- package/dist/pages/settings/users/profile.js.map +1 -1
- package/dist/routes/auth/refresh.d.ts +1 -1
- package/dist/routes/auth/refresh.js +2 -1
- package/dist/routes/auth/refresh.js.map +1 -1
- package/dist/routes/auth/switch-tenant.d.ts +1 -1
- package/dist/routes/auth/switch-tenant.js +2 -1
- package/dist/routes/auth/switch-tenant.js.map +1 -1
- package/dist/routes/onboarding.js +1 -1
- package/dist/routes/onboarding.js.map +1 -1
- package/dist/test/antelope.test.js +1 -1
- package/dist/test/helpers/db.d.ts +1 -0
- package/dist/test/helpers/db.js +14 -0
- package/dist/test/helpers/db.js.map +1 -1
- package/dist/test/unit/db/email-normalization.test.d.ts +1 -0
- package/dist/test/unit/db/email-normalization.test.js +59 -0
- package/dist/test/unit/db/email-normalization.test.js.map +1 -0
- package/dist/test/unit/db/notification-feed-index.test.d.ts +1 -0
- package/dist/test/unit/db/notification-feed-index.test.js +35 -0
- package/dist/test/unit/db/notification-feed-index.test.js.map +1 -0
- package/dist/test/unit/db/notification-preferences.test.d.ts +1 -0
- package/dist/test/unit/db/notification-preferences.test.js +21 -0
- package/dist/test/unit/db/notification-preferences.test.js.map +1 -0
- package/dist/test/unit/db/session-refresh-token.test.d.ts +1 -0
- package/dist/test/unit/db/session-refresh-token.test.js +52 -0
- package/dist/test/unit/db/session-refresh-token.test.js.map +1 -0
- package/dist/test/unit/db/session-sweep.test.d.ts +1 -0
- package/dist/test/unit/db/session-sweep.test.js +44 -0
- package/dist/test/unit/db/session-sweep.test.js.map +1 -0
- package/dist/test/unit/interfaces/dms/password-policy.test.d.ts +1 -0
- package/dist/test/unit/interfaces/dms/password-policy.test.js +43 -0
- package/dist/test/unit/interfaces/dms/password-policy.test.js.map +1 -0
- package/dist/test/unit/interfaces/dms-auth/refresh-token-rotation.test.js +74 -9
- package/dist/test/unit/interfaces/dms-auth/refresh-token-rotation.test.js.map +1 -1
- package/dist/test/unit/pages/settings/profile-email-change.test.d.ts +1 -0
- package/dist/test/unit/pages/settings/profile-email-change.test.js +50 -0
- package/dist/test/unit/pages/settings/profile-email-change.test.js.map +1 -0
- package/dist/validation/password.d.ts +0 -1
- package/dist/validation/password.js +6 -3
- package/dist/validation/password.js.map +1 -1
- package/frontend-vue/layers/dms-core/i18n/locales/core-en-GB.json +4 -0
- package/frontend-vue/layers/dms-core/i18n/locales/core-fr-FR.json +4 -0
- package/frontend-vue/layers/dms-ui/app/components/table-view/TableView.vue +2 -1
- package/frontend-vue/layers/dms-ui/app/components/tree/Tree.vue +10 -9
- package/frontend-vue/layers/dms-ui/app/composables/table-view/shortcuts/index.ts +17 -4
- package/frontend-vue/layers/dms-ui/app/composables/table-view/shortcuts/tableViewEscape.ts +22 -0
- package/frontend-vue/layers/dms-ui/app/composables/tree/shortcuts/index.ts +19 -4
- package/frontend-vue/layers/dms-ui/app/composables/tree/shortcuts/treeEscape.ts +21 -0
- package/frontend-vue/layers/dms-ui/app/utils/overlayFocus.ts +16 -0
- package/frontend-vue/layers/dms-ui/i18n/locales/ui-en-GB.json +4 -2
- package/frontend-vue/layers/dms-ui/i18n/locales/ui-fr-FR.json +4 -2
- package/frontend-vue/package.json +1 -1
- package/frontend-vue/pnpm-lock.yaml +5 -5
- package/frontend-vue/tests/table-view-escape-shortcut.test.ts +141 -0
- package/frontend-vue/tests/tree-escape-shortcut.test.ts +138 -0
- package/package.json +4 -4
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,45 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## v0.4.8
|
|
4
|
+
|
|
5
|
+
[compare changes](https://github.com/AntelopeJS/dms/compare/v0.4.7...v0.4.8)
|
|
6
|
+
|
|
7
|
+
### 🔥 Performance
|
|
8
|
+
|
|
9
|
+
- **db:** Mark cross-instance indexes and upgrade the MongoDB driver ([#85](https://github.com/AntelopeJS/dms/pull/85))
|
|
10
|
+
|
|
11
|
+
### 🩹 Fixes
|
|
12
|
+
|
|
13
|
+
- **db:** Normalize emails, guard email changes and stop storing refresh tokens in plaintext ([#78](https://github.com/AntelopeJS/dms/pull/78))
|
|
14
|
+
|
|
15
|
+
### 🏡 Chore
|
|
16
|
+
|
|
17
|
+
- **release:** @antelopejs/interface-dms v0.2.7 ([5807a35](https://github.com/AntelopeJS/dms/commit/5807a35))
|
|
18
|
+
|
|
19
|
+
### ❤️ Contributors
|
|
20
|
+
|
|
21
|
+
- Antony Rizzitelli <rizzitelli.antony@pm.me>
|
|
22
|
+
|
|
23
|
+
## v0.4.7
|
|
24
|
+
|
|
25
|
+
[compare changes](https://github.com/AntelopeJS/dms/compare/v0.4.6...v0.4.7)
|
|
26
|
+
|
|
27
|
+
### 🚀 Enhancements
|
|
28
|
+
|
|
29
|
+
- **interface-dms:** Export the password policy for modules ([#70](https://github.com/AntelopeJS/dms/pull/70))
|
|
30
|
+
|
|
31
|
+
### 🩹 Fixes
|
|
32
|
+
|
|
33
|
+
- **dms-ui:** Let Escape close modals opened over a table or a tree ([#71](https://github.com/AntelopeJS/dms/pull/71))
|
|
34
|
+
|
|
35
|
+
### 🏡 Chore
|
|
36
|
+
|
|
37
|
+
- **release:** @antelopejs/interface-dms v0.2.6 ([67d4e23](https://github.com/AntelopeJS/dms/commit/67d4e23))
|
|
38
|
+
|
|
39
|
+
### ❤️ Contributors
|
|
40
|
+
|
|
41
|
+
- Antony Rizzitelli <rizzitelli.antony@pm.me>
|
|
42
|
+
|
|
3
43
|
## v0.4.6
|
|
4
44
|
|
|
5
45
|
[compare changes](https://github.com/AntelopeJS/dms/compare/v0.4.5...v0.4.6)
|
package/dist/crons/index.d.ts
CHANGED
package/dist/crons/index.js
CHANGED
|
@@ -16,10 +16,16 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
exports.registerDmsCrons = registerDmsCrons;
|
|
18
18
|
const cleanup_user_invites_1 = require("./cleanup-user-invites");
|
|
19
|
+
const sweep_expired_sessions_1 = require("./sweep-expired-sessions");
|
|
19
20
|
const sweep_stale_exports_1 = require("./sweep-stale-exports");
|
|
20
21
|
__exportStar(require("./cleanup-user-invites"), exports);
|
|
22
|
+
__exportStar(require("./sweep-expired-sessions"), exports);
|
|
21
23
|
__exportStar(require("./sweep-stale-exports"), exports);
|
|
22
24
|
function registerDmsCrons() {
|
|
23
|
-
return [
|
|
25
|
+
return [
|
|
26
|
+
(0, cleanup_user_invites_1.scheduleCleanupUserInvites)(),
|
|
27
|
+
(0, sweep_stale_exports_1.scheduleSweepStaleExports)(),
|
|
28
|
+
(0, sweep_expired_sessions_1.scheduleSweepExpiredSessions)(),
|
|
29
|
+
];
|
|
24
30
|
}
|
|
25
31
|
//# sourceMappingURL=index.js.map
|
package/dist/crons/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/crons/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/crons/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AASA,4CAMC;AAdD,iEAAoE;AACpE,qEAAwE;AACxE,+DAAkE;AAElE,yDAAuC;AACvC,2DAAyC;AACzC,wDAAsC;AAEtC,SAAgB,gBAAgB;IAC9B,OAAO;QACL,IAAA,iDAA0B,GAAE;QAC5B,IAAA,+CAAyB,GAAE;QAC3B,IAAA,qDAA4B,GAAE;KAC/B,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { type ScheduledTask } from "node-cron";
|
|
2
|
+
export declare const SWEEP_EXPIRED_SESSIONS_CRON_NAME = "sweep-expired-sessions";
|
|
3
|
+
export declare function runSweepExpiredSessions(now?: Date): Promise<void>;
|
|
4
|
+
export declare function scheduleSweepExpiredSessions(): ScheduledTask;
|
|
@@ -0,0 +1,27 @@
|
|
|
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
|
+
exports.SWEEP_EXPIRED_SESSIONS_CRON_NAME = void 0;
|
|
7
|
+
exports.runSweepExpiredSessions = runSweepExpiredSessions;
|
|
8
|
+
exports.scheduleSweepExpiredSessions = scheduleSweepExpiredSessions;
|
|
9
|
+
const logging_1 = require("@antelopejs/interface-core/logging");
|
|
10
|
+
const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
|
|
11
|
+
const db_1 = require("@antelopejs/interface-dms/auth/db");
|
|
12
|
+
const node_cron_1 = __importDefault(require("node-cron"));
|
|
13
|
+
const config_1 = require("../config");
|
|
14
|
+
exports.SWEEP_EXPIRED_SESSIONS_CRON_NAME = "sweep-expired-sessions";
|
|
15
|
+
const SWEEP_EXPIRED_SESSIONS_SCHEDULE = "30 3 * * *";
|
|
16
|
+
async function runSweepExpiredSessions(now = new Date()) {
|
|
17
|
+
const threshold = new Date(now.getTime() - (0, config_1.getAuthConfig)().refreshTokenLifetime);
|
|
18
|
+
await (0, interface_database_decorators_1.GetModel)(db_1.SessionModel).deleteInactiveSince(threshold);
|
|
19
|
+
}
|
|
20
|
+
function scheduleSweepExpiredSessions() {
|
|
21
|
+
return node_cron_1.default.schedule(SWEEP_EXPIRED_SESSIONS_SCHEDULE, () => {
|
|
22
|
+
void runSweepExpiredSessions().catch((error) => {
|
|
23
|
+
logging_1.Logging.Error(`Cron '${exports.SWEEP_EXPIRED_SESSIONS_CRON_NAME}' failed:`, error);
|
|
24
|
+
});
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
//# sourceMappingURL=sweep-expired-sessions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sweep-expired-sessions.js","sourceRoot":"","sources":["../../src/crons/sweep-expired-sessions.ts"],"names":[],"mappings":";;;;;;AAWA,0DAKC;AAED,oEASC;AA3BD,gEAA6D;AAC7D,6FAAqE;AACrE,0DAAiE;AACjE,0DAAqD;AACrD,sCAA0C;AAE7B,QAAA,gCAAgC,GAAG,wBAAwB,CAAC;AAEzE,MAAM,+BAA+B,GAAG,YAAY,CAAC;AAG9C,KAAK,UAAU,uBAAuB,CAAC,GAAG,GAAG,IAAI,IAAI,EAAE;IAC5D,MAAM,SAAS,GAAG,IAAI,IAAI,CACxB,GAAG,CAAC,OAAO,EAAE,GAAG,IAAA,sBAAa,GAAE,CAAC,oBAAoB,CACrD,CAAC;IACF,MAAM,IAAA,wCAAQ,EAAC,iBAAY,CAAC,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;AAC9D,CAAC;AAED,SAAgB,4BAA4B;IAC1C,OAAO,mBAAI,CAAC,QAAQ,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACzD,KAAK,uBAAuB,EAAE,CAAC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;YACtD,iBAAO,CAAC,KAAK,CACX,SAAS,wCAAgC,WAAW,EACpD,KAAK,CACN,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -26,18 +26,24 @@ class UserNotificationPreferencesModel extends (0, interface_database_decorators
|
|
|
26
26
|
return UserNotificationPreferencesModel.fromDatabase(result);
|
|
27
27
|
}
|
|
28
28
|
async createDefault(userId) {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
.
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
29
|
+
let insertError;
|
|
30
|
+
try {
|
|
31
|
+
await this.table
|
|
32
|
+
.insert({
|
|
33
|
+
_id: userId,
|
|
34
|
+
userId,
|
|
35
|
+
preferences: buildDefaultPreferences(),
|
|
36
|
+
createdAt: new Date(),
|
|
37
|
+
updatedAt: new Date(),
|
|
38
|
+
})
|
|
39
|
+
.run();
|
|
40
|
+
}
|
|
41
|
+
catch (error) {
|
|
42
|
+
insertError = error;
|
|
43
|
+
}
|
|
44
|
+
const created = await this.get(userId);
|
|
39
45
|
if (!created) {
|
|
40
|
-
throw new Error("Failed to create notification preferences");
|
|
46
|
+
throw (insertError ?? new Error("Failed to create notification preferences"));
|
|
41
47
|
}
|
|
42
48
|
return created;
|
|
43
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userNotificationPreferences.model.js","sourceRoot":"","sources":["../../../src/db/models/userNotificationPreferences.model.ts"],"names":[],"mappings":";;;AAAA,6FAA2E;AAC3E,+EAAyF;AACzF,sCAGmB;AAEnB,MAAM,uBAAuB,GAAG,GAA4B,EAAE;IAC5D,MAAM,QAAQ,GAAG,IAAA,gCAAqB,GAAE,CAAC;IACzC,MAAM,WAAW,GAA4B,EAAE,CAAC;IAEhD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,EAAE,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;QACnD,WAAW,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;IAC1B,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAEF,MAAa,gCAAiC,SAAQ,IAAA,8CAAc,EAClE,oCAA2B,EAC3B,6CAAoC,CACrC;IACC,KAAK,CAAC,WAAW,CACf,MAAc;QAEd,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK;aAC5B,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC;aACxB,GAAG,CAAC,CAAC,CAAC;aACN,OAAO,CAAC,SAAS,CAAC;aAClB,GAAG,EAAE,CAAC;QAET,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,OAAO,gCAAgC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAC/D,CAAC;
|
|
1
|
+
{"version":3,"file":"userNotificationPreferences.model.js","sourceRoot":"","sources":["../../../src/db/models/userNotificationPreferences.model.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ const interface_database_decorators_1 = require("@antelopejs/interface-database-
|
|
|
14
14
|
const constants_1 = require("@antelopejs/interface-dms/constants");
|
|
15
15
|
const users_table_1 = require("@antelopejs/interface-dms/auth/db/tables/users.table");
|
|
16
16
|
exports.userNotificationsTableName = "user_notifications";
|
|
17
|
+
const USER_FEED_INDEX = "userId_createdAt";
|
|
17
18
|
let UserNotification = class UserNotification extends interface_database_decorators_1.Table {
|
|
18
19
|
};
|
|
19
20
|
exports.UserNotification = UserNotification;
|
|
@@ -23,6 +24,7 @@ __decorate([
|
|
|
23
24
|
], UserNotification.prototype, "_id", void 0);
|
|
24
25
|
__decorate([
|
|
25
26
|
(0, interface_database_decorators_1.Index)(),
|
|
27
|
+
(0, interface_database_decorators_1.Index)({ group: USER_FEED_INDEX }),
|
|
26
28
|
(0, interface_database_decorators_1.Field)("string"),
|
|
27
29
|
(0, interface_database_decorators_1.Relation)({ to: () => users_table_1.User }),
|
|
28
30
|
__metadata("design:type", String)
|
|
@@ -78,6 +80,7 @@ __decorate([
|
|
|
78
80
|
__decorate([
|
|
79
81
|
(0, interface_database_decorators_1.CreationTime)(),
|
|
80
82
|
(0, interface_database_decorators_1.Index)(),
|
|
83
|
+
(0, interface_database_decorators_1.Index)({ group: USER_FEED_INDEX }),
|
|
81
84
|
(0, interface_database_decorators_1.Field)("date"),
|
|
82
85
|
__metadata("design:type", Date)
|
|
83
86
|
], UserNotification.prototype, "createdAt", void 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userNotifications.table.js","sourceRoot":"","sources":["../../../src/db/tables/userNotifications.table.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6FAQmD;AACnD,mEAAuE;AACvE,sFAA4E;AAE/D,QAAA,0BAA0B,GAAG,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"userNotifications.table.js","sourceRoot":"","sources":["../../../src/db/tables/userNotifications.table.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6FAQmD;AACnD,mEAAuE;AACvE,sFAA4E;AAE/D,QAAA,0BAA0B,GAAG,oBAAoB,CAAC;AAG/D,MAAM,eAAe,GAAG,kBAAkB,CAAC;AAGpC,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,qCAAK;CAyD1C,CAAA;AAzDY,4CAAgB;AAEnB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;6CACI;AAMZ;IAJP,IAAA,qCAAK,GAAE;IACP,IAAA,qCAAK,EAAC,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC;IACjC,IAAA,qCAAK,EAAC,QAAQ,CAAC;IACf,IAAA,wCAAQ,EAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,kBAAI,EAAE,CAAC;;gDACN;AAGf;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;8CACK;AAGb;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;+CACM;AAGd;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;qDACY;AAGpB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;gDACc;AAGtB;IADP,IAAA,qCAAK,EAAC,KAAK,CAAC;;gDAC0C;AAI/C;IAFP,IAAA,qCAAK,GAAE;IACP,IAAA,qCAAK,EAAC,SAAS,CAAC;;gDACO;AAGhB;IADP,IAAA,qCAAK,EAAC,SAAS,CAAC;;qDACa;AAGtB;IADP,IAAA,qCAAK,EAAC,SAAS,CAAC;;sDACc;AAIvB;IAFP,IAAA,qCAAK,GAAE;IACP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;oDACW;AAInB;IAFP,IAAA,qCAAK,GAAE;IACP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;mDACU;AAIlB;IAFP,IAAA,qCAAK,GAAE;IACP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;iDACe;AAMvB;IAJP,IAAA,4CAAY,GAAE;IACd,IAAA,qCAAK,GAAE;IACP,IAAA,qCAAK,EAAC,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC;IACjC,IAAA,qCAAK,EAAC,MAAM,CAAC;8BACK,IAAI;mDAAC;AAKhB;IAHP,IAAA,0CAAU,GAAE;IACZ,IAAA,qCAAK,GAAE;IACP,IAAA,qCAAK,EAAC,MAAM,CAAC;8BACK,IAAI;mDAAC;2BAxDb,gBAAgB;IAD5B,IAAA,6CAAa,EAAC,kCAA0B,EAAE,4BAAgB,CAAC;GAC/C,gBAAgB,CAyD5B"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { AttachmentField } from "@antelopejs/interface-dms/attachments";
|
|
2
|
-
import { type User } from "@antelopejs/interface-dms/auth/db";
|
|
2
|
+
import { type User, type UserModel } from "@antelopejs/interface-dms/auth/db";
|
|
3
3
|
import { DefaultDataTypes } from "@antelopejs/interface-dms/base/data-types/default-types";
|
|
4
4
|
export declare const DMS_ISSUER = "AntelopeJS DMS";
|
|
5
5
|
export declare const AVATAR_DIMENSION_PX = 100;
|
|
@@ -20,6 +20,7 @@ export interface UpdateProfileInput {
|
|
|
20
20
|
avatar?: AvatarValue;
|
|
21
21
|
}
|
|
22
22
|
export declare const HTTP_BAD_REQUEST = 400;
|
|
23
|
+
export declare function assertEmailAvailable(userModel: UserModel, email: string, userId: string): Promise<string>;
|
|
23
24
|
export declare function assertAvatarKeyAllowed(key: string, currentKey: string | undefined): void;
|
|
24
25
|
export declare function normalizeResubmittedAvatar(body: unknown, currentKey: string | undefined): unknown;
|
|
25
26
|
export declare function generateTotpSecret(): Promise<string>;
|
|
@@ -7,6 +7,7 @@ exports.HTTP_BAD_REQUEST = exports.avatarAttachmentFields = exports.AVATAR_ATTAC
|
|
|
7
7
|
exports.promoteAvatar = promoteAvatar;
|
|
8
8
|
exports.rollbackPromotedAvatar = rollbackPromotedAvatar;
|
|
9
9
|
exports.deleteReplacedAvatar = deleteReplacedAvatar;
|
|
10
|
+
exports.assertEmailAvailable = assertEmailAvailable;
|
|
10
11
|
exports.assertAvatarKeyAllowed = assertAvatarKeyAllowed;
|
|
11
12
|
exports.normalizeResubmittedAvatar = normalizeResubmittedAvatar;
|
|
12
13
|
exports.generateTotpSecret = generateTotpSecret;
|
|
@@ -17,6 +18,7 @@ exports.formatSession = formatSession;
|
|
|
17
18
|
const node_crypto_1 = __importDefault(require("node:crypto"));
|
|
18
19
|
const interface_api_util_1 = require("@antelopejs/interface-api-util");
|
|
19
20
|
const interface_file_storage_1 = require("@antelopejs/interface-file-storage");
|
|
21
|
+
const db_1 = require("@antelopejs/interface-dms/auth/db");
|
|
20
22
|
const _2fa_1 = require("2fa");
|
|
21
23
|
const jsonwebtoken_1 = require("jsonwebtoken");
|
|
22
24
|
const randomstring_1 = __importDefault(require("randomstring"));
|
|
@@ -62,6 +64,13 @@ function deleteReplacedAvatar(previousKey, nextKey) {
|
|
|
62
64
|
void (0, interface_file_storage_1.DeleteFile)(previousKey).catch(() => undefined);
|
|
63
65
|
}
|
|
64
66
|
exports.HTTP_BAD_REQUEST = 400;
|
|
67
|
+
const HTTP_CONFLICT = 409;
|
|
68
|
+
async function assertEmailAvailable(userModel, email, userId) {
|
|
69
|
+
const normalized = (0, db_1.normalizeEmail)(email);
|
|
70
|
+
const owner = await userModel.getByEmail(normalized);
|
|
71
|
+
(0, interface_api_util_1.assert)(!owner || owner._id === userId, HTTP_CONFLICT, "error.email_already_used");
|
|
72
|
+
return normalized;
|
|
73
|
+
}
|
|
65
74
|
function assertAvatarKeyAllowed(key, currentKey) {
|
|
66
75
|
(0, interface_api_util_1.assert)(key === currentKey || (0, interface_file_storage_1.isStagedKey)(key), exports.HTTP_BAD_REQUEST, "error.invalid_avatar");
|
|
67
76
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile-helpers.js","sourceRoot":"","sources":["../../../../src/pages/settings/users/profile-helpers.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"profile-helpers.js","sourceRoot":"","sources":["../../../../src/pages/settings/users/profile-helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -182,9 +182,9 @@ let ProfileSettingsController = class ProfileSettingsController extends (0, page
|
|
|
182
182
|
throw new interface_api_1.HTTPResult(profile_helpers_1.HTTP_BAD_REQUEST, issue ? (field ? `${field}: ${issue.message}` : issue.message) : "");
|
|
183
183
|
}
|
|
184
184
|
const { name, email, password, language, avatar } = parsed.data;
|
|
185
|
-
const
|
|
185
|
+
const availableEmail = await (0, profile_helpers_1.assertEmailAvailable)(userModel, email, this.user._id);
|
|
186
186
|
this.user.name = name;
|
|
187
|
-
this.user.email =
|
|
187
|
+
this.user.email = availableEmail;
|
|
188
188
|
if (password) {
|
|
189
189
|
this.user.password = password;
|
|
190
190
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile.js","sourceRoot":"","sources":["../../../../src/pages/settings/users/profile.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"profile.js","sourceRoot":"","sources":["../../../../src/pages/settings/users/profile.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DASmC;AACnC,uEAA0E;AAC1E,6FAAkE;AAClE,uEAA2E;AAC3E,6DAA0E;AAC1E,yDAIwC;AACxC,yDAA4E;AAC5E,0DAI2C;AAC3C,yDAIwC;AACxC,kEAAwE;AACxE,2FAA2F;AAC3F,gEAAkE;AAClE,8BAA8C;AAC9C,gEAAwC;AACxC,uCAAyB;AACzB,8DAA0E;AAC1E,gFAM8C;AAC9C,sDAA0D;AAC1D,iEAA6D;AAC7D,yCAA0C;AAC1C,uDAiB2B;AAGpB,IAAM,yBAAyB,GAA/B,MAAM,yBAA0B,SAAQ,IAAA,qBAAc,EAC3D,SAAS,EACT;IACE,WAAW,EAAE,eAAe;IAC5B,QAAQ,EAAE,uBAAY;IACtB,IAAI,EAAE,kBAAkB;IACxB,KAAK,EAAE,CAAC;IACR,WAAW,EAAE,oCAAoC;CAClD,EACD,IAAA,qBAAc,GAAE,CACjB;;IACC,MAAM,CAAC,gBAAgB,GAAG,IAAA,WAAI,EAAC;QAC7B,KAAK,EAAE,8BAA8B;QACrC,WAAW,EAAE,oCAAoC;QACjD,MAAM,EAAE;YACN;gBACE,EAAE,EAAE,QAAQ;gBACZ,KAAK,EAAE,+BAA+B;gBACtC,WAAW,EAAE,2CAA2C;gBACxD,IAAI,EAAE,IAAI,gCAAgB,CAAC,SAAS,CAAC;oBACnC,IAAI,EAAE,qCAAmB;oBACzB,eAAe,EAAE,yCAAuB;oBACxC,WAAW,EAAE;wBACX,gBAAgB,EAAE,kCAAgB;wBAClC,OAAO,EAAE,yCAAuB;qBACjC;oBACD,MAAM,EAAE;wBACN,QAAQ,EAAE,qCAAmB;wBAC7B,SAAS,EAAE,qCAAmB;wBAC9B,GAAG,EAAE,OAAO;qBACb;iBACF,CAAC;aACH;YACD;gBACE,EAAE,EAAE,MAAM;gBACV,KAAK,EAAE,6BAA6B;gBACpC,IAAI,EAAE,IAAI,gCAAgB,CAAC,UAAU,EAAE;gBACvC,QAAQ,EAAE,IAAI;aACf;YACD;gBACE,EAAE,EAAE,OAAO;gBACX,KAAK,EAAE,8BAA8B;gBACrC,IAAI,EAAE,IAAI,gCAAgB,CAAC,SAAS,EAAE;gBACtC,QAAQ,EAAE,IAAI;aACf;YACD;gBACE,EAAE,EAAE,UAAU;gBACd,KAAK,EAAE,iCAAiC;gBACxC,IAAI,EAAE,IAAI,gCAAgB,CAAC,YAAY,CAAC;oBACtC,WAAW,EAAE,6CAA6C;oBAC1D,eAAe,EAAE,IAAI;oBACrB,kBAAkB,EAChB,qDAAqD;oBACvD,SAAS,EAAE,CAAC;iBACb,CAAC;aACH;SACF;QACD,QAAQ,EAAE,wBAAwB;QAClC,SAAS,EAAE,wBAAwB;QACnC,eAAe,EAAE,kBAAU,CAAC,IAAI;KACjC,CAAC,CAAC;IAEH,MAAM,CAAC,mBAAmB,GAAG,IAAA,iBAAU,EACrC,2BAAyB,CAAC,gBAAgB,CAC3C,CAAC,MAAM,CAAC;QACP,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;KAChC,CAAC,CAAC;IAEH,MAAM,CAAC,iBAAiB,GAAG,IAAA,wBAAe,EAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC;QACpE,IAAI,EAAE,uCAAuC;QAC7C,IAAI,EAAE,gBAAgB;KACvB,CAAC,CAAC;IAEH,MAAM,CAAC,kBAAkB,GAAG,IAAA,wBAAe,EAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC;QACtE,IAAI,EAAE,iCAAiC;QACvC,IAAI,EAAE,mBAAmB;KAC1B,CAAC,CAAC;IAEH,MAAM,CAAC,iBAAiB,GAAG,IAAA,wBAAe,EAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC;QACpE,IAAI,EAAE,+BAA+B;QACrC,IAAI,EAAE,cAAc;KACrB,CAAC,CAAC;IAMH,UAAU;QACR,OAAO,IAAA,mBAAY,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAGK,AAAN,KAAK,CAAC,aAAa,CACN,OAAuB,EACtB,IAAa,EACP,SAAoB;QAEtC,IAAA,2BAAM,EACJ,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EACxD,kCAAgB,EAChB,iBAAiB,CAClB,CAAC;QACF,MAAM,SAAS,GAAG,IAA+B,CAAC;QAClD,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;QACtC,MAAM,aAAa,GAAG,MAAM,IAAA,gCAAkB,EAC5C;YACE,OAAO;YACP,MAAM,EAAE,wCAAsB;YAC9B,YAAY,EAAE,IAAA,gCAAyB,EACrC,2BAAyB,CAAC,gBAAgB,CAC3C;YACD,SAAS,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,SAAS,EAAE;YACrD,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,MAAM,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE;SACjE,EACD,KAAK,EAAE,QAAQ,EAAE,EAAE;YACjB,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YAC7C,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAChD,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;YAC5D,OAAO;gBACL,EAAE,EAAE,IAAI,CAAC,GAAG;gBACZ,QAAQ,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE;gBACjC,MAAM,EAAE,IAAI;aACb,CAAC;QACJ,CAAC,CACF,CAAC;QACF,IAAI,aAAa,CAAC,KAAK,KAAK,aAAa,EAAE,CAAC;YAC1C,KAAK,IAAA,0CAAkB,EAAC,aAAa,CAAC,GAAG,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;QAClE,CAAC;QACD,IAAI,SAAS,CAAC,QAAQ;YAAE,KAAK,IAAA,6CAAqB,EAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QACtE,OAAO,IAAA,mBAAY,EAAC,aAAa,CAAC,CAAC;IACrC,CAAC;IAEO,KAAK,CAAC,YAAY,CACxB,IAAa,EACb,SAAoB;QAEpB,MAAM,MAAM,GACV,MAAM,2BAAyB,CAAC,mBAAmB,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC3E,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAKpB,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;YACpC,MAAM,KAAK,GAAG,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACpC,MAAM,IAAI,0BAAU,CAClB,kCAAgB,EAChB,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CACpE,CAAC;QACJ,CAAC;QACD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,GAC/C,MAAM,CAAC,IAA0B,CAAC;QAEpC,MAAM,cAAc,GAAG,MAAM,IAAA,sCAAoB,EAC/C,SAAS,EACT,KAAK,EACL,IAAI,CAAC,IAAI,CAAC,GAAG,CACd,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,cAAc,CAAC;QAEjC,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAChC,CAAC;QAED,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAChC,CAAC;QAED,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAC5B,CAAC;QAED,MAAM,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IAGD,kBAAkB;QAChB,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,gBAAgB,IAAI,EAAE;YACzC,cAAc,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC;SAClE,CAAC;IACJ,CAAC;IAGK,AAAN,KAAK,CAAC,UAAU,CAAmB,SAAoB;QACrD,MAAM,MAAM,GAAG,MAAM,IAAA,oCAAkB,GAAE,CAAC;QAC1C,MAAM,UAAU,GAAG,IAAA,kBAAW,EAAC,4BAAU,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAEpE,IAAI,CAAC,IAAI,CAAC,sBAAsB,GAAG,MAAM,CAAC;QAC1C,MAAM,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAElC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;IAChC,CAAC;IAGK,AAAN,KAAK,CAAC,WAAW,CACH,IAAa,EACP,SAAoB;QAEtC,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,qCAAgB,EAAC,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE,CAChD,wBAAU,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CACpC,CAAC;QAEF,IAAA,2BAAM,EAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,GAAG,EAAE,sBAAsB,CAAC,CAAC;QACtE,IAAA,2BAAM,EACJ,IAAA,iBAAU,EAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,IAAI,CAAC,EAClD,GAAG,EACH,wBAAwB,CACzB,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC;QAC7D,IAAI,CAAC,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC;QAExC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,IAAI,EAAE,CAAC;QACjD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9B,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvB,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC;QAErC,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC;QAC3C,IAAI,WAAiC,CAAC;QAEtC,IAAI,aAAa,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzE,MAAM,KAAK,GAAG,IAAA,qCAAmB,GAAE,CAAC;YACpC,IAAI,CAAC,IAAI,CAAC,oBAAoB,GAAG,KAAK,CAAC,MAAM,CAAC;YAC9C,WAAW,GAAG,KAAK,CAAC,SAAS,CAAC;QAChC,CAAC;QAED,MAAM,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAElC,KAAK,IAAA,8CAAsB,EAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAEnD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;IACxC,CAAC;IAGK,AAAN,KAAK,CAAC,WAAW,CAAmB,SAAoB;QACtD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,IAAI,EAAE,CAAC;QACjD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAC/B,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxB,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC;QAErC,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC;QAC3C,IAAI,WAAiC,CAAC;QAEtC,IAAI,aAAa,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzE,MAAM,KAAK,GAAG,IAAA,qCAAmB,GAAE,CAAC;YACpC,IAAI,CAAC,IAAI,CAAC,oBAAoB,GAAG,KAAK,CAAC,MAAM,CAAC;YAC9C,WAAW,GAAG,KAAK,CAAC,SAAS,CAAC;QAChC,CAAC;QAED,MAAM,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAElC,KAAK,IAAA,8CAAsB,EAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAEpD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;IACxC,CAAC;IAGK,AAAN,KAAK,CAAC,gBAAgB,CACR,IAAa,EACP,SAAoB;QAEtC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,qCAAgB,EAAC,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE,CACxD,wBAAU,CAAC,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,CACzC,CAAC;QAEF,MAAM,YAAY,GAAG,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;QAC1D,IAAA,2BAAM,EACJ,IAAA,gCAAc,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,YAAgC,CAAC,EACjE,GAAG,EACH,wBAAwB,CACzB,CAAC;QAEF,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC,MAAM,CACvD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,CACpB,CAAC;QACF,IAAI,CAAC,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC;QAErC,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;YACtB,IAAI,CAAC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QACnC,CAAC;QAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,oBAAoB,GAAG,EAAE,CAAC;YACpC,IAAI,CAAC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;YACpC,IAAI,CAAC,IAAI,CAAC,6BAA6B,GAAG,IAAI,CAAC;QACjD,CAAC;QAED,MAAM,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAElC,KAAK,IAAA,+CAAuB,EAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAEpD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAGK,AAAN,KAAK,CAAC,qBAAqB,CACb,IAAa,EACP,SAAoB;QAEtC,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,qCAAgB,EAAC,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE,CAChD,wBAAU,CAAC,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,CACzC,CAAC;QAEF,IAAA,2BAAM,EACJ,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,EAC7C,GAAG,EACH,uBAAuB,CACxB,CAAC;QAEF,MAAM,WAAW,GACf,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC;YAC3C,IAAA,gCAAc,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAC1C,MAAM,YAAY,GAChB,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC;YAC5C,IAAA,gCAAc,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3C,IAAA,2BAAM,EAAC,WAAW,IAAI,YAAY,EAAE,GAAG,EAAE,wBAAwB,CAAC,CAAC;QAEnE,MAAM,KAAK,GAAG,IAAA,qCAAmB,GAAE,CAAC;QACpC,IAAI,CAAC,IAAI,CAAC,oBAAoB,GAAG,KAAK,CAAC,MAAM,CAAC;QAC9C,MAAM,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAElC,KAAK,IAAA,oDAA4B,EAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEjD,OAAO,EAAE,WAAW,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC;IAC1C,CAAC;IAGK,AAAN,KAAK,CAAC,yBAAyB,CAAmB,SAAoB;QACpE,IAAA,2BAAM,EACJ,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC,OAAO,CAAC,EAC7C,GAAG,EACH,6BAA6B,CAC9B,CAAC;QAEF,MAAM,aAAa,GACjB,IAAI,CAAC,IAAI,CAAC,6BAA6B;YACvC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC,OAAO,EAAE;gBACtE,oCAAwB,CAAC;QAC7B,IAAA,2BAAM,EAAC,CAAC,aAAa,EAAE,GAAG,EAAE,oBAAoB,CAAC,CAAC;QAElD,MAAM,IAAI,GAAG,sBAAY,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC;QACtE,IAAI,CAAC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;QACpC,IAAI,CAAC,IAAI,CAAC,6BAA6B,GAAG,IAAI,IAAI,EAAE,CAAC;QACrD,MAAM,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAElC,MAAM,IAAA,mBAAY,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAEpC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAGK,AAAN,KAAK,CAAC,WAAW,CACM,YAA0B,EACT,aAAqB;QAE3D,MAAM,gBAAgB,GAAG,IAAA,kCAAgB,EAAC,aAAa,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE/D,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAA,+BAAa,EAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAC7E,CAAC;IAGK,AAAN,KAAK,CAAC,aAAa,CACS,EAAU,EACf,YAA0B;QAE/C,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC3C,IAAA,2BAAM,EAAC,OAAO,EAAE,GAAG,EAAE,yBAAyB,CAAC,CAAC;QAChD,IAAA,2BAAM,EAAC,OAAO,CAAC,MAAM,KAAK,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,oBAAoB,CAAC,CAAC;QAE5E,MAAM,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC9B,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAGK,AAAN,KAAK,CAAC,iBAAiB,CACA,YAA0B,EAC7B,SAAoB;QAEtC,MAAM,YAAY,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEjD,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,IAAA,0BAAe,GAAE,CAAC;QACtC,MAAM,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAElC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;;AAtYU,8DAAyB;AAoF5B;IADP,IAAA,+BAAsB,EAAC,yBAAyB,CAAC,gBAAgB,CAAC;;uDAChD;AAGnB;IADC,IAAA,mBAAG,EAAC,GAAG,CAAC;;;;2DAGR;AAGK;IADL,IAAA,oBAAI,EAAC,GAAG,CAAC;IAEP,WAAA,IAAA,uBAAO,GAAE,CAAA;IACT,WAAA,IAAA,wBAAQ,GAAE,CAAA;IACV,WAAA,IAAA,qCAAK,EAAC,cAAS,CAAC,CAAA;;qDAAY,cAAS;;8DAmCvC;AAgDD;IADC,IAAA,mBAAG,EAAC,aAAa,CAAC;;;;mEAMlB;AAGK;IADL,IAAA,oBAAI,EAAC,yBAAyB,CAAC;IACd,WAAA,IAAA,qCAAK,EAAC,cAAS,CAAC,CAAA;;qCAAY,cAAS;;2DAQtD;AAGK;IADL,IAAA,oBAAI,EAAC,0BAA0B,CAAC;IAE9B,WAAA,IAAA,wBAAQ,GAAE,CAAA;IACV,WAAA,IAAA,qCAAK,EAAC,cAAS,CAAC,CAAA;;6CAAY,cAAS;;4DAoCvC;AAGK;IADL,IAAA,oBAAI,EAAC,0BAA0B,CAAC;IACd,WAAA,IAAA,qCAAK,EAAC,cAAS,CAAC,CAAA;;qCAAY,cAAS;;4DAqBvD;AAGK;IADL,IAAA,oBAAI,EAAC,qBAAqB,CAAC;IAEzB,WAAA,IAAA,wBAAQ,GAAE,CAAA;IACV,WAAA,IAAA,qCAAK,EAAC,cAAS,CAAC,CAAA;;6CAAY,cAAS;;iEAiCvC;AAGK;IADL,IAAA,oBAAI,EAAC,+BAA+B,CAAC;IAEnC,WAAA,IAAA,wBAAQ,GAAE,CAAA;IACV,WAAA,IAAA,qCAAK,EAAC,cAAS,CAAC,CAAA;;6CAAY,cAAS;;sEA2BvC;AAGK;IADL,IAAA,oBAAI,EAAC,gCAAgC,CAAC;IACN,WAAA,IAAA,qCAAK,EAAC,cAAS,CAAC,CAAA;;qCAAY,cAAS;;0EAqBrE;AAGK;IADL,IAAA,mBAAG,EAAC,WAAW,CAAC;IAEd,WAAA,IAAA,qCAAK,EAAC,iBAAY,CAAC,CAAA;IACnB,WAAA,IAAA,yBAAS,EAAC,eAAe,EAAE,QAAQ,CAAC,CAAA;;qCADF,iBAAY;;4DAOhD;AAGK;IADL,IAAA,sBAAM,EAAC,eAAe,CAAC;IAErB,WAAA,IAAA,yBAAS,EAAC,IAAI,EAAE,OAAO,CAAC,CAAA;IACxB,WAAA,IAAA,qCAAK,EAAC,iBAAY,CAAC,CAAA;;6CAAe,iBAAY;;8DAQhD;AAGK;IADL,IAAA,sBAAM,EAAC,WAAW,CAAC;IAEjB,WAAA,IAAA,qCAAK,EAAC,iBAAY,CAAC,CAAA;IACnB,WAAA,IAAA,qCAAK,EAAC,cAAS,CAAC,CAAA;;qCADkB,iBAAY;QAClB,cAAS;;kEAQvC;oCAtYU,yBAAyB;IADrC,IAAA,mBAAY,GAAE;GACF,yBAAyB,CAuYrC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type SessionModel, type UserModel } from "@antelopejs/interface-dms/auth/db";
|
|
2
2
|
import type { AuthResponse } from "./types";
|
|
3
3
|
export declare const HTTP_FORBIDDEN = 403;
|
|
4
4
|
export declare function refresh(userModel: UserModel, sessionModel: SessionModel, body: unknown): Promise<AuthResponse>;
|
|
@@ -6,6 +6,7 @@ const interface_api_util_1 = require("@antelopejs/interface-api-util");
|
|
|
6
6
|
const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
|
|
7
7
|
const db_1 = require("@antelopejs/interface-dms/db");
|
|
8
8
|
const auth_1 = require("@antelopejs/interface-dms/auth");
|
|
9
|
+
const db_2 = require("@antelopejs/interface-dms/auth/db");
|
|
9
10
|
const jsonwebtoken_1 = require("jsonwebtoken");
|
|
10
11
|
const auth_schema_1 = require("../../validation/auth.schema");
|
|
11
12
|
const constants_1 = require("./constants");
|
|
@@ -46,7 +47,7 @@ async function refresh(userModel, sessionModel, body) {
|
|
|
46
47
|
}
|
|
47
48
|
else if (tokenPayload.sessionId) {
|
|
48
49
|
const session = await sessionModel.get(tokenPayload.sessionId);
|
|
49
|
-
(0, interface_api_util_1.assert)(session
|
|
50
|
+
(0, interface_api_util_1.assert)(session && (0, db_2.isCurrentRefreshToken)(session, token), 401, "error.session_expired");
|
|
50
51
|
sessionModel
|
|
51
52
|
.update(tokenPayload.sessionId, { lastActiveAt: new Date() })
|
|
52
53
|
.catch(() => { });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refresh.js","sourceRoot":"","sources":["../../../src/routes/auth/refresh.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"refresh.js","sourceRoot":"","sources":["../../../src/routes/auth/refresh.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type SessionModel, type UserModel } from "@antelopejs/interface-dms/auth/db";
|
|
2
2
|
import type { AuthResponse } from "./types";
|
|
3
3
|
export declare function switchTenant(userModel: UserModel, sessionModel: SessionModel, body: unknown): Promise<AuthResponse>;
|
|
@@ -5,6 +5,7 @@ const interface_api_util_1 = require("@antelopejs/interface-api-util");
|
|
|
5
5
|
const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
|
|
6
6
|
const db_1 = require("@antelopejs/interface-dms/db");
|
|
7
7
|
const auth_1 = require("@antelopejs/interface-dms/auth");
|
|
8
|
+
const db_2 = require("@antelopejs/interface-dms/auth/db");
|
|
8
9
|
const zod_1 = require("zod");
|
|
9
10
|
const HTTP_FORBIDDEN = 403;
|
|
10
11
|
const switchTenantSchema = zod_1.z.object({
|
|
@@ -25,7 +26,7 @@ async function switchTenant(userModel, sessionModel, body) {
|
|
|
25
26
|
if (tokenPayload.sessionId) {
|
|
26
27
|
const session = await sessionModel.get(tokenPayload.sessionId);
|
|
27
28
|
(0, interface_api_util_1.assert)(session, 401, "error.session_expired");
|
|
28
|
-
(0, interface_api_util_1.assert)(session
|
|
29
|
+
(0, interface_api_util_1.assert)((0, db_2.isCurrentRefreshToken)(session, refreshToken), 401, "error.session_expired");
|
|
29
30
|
sessionModel
|
|
30
31
|
.update(tokenPayload.sessionId, { lastActiveAt: new Date() })
|
|
31
32
|
.catch(() => { });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"switch-tenant.js","sourceRoot":"","sources":["../../../src/routes/auth/switch-tenant.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"switch-tenant.js","sourceRoot":"","sources":["../../../src/routes/auth/switch-tenant.ts"],"names":[],"mappings":";;AAgCA,oCAuDC;AAvFD,uEAA0E;AAC1E,6FAAqE;AACrE,qDAAiE;AACjE,yDAIwC;AACxC,0DAI2C;AAC3C,6BAAwB;AAGxB,MAAM,cAAc,GAAG,GAAG,CAAC;AAE3B,MAAM,kBAAkB,GAAG,OAAC,CAAC,MAAM,CAAC;IAClC,YAAY,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/B,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;CAC5B,CAAC,CAAC;AAEH,KAAK,UAAU,gBAAgB,CAC7B,MAAc,EACd,QAAgB;IAEhB,MAAM,WAAW,GAAG,IAAA,wCAAQ,EAAC,sBAAiB,EAAE,QAAQ,CAAC,CAAC;IAC1D,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACnD,IAAA,2BAAM,EAAC,MAAM,EAAE,cAAc,EAAE,oBAAoB,CAAC,CAAC;AACvD,CAAC;AAEM,KAAK,UAAU,YAAY,CAChC,SAAoB,EACpB,YAA0B,EAC1B,IAAa;IAEb,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,IAAA,qCAAgB,EAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAC9D,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,CAC5B,CAAC;IAEF,MAAM,YAAY,GAAG,MAAM,IAAA,2BAAoB,EAAC,YAAY,CAAC,CAAC;IAE9D,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IAClD,IAAA,2BAAM,EAAC,IAAI,EAAE,GAAG,EAAE,qBAAqB,CAAC,CAAC;IAEzC,MAAM,gBAAgB,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAE3C,IAAI,YAAY,CAAC,SAAS,EAAE,CAAC;QAC3B,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAC/D,IAAA,2BAAM,EAAC,OAAO,EAAE,GAAG,EAAE,uBAAuB,CAAC,CAAC;QAC9C,IAAA,2BAAM,EACJ,IAAA,0BAAqB,EAAC,OAAO,EAAE,YAAY,CAAC,EAC5C,GAAG,EACH,uBAAuB,CACxB,CAAC;QACF,YAAY;aACT,MAAM,CAAC,YAAY,CAAC,SAAS,EAAE,EAAE,YAAY,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC;aAC5D,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IACrB,CAAC;IAED,MAAM,eAAe,GAAG,MAAM,IAAA,0BAAmB,EAC/C,QAAQ,EACR,IAAI,EACJ,YAAY,CAAC,SAAS,CACvB,CAAC;IAEF,MAAM,gBAAgB,GAAG,MAAM,IAAA,2BAAoB,EACjD,QAAQ,EACR,IAAI,EACJ,YAAY,CAAC,SAAS,CACvB,CAAC;IACF,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,KAAK,CAAC;IAEhD,IAAI,YAAY,CAAC,SAAS,EAAE,CAAC;QAC3B,MAAM,YAAY,CAAC,mBAAmB,CACpC,YAAY,CAAC,SAAS,EACtB,gBAAgB,CACjB,CAAC;IACJ,CAAC;IAED,OAAO;QACL,UAAU,EAAE,QAAQ;QACpB,YAAY,EAAE,eAAe,CAAC,KAAK;QACnC,UAAU,EAAE,eAAe,CAAC,SAAS;QACrC,aAAa,EAAE,gBAAgB;KAChC,CAAC;AACJ,CAAC"}
|
|
@@ -42,7 +42,7 @@ class PublicOnboardingController extends (0, interface_api_1.Controller)("/api/o
|
|
|
42
42
|
(0, interface_api_util_1.assert)(users.length === 0, 400, "error.admin_already_set");
|
|
43
43
|
const insertedIds = await userModel.insert({
|
|
44
44
|
name: data.name,
|
|
45
|
-
email: data.email,
|
|
45
|
+
email: (0, db_1.normalizeEmail)(data.email),
|
|
46
46
|
password: data.password,
|
|
47
47
|
createdAt: new Date(),
|
|
48
48
|
updatedAt: new Date(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onboarding.js","sourceRoot":"","sources":["../../src/routes/onboarding.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DAA4E;AAC5E,uEAA0E;AAC1E,6FAAkE;AAClE,mEAAwE;AACxE,iFAAkF;AAClF,
|
|
1
|
+
{"version":3,"file":"onboarding.js","sourceRoot":"","sources":["../../src/routes/onboarding.ts"],"names":[],"mappings":"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"}
|
|
@@ -66,7 +66,7 @@ exports.default = (0, config_1.defineConfig)({
|
|
|
66
66
|
},
|
|
67
67
|
},
|
|
68
68
|
mongodb: {
|
|
69
|
-
source: providerSource(LOCAL_MONGODB_PATH, "@antelopejs/mongodb", "1.
|
|
69
|
+
source: providerSource(LOCAL_MONGODB_PATH, "@antelopejs/mongodb", "1.4.0"),
|
|
70
70
|
},
|
|
71
71
|
"auth-jwt": {
|
|
72
72
|
source: {
|
|
@@ -1,2 +1,3 @@
|
|
|
1
1
|
export declare function resetDatabase(): Promise<void>;
|
|
2
2
|
export declare function countRawDocuments(collectionName: string, filter?: Record<string, unknown>): Promise<number>;
|
|
3
|
+
export declare function listRawIndexes(collectionName: string): Promise<Record<string, Record<string, unknown>>>;
|
package/dist/test/helpers/db.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.resetDatabase = resetDatabase;
|
|
4
4
|
exports.countRawDocuments = countRawDocuments;
|
|
5
|
+
exports.listRawIndexes = listRawIndexes;
|
|
5
6
|
const mongodb_1 = require("mongodb");
|
|
6
7
|
const PRESERVED_COLLECTION_PREFIXES = ["system.", "__antelope"];
|
|
7
8
|
const DMS_SCHEMA_DB = "dms-core";
|
|
@@ -44,4 +45,17 @@ async function countRawDocuments(collectionName, filter = {}) {
|
|
|
44
45
|
await client.close();
|
|
45
46
|
}
|
|
46
47
|
}
|
|
48
|
+
async function listRawIndexes(collectionName) {
|
|
49
|
+
const client = await mongodb_1.MongoClient.connect(getMongoUrl());
|
|
50
|
+
try {
|
|
51
|
+
const indexes = await client
|
|
52
|
+
.db(DMS_SCHEMA_DB)
|
|
53
|
+
.collection(`${DMS_SCHEMA_DB}__${collectionName}`)
|
|
54
|
+
.indexes();
|
|
55
|
+
return Object.fromEntries(indexes.map((index) => [index.name ?? "", index.key]));
|
|
56
|
+
}
|
|
57
|
+
finally {
|
|
58
|
+
await client.close();
|
|
59
|
+
}
|
|
60
|
+
}
|
|
47
61
|
//# sourceMappingURL=db.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../../src/test/helpers/db.ts"],"names":[],"mappings":";;AAqBA,sCAaC;AAED,8CAiBC;
|
|
1
|
+
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../../src/test/helpers/db.ts"],"names":[],"mappings":";;AAqBA,sCAaC;AAED,8CAiBC;AAED,wCAeC;AAtED,qCAAsC;AAItC,MAAM,6BAA6B,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;AAChE,MAAM,aAAa,GAAG,UAAU,CAAC;AAEjC,SAAS,WAAW;IAClB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;IACvC,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;IAC7E,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,WAAW,CAAC,IAAY;IAC/B,OAAO,6BAA6B,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CACnD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CACxB,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,aAAa;IACjC,MAAM,MAAM,GAAG,MAAM,qBAAW,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IACxD,IAAI,CAAC;QACH,MAAM,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC;QACpC,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,WAAW,EAAE,CAAC;QAC3C,MAAM,OAAO,CAAC,GAAG,CACf,WAAW;aACR,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;aAC/D,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAClD,CAAC;IACJ,CAAC;YAAS,CAAC;QACT,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,iBAAiB,CACrC,cAAsB,EACtB,SAAkC,EAAE;IAEpC,MAAM,MAAM,GAAG,MAAM,qBAAW,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IACxD,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,GAAG,aAAa,KAAK,cAAc,EAAE,CAAC;QACnD,IAAI,CAAC,CAAC,MAAM,MAAM,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;YAC1E,MAAM,IAAI,KAAK,CAAC,4BAA4B,IAAI,EAAE,CAAC,CAAC;QACtD,CAAC;QACD,OAAO,MAAM,MAAM;aAChB,EAAE,CAAC,aAAa,CAAC;aACjB,UAAU,CAAC,IAAI,CAAC;aAChB,cAAc,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;YAAS,CAAC;QACT,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,cAAc,CAClC,cAAsB;IAEtB,MAAM,MAAM,GAAG,MAAM,qBAAW,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IACxD,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,MAAM;aACzB,EAAE,CAAC,aAAa,CAAC;aACjB,UAAU,CAAC,GAAG,aAAa,KAAK,cAAc,EAAE,CAAC;aACjD,OAAO,EAAE,CAAC;QACb,OAAO,MAAM,CAAC,WAAW,CACvB,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CACtD,CAAC;IACJ,CAAC;YAAS,CAAC;QACT,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const node_crypto_1 = require("node:crypto");
|
|
4
|
+
const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
|
|
5
|
+
const chai_1 = require("chai");
|
|
6
|
+
const constants_1 = require("@antelopejs/interface-dms/constants");
|
|
7
|
+
const models_1 = require("@antelopejs/interface-dms/db/models");
|
|
8
|
+
const invites_1 = require("@antelopejs/interface-dms/invites");
|
|
9
|
+
const models_2 = require("@antelopejs/interface-dms/auth/db/models");
|
|
10
|
+
const STORED_EMAIL = "email-normalization-user@acme.dev";
|
|
11
|
+
const TYPED_EMAIL = " Email-Normalization-User@ACME.dev ";
|
|
12
|
+
const INVITE_TYPED_EMAIL = "Email-Normalization-Invitee@Acme.dev";
|
|
13
|
+
const INVITE_STORED_EMAIL = "email-normalization-invitee@acme.dev";
|
|
14
|
+
describe("[unit] e-mail normalization — lookups and writes share one form", () => {
|
|
15
|
+
const userModel = (0, interface_database_decorators_1.GetModel)(models_2.UserModel);
|
|
16
|
+
const inviteModel = (0, interface_database_decorators_1.GetModel)(models_1.UserInviteModel, constants_1.DEFAULT_TENANT_ID);
|
|
17
|
+
let userId;
|
|
18
|
+
before(async () => {
|
|
19
|
+
[userId] = await userModel.insert({
|
|
20
|
+
name: "Normalized",
|
|
21
|
+
email: STORED_EMAIL,
|
|
22
|
+
password: null,
|
|
23
|
+
authKey: (0, node_crypto_1.randomUUID)(),
|
|
24
|
+
isValidated: true,
|
|
25
|
+
owner: false,
|
|
26
|
+
language: "en",
|
|
27
|
+
});
|
|
28
|
+
});
|
|
29
|
+
after(async () => {
|
|
30
|
+
await userModel.delete(userId);
|
|
31
|
+
const invites = await inviteModel.table
|
|
32
|
+
.getAll(INVITE_STORED_EMAIL, "email")
|
|
33
|
+
.run();
|
|
34
|
+
for (const invite of invites)
|
|
35
|
+
await inviteModel.delete(invite._id);
|
|
36
|
+
});
|
|
37
|
+
it("trims and lowercases", () => {
|
|
38
|
+
(0, chai_1.expect)((0, models_2.normalizeEmail)(TYPED_EMAIL)).to.equal(STORED_EMAIL);
|
|
39
|
+
});
|
|
40
|
+
it("finds a user whatever the casing of the lookup", async () => {
|
|
41
|
+
const user = await userModel.getByEmail(TYPED_EMAIL);
|
|
42
|
+
(0, chai_1.expect)(user?._id).to.equal(userId);
|
|
43
|
+
});
|
|
44
|
+
it("stores an invitation lowercased and finds it by any casing", async () => {
|
|
45
|
+
const { inviteId } = await (0, invites_1.createUserInviteToken)({
|
|
46
|
+
tenantId: constants_1.DEFAULT_TENANT_ID,
|
|
47
|
+
email: INVITE_TYPED_EMAIL,
|
|
48
|
+
language: "en",
|
|
49
|
+
roleIds: [],
|
|
50
|
+
asTenantOwner: false,
|
|
51
|
+
skipEmailValidation: false,
|
|
52
|
+
});
|
|
53
|
+
const stored = await inviteModel.get(inviteId);
|
|
54
|
+
(0, chai_1.expect)(stored?.email).to.equal(INVITE_STORED_EMAIL);
|
|
55
|
+
const found = await inviteModel.getByEmail(INVITE_TYPED_EMAIL);
|
|
56
|
+
(0, chai_1.expect)(found?._id).to.equal(inviteId);
|
|
57
|
+
});
|
|
58
|
+
});
|
|
59
|
+
//# sourceMappingURL=email-normalization.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"email-normalization.test.js","sourceRoot":"","sources":["../../../../src/test/unit/db/email-normalization.test.ts"],"names":[],"mappings":";;AAAA,6CAAyC;AACzC,6FAAqE;AACrE,+BAA8B;AAC9B,mEAAwE;AACxE,gEAAsE;AACtE,+DAA0E;AAC1E,qEAGkD;AAElD,MAAM,YAAY,GAAG,mCAAmC,CAAC;AACzD,MAAM,WAAW,GAAG,sCAAsC,CAAC;AAC3D,MAAM,kBAAkB,GAAG,sCAAsC,CAAC;AAClE,MAAM,mBAAmB,GAAG,sCAAsC,CAAC;AAEnE,QAAQ,CAAC,iEAAiE,EAAE,GAAG,EAAE;IAC/E,MAAM,SAAS,GAAG,IAAA,wCAAQ,EAAC,kBAAS,CAAC,CAAC;IACtC,MAAM,WAAW,GAAG,IAAA,wCAAQ,EAAC,wBAAe,EAAE,6BAAiB,CAAC,CAAC;IACjE,IAAI,MAAc,CAAC;IAEnB,MAAM,CAAC,KAAK,IAAI,EAAE;QAChB,CAAC,MAAM,CAAC,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC;YAChC,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,YAAY;YACnB,QAAQ,EAAE,IAAI;YACd,OAAO,EAAE,IAAA,wBAAU,GAAE;YACrB,WAAW,EAAE,IAAI;YACjB,KAAK,EAAE,KAAK;YACZ,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,KAAK,IAAI,EAAE;QACf,MAAM,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC/B,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,KAAK;aACpC,MAAM,CAAC,mBAAmB,EAAE,OAAO,CAAC;aACpC,GAAG,EAAE,CAAC;QACT,KAAK,MAAM,MAAM,IAAI,OAAO;YAAE,MAAM,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sBAAsB,EAAE,GAAG,EAAE;QAC9B,IAAA,aAAM,EAAC,IAAA,uBAAc,EAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;QAC9D,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QACrD,IAAA,aAAM,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4DAA4D,EAAE,KAAK,IAAI,EAAE;QAC1E,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,+BAAqB,EAAC;YAC/C,QAAQ,EAAE,6BAAiB;YAC3B,KAAK,EAAE,kBAAkB;YACzB,QAAQ,EAAE,IAAI;YACd,OAAO,EAAE,EAAE;YACX,aAAa,EAAE,KAAK;YACpB,mBAAmB,EAAE,KAAK;SAC3B,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC/C,IAAA,aAAM,EAAC,MAAM,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACpD,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC;QAC/D,IAAA,aAAM,EAAC,KAAK,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const chai_1 = require("chai");
|
|
4
|
+
const tables_1 = require("../../../db/tables");
|
|
5
|
+
const db_1 = require("../../helpers/db");
|
|
6
|
+
const USER_FEED_INDEX = "userId_createdAt__i";
|
|
7
|
+
const SCHEMA_READY_TIMEOUT_MS = 30_000;
|
|
8
|
+
const POLL_INTERVAL_MS = 100;
|
|
9
|
+
async function feedIndexKey() {
|
|
10
|
+
const deadline = Date.now() + SCHEMA_READY_TIMEOUT_MS;
|
|
11
|
+
while (Date.now() < deadline) {
|
|
12
|
+
try {
|
|
13
|
+
const key = (await (0, db_1.listRawIndexes)(tables_1.userNotificationsTableName))[USER_FEED_INDEX];
|
|
14
|
+
if (key)
|
|
15
|
+
return key;
|
|
16
|
+
}
|
|
17
|
+
catch {
|
|
18
|
+
}
|
|
19
|
+
await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL_MS));
|
|
20
|
+
}
|
|
21
|
+
return undefined;
|
|
22
|
+
}
|
|
23
|
+
describe("[unit] user notifications — a user's feed is served by one index", () => {
|
|
24
|
+
it("indexes the instance, the user then the creation date, in that order", async function () {
|
|
25
|
+
this.timeout(SCHEMA_READY_TIMEOUT_MS + POLL_INTERVAL_MS);
|
|
26
|
+
const key = await feedIndexKey();
|
|
27
|
+
(0, chai_1.expect)(key).to.deep.equal({ _instance: 1, userId: 1, createdAt: 1 });
|
|
28
|
+
(0, chai_1.expect)(Object.keys(key ?? {})).to.deep.equal([
|
|
29
|
+
"_instance",
|
|
30
|
+
"userId",
|
|
31
|
+
"createdAt",
|
|
32
|
+
]);
|
|
33
|
+
});
|
|
34
|
+
});
|
|
35
|
+
//# sourceMappingURL=notification-feed-index.test.js.map
|