@antelopejs/dms 0.14.0 → 0.15.1

package/dist/index.js

@@ -46,7 +46,7 @@ const modules_1 = require("@antelopejs/interface-core/modules");
 const runtime_1 = require("@antelopejs/interface-core/runtime");
 const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
 const constants_1 = require("@antelopejs/interface-dms/constants");
-require("./db");
+const db_1 = require("./db");
 require("./realtime");
 require("./implementations/dms-auth/email-templates");
 require("./pages");
@@ -73,6 +73,7 @@ __exportStar(require("./config"), exports);
 let cronTasks = [];
 let staleExportsSweep = Promise.resolve();
 let defaultTenantProvisioning;
+let provisioningWait = new AbortController();
 let globalRealtimeConfig;
 async function construct(config) {
     const { dev } = await (0, runtime_1.GetRuntimeInfo)();
@@ -157,7 +158,8 @@ function destroy() {
 function onModulesStarted() {
     if (defaultTenantProvisioning)
         return;
-    defaultTenantProvisioning = (0, utils_1.provisionDefaultTenant)().finally(() => {
+    provisioningWait = new AbortController();
+    defaultTenantProvisioning = (0, utils_1.provisionDefaultTenant)(provisioningWait.signal).finally(() => {
         defaultTenantProvisioning = undefined;
     });
 }
@@ -167,6 +169,7 @@ async function start() {
     await (0, interface_database_decorators_1.RegisterSchema)(constants_1.CORE_SCHEMA_NAME);
     await (0, interface_database_decorators_1.RegisterSchema)(constants_1.TENANT_SCHEMA_NAME);
     await (0, utils_1.ensureDefaultTenantExists)();
+    await (0, db_1.announceSetupToken)();
     await (0, utils_1.registerExistingTenantInstances)();
     await (0, hooks_1.SettleHook)(hooks_1.Hook.DATABASE_INITIALIZED);
     staleExportsSweep = (0, crons_1.runSweepStaleExports)().catch((error) => {
@@ -183,6 +186,7 @@ async function start() {
 }
 async function stop() {
     modules_1.Events.ModulesStarted.unregister(onModulesStarted);
+    provisioningWait.abort();
     await defaultTenantProvisioning;
     await staleExportsSweep;
     (0, hooks_1.UnsettleHook)(hooks_1.Hook.DATABASE_INITIALIZED);

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/pages/settings/users/current-password.js

@@ -28,7 +28,7 @@ async function assertCurrentPassword(userModel, user, password, now = new Date()
     (0, interface_api_util_1.assert)(stored?.password, HTTP_BAD_REQUEST, "error.password_not_set");
     (0, interface_api_util_1.assert)(password, HTTP_BAD_REQUEST, INVALID_CURRENT_PASSWORD);
     await claimAttempt(stored._id, now);
-    (0, interface_api_util_1.assert)(stored.testHash("password", password), HTTP_BAD_REQUEST, INVALID_CURRENT_PASSWORD);
+    (0, interface_api_util_1.assert)(await stored.testHashAsync("password", password), HTTP_BAD_REQUEST, INVALID_CURRENT_PASSWORD);
     await (0, interface_database_decorators_1.GetModel)(models_1.SignInAttemptsModel).clearCurrentPasswordAttempts(stored._id);
 }
 async function assertCurrentPasswordIfSet(userModel, user, password) {

package/dist/pages/settings/users/current-password.js.map

@@ -1 +1 @@
-{"version":3,"file":"current-password.js","sourceRoot":"","sources":["../../../../src/pages/settings/users/current-password.ts"],"names":[],"mappings":";;AA6CA,sDAgBC;AAMD,gEAQC;AA3ED,uEAAwD;AACxD,6FAAqE;AAErE,+CAAyD;AACzD,0CAAuE;AACvE,0CAAsD;AAEtD,MAAM,gBAAgB,GAAG,GAAG,CAAC;AAC7B,MAAM,sBAAsB,GAAG,GAAG,CAAC;AAEnC,MAAM,wBAAwB,GAAG,gCAAgC,CAAC;AAClE,MAAM,iBAAiB,GAAG,0CAA0C,CAAC;AAErE,SAAS,eAAe,CAAC,KAAa,EAAE,OAAe;IACrD,IAAA,2BAAM,EACJ,KAAK,GAAG,OAAO,IAAI,4BAAoB,EACvC,sBAAsB,EACtB,iBAAiB,CAClB,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,MAAc,EAAE,GAAS;IACnD,MAAM,QAAQ,GAAG,IAAA,wCAAQ,EAAC,4BAAmB,CAAC,CAAC;IAC/C,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,uBAAe,CAAC,CAAC;IACxD,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,4BAA4B,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC9E,eAAe,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IAC/B,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,4BAA4B,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;IAC9E,MAAM,QAAQ,CAAC,WAAW,CACxB,MAAM,EACN,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,4BAAoB,CAAC,CAC/C,CAAC;IACF,eAAe,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;AAC5B,CAAC;AAaM,KAAK,UAAU,qBAAqB,CACzC,SAAoB,EACpB,IAAU,EACV,QAA4B,EAC5B,GAAG,GAAG,IAAI,IAAI,EAAE;IAEhB,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7C,IAAA,2BAAM,EAAC,MAAM,EAAE,QAAQ,EAAE,gBAAgB,EAAE,wBAAwB,CAAC,CAAC;IACrE,IAAA,2BAAM,EAAC,QAAQ,EAAE,gBAAgB,EAAE,wBAAwB,CAAC,CAAC;IAC7D,MAAM,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACpC,IAAA,2BAAM,EACJ,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,EACrC,gBAAgB,EAChB,wBAAwB,CACzB,CAAC;IACF,MAAM,IAAA,wCAAQ,EAAC,4BAAmB,CAAC,CAAC,4BAA4B,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AAC/E,CAAC;AAMM,KAAK,UAAU,0BAA0B,CAC9C,SAAoB,EACpB,IAAU,EACV,QAA4B;IAE5B,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7C,IAAI,CAAC,MAAM,EAAE,QAAQ;QAAE,OAAO;IAC9B,MAAM,qBAAqB,CAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;AACzD,CAAC"}
+{"version":3,"file":"current-password.js","sourceRoot":"","sources":["../../../../src/pages/settings/users/current-password.ts"],"names":[],"mappings":";;AA6CA,sDAgBC;AAMD,gEAQC;AA3ED,uEAAwD;AACxD,6FAAqE;AAErE,+CAAyD;AACzD,0CAAuE;AACvE,0CAAsD;AAEtD,MAAM,gBAAgB,GAAG,GAAG,CAAC;AAC7B,MAAM,sBAAsB,GAAG,GAAG,CAAC;AAEnC,MAAM,wBAAwB,GAAG,gCAAgC,CAAC;AAClE,MAAM,iBAAiB,GAAG,0CAA0C,CAAC;AAErE,SAAS,eAAe,CAAC,KAAa,EAAE,OAAe;IACrD,IAAA,2BAAM,EACJ,KAAK,GAAG,OAAO,IAAI,4BAAoB,EACvC,sBAAsB,EACtB,iBAAiB,CAClB,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,MAAc,EAAE,GAAS;IACnD,MAAM,QAAQ,GAAG,IAAA,wCAAQ,EAAC,4BAAmB,CAAC,CAAC;IAC/C,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,uBAAe,CAAC,CAAC;IACxD,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,4BAA4B,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC9E,eAAe,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IAC/B,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,4BAA4B,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;IAC9E,MAAM,QAAQ,CAAC,WAAW,CACxB,MAAM,EACN,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,4BAAoB,CAAC,CAC/C,CAAC;IACF,eAAe,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;AAC5B,CAAC;AAaM,KAAK,UAAU,qBAAqB,CACzC,SAAoB,EACpB,IAAU,EACV,QAA4B,EAC5B,GAAG,GAAG,IAAI,IAAI,EAAE;IAEhB,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7C,IAAA,2BAAM,EAAC,MAAM,EAAE,QAAQ,EAAE,gBAAgB,EAAE,wBAAwB,CAAC,CAAC;IACrE,IAAA,2BAAM,EAAC,QAAQ,EAAE,gBAAgB,EAAE,wBAAwB,CAAC,CAAC;IAC7D,MAAM,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACpC,IAAA,2BAAM,EACJ,MAAM,MAAM,CAAC,aAAa,CAAC,UAAU,EAAE,QAAQ,CAAC,EAChD,gBAAgB,EAChB,wBAAwB,CACzB,CAAC;IACF,MAAM,IAAA,wCAAQ,EAAC,4BAAmB,CAAC,CAAC,4BAA4B,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AAC/E,CAAC;AAMM,KAAK,UAAU,0BAA0B,CAC9C,SAAoB,EACpB,IAAU,EACV,QAA4B;IAE5B,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7C,IAAI,CAAC,MAAM,EAAE,QAAQ;QAAE,OAAO;IAC9B,MAAM,qBAAqB,CAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;AACzD,CAAC"}

package/dist/routes/auth/login.d.ts

@@ -1,4 +1,4 @@
-import type { SessionModel, UserModel } from "@antelopejs/interface-dms/auth/db";
+import { type SessionModel, type UserModel } from "@antelopejs/interface-dms/auth/db";
 import type { ClientOrigin } from "../../utils";
 import { authSchema } from "../../validation";
 import { type LoginOutcome } from "./session-response";

package/dist/routes/auth/login.js

@@ -2,9 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.login = login;
 const interface_api_util_1 = require("@antelopejs/interface-api-util");
+const db_1 = require("@antelopejs/interface-dms/auth/db");
 const hooks_1 = require("../../hooks");
 const validation_1 = require("../../validation");
 const utils_1 = require("../../utils");
+const password_hash_upgrade_1 = require("./password-hash-upgrade");
 const session_response_1 = require("./session-response");
 const fire_and_forget_1 = require("@antelopejs/interface-dms/utils/fire-and-forget");
 const HTTP_UNAUTHORIZED = 401;
@@ -14,8 +16,10 @@ async function login(userModel, sessionModel, body, userAgent, origin) {
     const normalizedEmail = email.toLowerCase();
     (0, utils_1.assertLoginAllowed)(normalizedEmail, origin.ip);
     const user = await userModel.getByEmail(normalizedEmail);
-    const isPasswordValid = !!user && user.testHash("password", password);
-    if (!isPasswordValid)
+    const isPasswordValid = await (user ?? new db_1.User()).testHashAsync("password", password);
+    if (isPasswordValid)
+        (0, utils_1.assertLoginAllowed)(normalizedEmail, origin.ip);
+    else
         (0, utils_1.recordLoginFailure)(normalizedEmail, origin.ip);
     (0, interface_api_util_1.assert)(user, HTTP_UNAUTHORIZED, INVALID_CREDENTIALS_MESSAGE);
     (0, fire_and_forget_1.fireAndForget)(isPasswordValid
@@ -23,6 +27,7 @@ async function login(userModel, sessionModel, body, userAgent, origin) {
         : (0, hooks_1.recordFailedPassword)(user), "failed password bookkeeping");
     (0, interface_api_util_1.assert)(isPasswordValid, HTTP_UNAUTHORIZED, INVALID_CREDENTIALS_MESSAGE);
     (0, utils_1.clearLoginFailures)(normalizedEmail);
+    (0, fire_and_forget_1.fireAndForget)((0, password_hash_upgrade_1.upgradePasswordHash)(userModel, user, password), "password hash upgrade");
     return (0, session_response_1.resolveLoginOutcome)(sessionModel, user, userAgent, origin);
 }
 //# sourceMappingURL=login.js.map

package/dist/routes/auth/login.js.map

@@ -1 +1 @@
-{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/routes/auth/login.ts"],"names":[],"mappings":";;AAmBA,sBA2BC;AA9CD,uEAA0E;AAK1E,uCAAyE;AAEzE,iDAA8C;AAC9C,uCAIqB;AACrB,yDAA4E;AAC5E,qFAAgF;AAEhF,MAAM,iBAAiB,GAAG,GAAG,CAAC;AAC9B,MAAM,2BAA2B,GAAG,2BAA2B,CAAC;AAEzD,KAAK,UAAU,KAAK,CACzB,SAAoB,EACpB,YAA0B,EAC1B,IAAkD,EAClD,SAAiB,EACjB,MAAoB;IAEpB,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAA,qCAAgB,EAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CACvD,uBAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAC1B,CAAC;IACF,MAAM,eAAe,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;IAC5C,IAAA,0BAAkB,EAAC,eAAe,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IAC/C,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;IACzD,MAAM,eAAe,GAAG,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IACtE,IAAI,CAAC,eAAe;QAAE,IAAA,0BAAkB,EAAC,eAAe,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IAErE,IAAA,2BAAM,EAAC,IAAI,EAAE,iBAAiB,EAAE,2BAA2B,CAAC,CAAC;IAC7D,IAAA,+BAAa,EACX,eAAe;QACb,CAAC,CAAC,IAAA,4BAAoB,EAAC,IAAI,CAAC,GAAG,CAAC;QAChC,CAAC,CAAC,IAAA,4BAAoB,EAAC,IAAI,CAAC,EAC9B,6BAA6B,CAC9B,CAAC;IACF,IAAA,2BAAM,EAAC,eAAe,EAAE,iBAAiB,EAAE,2BAA2B,CAAC,CAAC;IACxE,IAAA,0BAAkB,EAAC,eAAe,CAAC,CAAC;IAEpC,OAAO,IAAA,sCAAmB,EAAC,YAAY,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;AACpE,CAAC"}
+{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/routes/auth/login.ts"],"names":[],"mappings":";;AAqBA,sBAmCC;AAxDD,uEAA0E;AAC1E,0DAI2C;AAC3C,uCAAyE;AAEzE,iDAA8C;AAC9C,uCAIqB;AACrB,mEAA8D;AAC9D,yDAA4E;AAC5E,qFAAgF;AAEhF,MAAM,iBAAiB,GAAG,GAAG,CAAC;AAC9B,MAAM,2BAA2B,GAAG,2BAA2B,CAAC;AAEzD,KAAK,UAAU,KAAK,CACzB,SAAoB,EACpB,YAA0B,EAC1B,IAAkD,EAClD,SAAiB,EACjB,MAAoB;IAEpB,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAA,qCAAgB,EAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CACvD,uBAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAC1B,CAAC;IACF,MAAM,eAAe,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;IAC5C,IAAA,0BAAkB,EAAC,eAAe,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IAC/C,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;IACzD,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,IAAI,IAAI,SAAI,EAAE,CAAC,CAAC,aAAa,CAC9D,UAAU,EACV,QAAQ,CACT,CAAC;IACF,IAAI,eAAe;QAAE,IAAA,0BAAkB,EAAC,eAAe,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;;QAC/D,IAAA,0BAAkB,EAAC,eAAe,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IAEpD,IAAA,2BAAM,EAAC,IAAI,EAAE,iBAAiB,EAAE,2BAA2B,CAAC,CAAC;IAC7D,IAAA,+BAAa,EACX,eAAe;QACb,CAAC,CAAC,IAAA,4BAAoB,EAAC,IAAI,CAAC,GAAG,CAAC;QAChC,CAAC,CAAC,IAAA,4BAAoB,EAAC,IAAI,CAAC,EAC9B,6BAA6B,CAC9B,CAAC;IACF,IAAA,2BAAM,EAAC,eAAe,EAAE,iBAAiB,EAAE,2BAA2B,CAAC,CAAC;IACxE,IAAA,0BAAkB,EAAC,eAAe,CAAC,CAAC;IACpC,IAAA,+BAAa,EACX,IAAA,2CAAmB,EAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,CAAC,EAC9C,uBAAuB,CACxB,CAAC;IAEF,OAAO,IAAA,sCAAmB,EAAC,YAAY,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;AACpE,CAAC"}

package/dist/routes/auth/password-hash-upgrade.d.ts

@@ -0,0 +1,2 @@
+import { User, UserModel } from "@antelopejs/interface-dms/auth/db";
+export declare function upgradePasswordHash(userModel: UserModel, user: User, password: string): Promise<void>;

package/dist/routes/auth/password-hash-upgrade.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.upgradePasswordHash = upgradePasswordHash;
+const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
+const db_1 = require("@antelopejs/interface-dms/auth/db");
+async function upgradePasswordHash(userModel, user, password) {
+    if (!user.isHashOutdated("password"))
+        return;
+    const testedHash = user.password;
+    user.password = password;
+    const { _internal } = db_1.UserModel.toDatabase(user);
+    const storedHashes = { _internal };
+    await userModel.table
+        .getAll(user.email, "email")
+        .filter((row) => row
+        .key("_id")
+        .eq(user._id)
+        .and((0, interface_database_decorators_1.unlockrequest)(db_1.User, row, "password", []).eq(testedHash)))
+        .update(storedHashes)
+        .run();
+}
+//# sourceMappingURL=password-hash-upgrade.js.map

package/dist/routes/auth/password-hash-upgrade.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"password-hash-upgrade.js","sourceRoot":"","sources":["../../../src/routes/auth/password-hash-upgrade.ts"],"names":[],"mappings":";;AAcA,kDAoBC;AAlCD,6FAA0E;AAC1E,0DAAoE;AAa7D,KAAK,UAAU,mBAAmB,CACvC,SAAoB,EACpB,IAAU,EACV,QAAgB;IAEhB,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC;QAAE,OAAO;IAC7C,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC;IACjC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IACzB,MAAM,EAAE,SAAS,EAAE,GAAG,cAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACjD,MAAM,YAAY,GAA4C,EAAE,SAAS,EAAE,CAAC;IAC5E,MAAM,SAAS,CAAC,KAAK;SAClB,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC;SAC3B,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CACd,GAAG;SACA,GAAG,CAAC,KAAK,CAAC;SACV,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;SACZ,GAAG,CAAC,IAAA,6CAAa,EAAC,SAAI,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAChE;SACA,MAAM,CAAC,YAAY,CAAC;SACpB,GAAG,EAAE,CAAC;AACX,CAAC"}

package/dist/routes/authentication.d.ts

@@ -1,3 +1,5 @@
 export * from "./auth/invite";
+export * from "./auth/login";
+export * from "./auth/password-hash-upgrade";
 export * from "./auth/signup";
 export * from "./auth/validate-invite-token";

package/dist/routes/authentication.js

@@ -15,6 +15,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./auth/invite"), exports);
+__exportStar(require("./auth/login"), exports);
+__exportStar(require("./auth/password-hash-upgrade"), exports);
 __exportStar(require("./auth/signup"), exports);
 __exportStar(require("./auth/validate-invite-token"), exports);
 //# sourceMappingURL=authentication.js.map

package/dist/routes/authentication.js.map

@@ -1 +1 @@
-{"version":3,"file":"authentication.js","sourceRoot":"","sources":["../../src/routes/authentication.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,gDAA8B;AAC9B,+DAA6C"}
+{"version":3,"file":"authentication.js","sourceRoot":"","sources":["../../src/routes/authentication.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,+CAA6B;AAC7B,+DAA6C;AAC7C,gDAA8B;AAC9B,+DAA6C"}

package/dist/routes/onboarding.d.ts

@@ -1,13 +1,15 @@
 import { UserModel } from "@antelopejs/interface-dms/auth/db";
-import { SystemStateModel } from "../db";
+import { SetupTokenModel, SystemStateModel } from "../db";
 import { onboardingRegisterAdminSchema } from "../validation/onboarding";
 declare const PublicOnboardingController_base: import("@antelopejs/interface-api").ControllerClass<object>;
 export declare class PublicOnboardingController extends PublicOnboardingController_base {
     model: SystemStateModel;
+    setupTokens: SetupTokenModel;
     getInformations(userModel: UserModel): Promise<{
         has_onboarded: boolean;
     }>;
     postRegister(userModel: UserModel, body: Parameters<typeof onboardingRegisterAdminSchema.parse>[0]): Promise<string[]>;
+    private restoreUnusedToken;
     private createOwner;
     private completeOnboarding;
 }

package/dist/routes/onboarding.js

@@ -41,9 +41,22 @@ class PublicOnboardingController extends (0, interface_api_1.Controller)("/api/o
         const data = (0, interface_api_util_1.assertValidation)(body, (v) => onboarding_1.onboardingRegisterAdminSchema.parse(v));
         const users = await userModel.table.slice(0, 1).run();
         (0, interface_api_util_1.assert)(users.length === 0, 400, "error.admin_already_set");
-        const insertedIds = await this.createOwner(userModel, data);
-        await this.completeOnboarding(data);
-        return insertedIds;
+        const spentToken = await this.setupTokens.claim(data.setupToken);
+        (0, interface_api_util_1.assert)(spentToken, 403, "error.invalid_setup_token");
+        try {
+            const insertedIds = await this.createOwner(userModel, data);
+            await this.completeOnboarding(data);
+            return insertedIds;
+        }
+        catch (error) {
+            await this.restoreUnusedToken(userModel, spentToken);
+            throw error;
+        }
+    }
+    async restoreUnusedToken(userModel, spentToken) {
+        const users = await userModel.table.slice(0, 1).run();
+        if (users.length === 0)
+            await this.setupTokens.restore(spentToken);
     }
     async createOwner(userModel, data) {
         const insertedIds = await userModel.insert({
@@ -82,6 +95,10 @@ __decorate([
     (0, interface_database_decorators_1.Model)(db_2.SystemStateModel),
     __metadata("design:type", db_2.SystemStateModel)
 ], PublicOnboardingController.prototype, "model", void 0);
+__decorate([
+    (0, interface_database_decorators_1.Model)(db_2.SetupTokenModel),
+    __metadata("design:type", db_2.SetupTokenModel)
+], PublicOnboardingController.prototype, "setupTokens", void 0);
 __decorate([
     (0, interface_api_1.Get)("/informations"),
     __param(0, (0, interface_database_decorators_1.Model)(db_1.UserModel)),

package/dist/routes/onboarding.js.map

@@ -1 +1 @@
-{"version":3,"file":"onboarding.js","sourceRoot":"","sources":["../../src/routes/onboarding.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"onboarding.js","sourceRoot":"","sources":["../../src/routes/onboarding.ts"],"names":[],"mappings":"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"}

package/dist/utils/ensure-default-tenant.d.ts

@@ -1,2 +1,3 @@
+import { type ProvisioningLeaseConfig } from "../config";
 export declare function ensureDefaultTenantExists(): Promise<boolean>;
-export declare function provisionDefaultTenant(): Promise<void>;
+export declare function provisionDefaultTenant(signal?: AbortSignal, lease?: ProvisioningLeaseConfig): Promise<void>;

package/dist/utils/ensure-default-tenant.js

@@ -2,11 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureDefaultTenantExists = ensureDefaultTenantExists;
 exports.provisionDefaultTenant = provisionDefaultTenant;
+const node_crypto_1 = require("node:crypto");
+const node_os_1 = require("node:os");
+const promises_1 = require("node:timers/promises");
 const logging_1 = require("@antelopejs/interface-core/logging");
 const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
 const constants_1 = require("@antelopejs/interface-dms/constants");
 const db_1 = require("@antelopejs/interface-dms/db");
 const tenant_provisioning_1 = require("@antelopejs/interface-dms/tenant-provisioning");
+const config_1 = require("../config");
+const NO_REVISION = { kind: "missing" };
 function buildDefaultTenant() {
     const now = new Date();
     return {
@@ -24,21 +29,134 @@ async function ensureDefaultTenantExists() {
         logging_1.Logging.Info(`Default tenant '${constants_1.DEFAULT_TENANT_ID}' already exists.`);
         return false;
     }
-    await tenants.insert(buildDefaultTenant());
+    try {
+        await tenants.insert(buildDefaultTenant());
+    }
+    catch (error) {
+        if (!(await tenants.get(constants_1.DEFAULT_TENANT_ID)))
+            throw error;
+        logging_1.Logging.Info(`Default tenant '${constants_1.DEFAULT_TENANT_ID}' already exists.`);
+        return false;
+    }
     logging_1.Logging.Info(`Default tenant '${constants_1.DEFAULT_TENANT_ID}' created.`);
     return true;
 }
-async function provisionDefaultTenant() {
-    try {
-        const tenants = (0, interface_database_decorators_1.GetModel)(db_1.TenantModel);
-        const tenant = await tenants.get(constants_1.DEFAULT_TENANT_ID);
-        if (!tenant?.provisioningPending)
+async function swapLease(expected, patch) {
+    const tenants = (0, interface_database_decorators_1.GetModel)(db_1.TenantModel);
+    const next = (0, node_crypto_1.randomUUID)();
+    const outcome = await tenants.table
+        .atomicMutation(constants_1.DEFAULT_TENANT_ID, {
+        type: "update",
+        revisionField: "provisioningRevision",
+        expectedRevision: expected,
+        nextRevision: next,
+        patch,
+    })
+        .run();
+    if (outcome === "applied")
+        return next;
+    if (outcome === "not-applied")
+        return undefined;
+    const stored = await tenants.get(constants_1.DEFAULT_TENANT_ID);
+    return stored?.provisioningRevision === next ? next : undefined;
+}
+function holdLease(claimed, renewEveryMs) {
+    let token = claimed;
+    let renewal = Promise.resolve();
+    const renew = async () => {
+        if (!token)
             return;
+        try {
+            const next = await swapLease(token, {});
+            if (next) {
+                token = next;
+                return;
+            }
+            const stored = await (0, interface_database_decorators_1.GetModel)(db_1.TenantModel).get(constants_1.DEFAULT_TENANT_ID);
+            if (stored?.provisioningRevision !== token)
+                token = undefined;
+        }
+        catch (error) {
+            logging_1.Logging.Warn(`Default tenant '${constants_1.DEFAULT_TENANT_ID}' lease renewal failed:`, error);
+        }
+    };
+    const timer = setInterval(() => {
+        renewal = renewal.then(renew);
+    }, renewEveryMs);
+    return {
+        async stopRenewing() {
+            clearInterval(timer);
+            await renewal;
+            return token;
+        },
+    };
+}
+async function provisionUnderLease(claimed, renewEveryMs) {
+    const lease = holdLease(claimed, renewEveryMs);
+    let failure;
+    try {
         await (0, tenant_provisioning_1.ProvisionTenant)({ tenantId: constants_1.DEFAULT_TENANT_ID, extras: {} });
-        await tenants.update(constants_1.DEFAULT_TENANT_ID, { provisioningPending: false });
     }
     catch (error) {
-        logging_1.Logging.Error(`Default tenant '${constants_1.DEFAULT_TENANT_ID}' provisioning failed:`, error);
+        failure = { error };
+    }
+    const token = await lease.stopRenewing();
+    if (failure) {
+        logging_1.Logging.Error(`Default tenant '${constants_1.DEFAULT_TENANT_ID}' provisioning failed:`, failure.error);
+    }
+    const finished = token &&
+        (await swapLease(token, {
+            provisioningHolder: null,
+            provisioningPending: failure !== undefined,
+        }));
+    if (!finished) {
+        logging_1.Logging.Warn(`Default tenant '${constants_1.DEFAULT_TENANT_ID}' provisioning lease was lost; another replica took over.`);
+    }
+    return finished !== undefined || failure !== undefined;
+}
+function createStaleWatch(staleAfterMs) {
+    let seen;
+    return {
+        forget() {
+            seen = undefined;
+        },
+        isStale(revision) {
+            const now = performance.now();
+            if (seen?.revision !== revision)
+                seen = undefined;
+            seen ??= { revision, at: now };
+            return now - seen.at >= staleAfterMs;
+        },
+    };
+}
+async function advanceLease(watch, renewEveryMs) {
+    const tenant = await (0, interface_database_decorators_1.GetModel)(db_1.TenantModel).get(constants_1.DEFAULT_TENANT_ID);
+    if (!tenant?.provisioningPending)
+        return true;
+    const stale = watch.isStale(tenant.provisioningRevision);
+    if (tenant.provisioningHolder && !stale)
+        return false;
+    const claimed = await swapLease(tenant.provisioningRevision ?? NO_REVISION, {
+        provisioningHolder: holderName(),
+    });
+    return claimed !== undefined && provisionUnderLease(claimed, renewEveryMs);
+}
+function holderName() {
+    return `${(0, node_os_1.hostname)()}:${process.pid}`;
+}
+async function provisionDefaultTenant(signal = new AbortController().signal, lease = (0, config_1.getProvisioningLeaseConfig)()) {
+    const { renewEveryMs, staleAfterMs, pollEveryMs } = lease;
+    const watch = createStaleWatch(staleAfterMs);
+    while (!signal.aborted) {
+        try {
+            if (await advanceLease(watch, renewEveryMs))
+                return;
+        }
+        catch (error) {
+            watch.forget();
+            logging_1.Logging.Warn(`Default tenant '${constants_1.DEFAULT_TENANT_ID}' provisioning lease check failed:`, error);
+        }
+        await (0, promises_1.setTimeout)(pollEveryMs, undefined, { signal }).catch(() => undefined);
     }
 }
 //# sourceMappingURL=ensure-default-tenant.js.map

package/dist/utils/ensure-default-tenant.js.map

@@ -1 +1 @@
-{"version":3,"file":"ensure-default-tenant.js","sourceRoot":"","sources":["../../src/utils/ensure-default-tenant.ts"],"names":[],"mappings":";;AA0BA,8DAWC;AAUD,wDAcC;AA7DD,gEAA6D;AAC7D,6FAAqE;AACrE,mEAG6C;AAC7C,qDAAwE;AACxE,uFAAgF;AAEhF,SAAS,kBAAkB;IACzB,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IACvB,OAAO;QACL,GAAG,EAAE,6BAAiB;QACtB,IAAI,EAAE,+BAAmB;QACzB,mBAAmB,EAAE,IAAI;QACzB,SAAS,EAAE,GAAG;QACd,SAAS,EAAE,GAAG;KACf,CAAC;AACJ,CAAC;AAQM,KAAK,UAAU,yBAAyB;IAC7C,MAAM,OAAO,GAAG,IAAA,wCAAQ,EAAC,gBAAW,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,6BAAiB,CAAC,CAAC;IACtD,IAAI,QAAQ,EAAE,CAAC;QACb,iBAAO,CAAC,IAAI,CAAC,mBAAmB,6BAAiB,mBAAmB,CAAC,CAAC;QACtE,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC;IAC3C,iBAAO,CAAC,IAAI,CAAC,mBAAmB,6BAAiB,YAAY,CAAC,CAAC;IAC/D,OAAO,IAAI,CAAC;AACd,CAAC;AAUM,KAAK,UAAU,sBAAsB;IAC1C,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,IAAA,wCAAQ,EAAC,gBAAW,CAAC,CAAC;QACtC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,6BAAiB,CAAC,CAAC;QACpD,IAAI,CAAC,MAAM,EAAE,mBAAmB;YAAE,OAAO;QAEzC,MAAM,IAAA,qCAAe,EAAC,EAAE,QAAQ,EAAE,6BAAiB,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;QACnE,MAAM,OAAO,CAAC,MAAM,CAAC,6BAAiB,EAAE,EAAE,mBAAmB,EAAE,KAAK,EAAE,CAAC,CAAC;IAC1E,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,iBAAO,CAAC,KAAK,CACX,mBAAmB,6BAAiB,wBAAwB,EAC5D,KAAK,CACN,CAAC;IACJ,CAAC;AACH,CAAC"}
+{"version":3,"file":"ensure-default-tenant.js","sourceRoot":"","sources":["../../src/utils/ensure-default-tenant.ts"],"names":[],"mappings":"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"}

package/dist/validation/onboarding/register-admin.schema.d.ts

@@ -4,6 +4,7 @@ export declare const onboardingRegisterAdminSchema: z.ZodEffects<z.ZodObject<{
     firstName: z.ZodPipeline<z.ZodEffects<z.ZodString, string, string>, z.ZodString>;
     lastName: z.ZodPipeline<z.ZodEffects<z.ZodString, string, string>, z.ZodString>;
     password: z.ZodString;
+    setupToken: z.ZodOptional<z.ZodString>;
     platformName: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
     language: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
@@ -13,6 +14,7 @@ export declare const onboardingRegisterAdminSchema: z.ZodEffects<z.ZodObject<{
     lastName: string;
     language?: string | undefined;
     platformName?: string | undefined;
+    setupToken?: string | undefined;
 }, {
     email: string;
     password: string;
@@ -20,10 +22,12 @@ export declare const onboardingRegisterAdminSchema: z.ZodEffects<z.ZodObject<{
     lastName: string;
     language?: string | undefined;
     platformName?: string | undefined;
+    setupToken?: string | undefined;
 }>, {
     email: string;
     name: string;
     password: string;
+    setupToken: string | undefined;
     platformName: string | undefined;
     language: string | undefined;
 }, {
@@ -33,5 +37,6 @@ export declare const onboardingRegisterAdminSchema: z.ZodEffects<z.ZodObject<{
     lastName: string;
     language?: string | undefined;
     platformName?: string | undefined;
+    setupToken?: string | undefined;
 }>;
 export type OnboardingRegisterAdmin = z.output<typeof onboardingRegisterAdminSchema>;

package/dist/validation/onboarding/register-admin.schema.js

@@ -43,6 +43,7 @@ const password_1 = require("../password");
 const MAX_NAME_PART_LENGTH = 100;
 const MAX_PLATFORM_NAME_LENGTH = 120;
 const MAX_LANGUAGE_TAG_LENGTH = 35;
+const MAX_SETUP_TOKEN_LENGTH = 256;
 const LANGUAGE_TAG_PATTERN = /^[A-Za-z]{2,3}(?:-[A-Za-z0-9]{2,8})*$/;
 function withoutTags(value) {
     return (0, striptags_1.default)(value).trim();
@@ -58,6 +59,7 @@ exports.onboardingRegisterAdminSchema = z
     firstName: namePartSchema,
     lastName: namePartSchema,
     password: password_1.passwordSchema,
+    setupToken: z.string().max(MAX_SETUP_TOKEN_LENGTH).optional(),
     platformName: z
         .string()
         .max(MAX_PLATFORM_NAME_LENGTH)
@@ -73,6 +75,7 @@ exports.onboardingRegisterAdminSchema = z
     email: (0, striptags_1.default)(data.email),
     name: `${data.firstName} ${data.lastName}`,
     password: data.password,
+    setupToken: data.setupToken,
     platformName: data.platformName || undefined,
     language: data.language,
 }));

package/dist/validation/onboarding/register-admin.schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"register-admin.schema.js","sourceRoot":"","sources":["../../../src/validation/onboarding/register-admin.schema.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAAkC;AAClC,uCAAyB;AAEzB,0CAA6C;AAE7C,MAAM,oBAAoB,GAAG,GAAG,CAAC;AACjC,MAAM,wBAAwB,GAAG,GAAG,CAAC;AACrC,MAAM,uBAAuB,GAAG,EAAE,CAAC;AACnC,MAAM,oBAAoB,GAAG,uCAAuC,CAAC;AAErE,SAAS,WAAW,CAAC,KAAa;IAChC,OAAO,IAAA,mBAAS,EAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;AACjC,CAAC;AAGD,MAAM,cAAc,GAAG,CAAC;KACrB,MAAM,EAAE;KACR,GAAG,CAAC,oBAAoB,CAAC;KACzB,SAAS,CAAC,WAAW,CAAC;KACtB,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AAOd,QAAA,6BAA6B,GAAG,CAAC;KAC3C,MAAM,CAAC;IACN,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE;IAChC,SAAS,EAAE,cAAc;IACzB,QAAQ,EAAE,cAAc;IACxB,QAAQ,EAAE,yBAAc;IACxB,YAAY,EAAE,CAAC;SACZ,MAAM,EAAE;SACR,GAAG,CAAC,wBAAwB,CAAC;SAC7B,SAAS,CAAC,WAAW,CAAC;SACtB,QAAQ,EAAE;IACb,QAAQ,EAAE,CAAC;SACR,MAAM,EAAE;SACR,GAAG,CAAC,uBAAuB,CAAC;SAC5B,KAAK,CAAC,oBAAoB,CAAC;SAC3B,QAAQ,EAAE;CACd,CAAC;KACD,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACpB,KAAK,EAAE,IAAA,mBAAS,EAAC,IAAI,CAAC,KAAK,CAAC;IAC5B,IAAI,EAAE,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,QAAQ,EAAE;IAC1C,QAAQ,EAAE,IAAI,CAAC,QAAQ;IACvB,YAAY,EAAE,IAAI,CAAC,YAAY,IAAI,SAAS;IAC5C,QAAQ,EAAE,IAAI,CAAC,QAAQ;CACxB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"register-admin.schema.js","sourceRoot":"","sources":["../../../src/validation/onboarding/register-admin.schema.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAAkC;AAClC,uCAAyB;AAEzB,0CAA6C;AAE7C,MAAM,oBAAoB,GAAG,GAAG,CAAC;AACjC,MAAM,wBAAwB,GAAG,GAAG,CAAC;AACrC,MAAM,uBAAuB,GAAG,EAAE,CAAC;AACnC,MAAM,sBAAsB,GAAG,GAAG,CAAC;AACnC,MAAM,oBAAoB,GAAG,uCAAuC,CAAC;AAErE,SAAS,WAAW,CAAC,KAAa;IAChC,OAAO,IAAA,mBAAS,EAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;AACjC,CAAC;AAGD,MAAM,cAAc,GAAG,CAAC;KACrB,MAAM,EAAE;KACR,GAAG,CAAC,oBAAoB,CAAC;KACzB,SAAS,CAAC,WAAW,CAAC;KACtB,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AAQd,QAAA,6BAA6B,GAAG,CAAC;KAC3C,MAAM,CAAC;IACN,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE;IAChC,SAAS,EAAE,cAAc;IACzB,QAAQ,EAAE,cAAc;IACxB,QAAQ,EAAE,yBAAc;IACxB,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC,QAAQ,EAAE;IAC7D,YAAY,EAAE,CAAC;SACZ,MAAM,EAAE;SACR,GAAG,CAAC,wBAAwB,CAAC;SAC7B,SAAS,CAAC,WAAW,CAAC;SACtB,QAAQ,EAAE;IACb,QAAQ,EAAE,CAAC;SACR,MAAM,EAAE;SACR,GAAG,CAAC,uBAAuB,CAAC;SAC5B,KAAK,CAAC,oBAAoB,CAAC;SAC3B,QAAQ,EAAE;CACd,CAAC;KACD,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACpB,KAAK,EAAE,IAAA,mBAAS,EAAC,IAAI,CAAC,KAAK,CAAC;IAC5B,IAAI,EAAE,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,QAAQ,EAAE;IAC1C,QAAQ,EAAE,IAAI,CAAC,QAAQ;IACvB,UAAU,EAAE,IAAI,CAAC,UAAU;IAC3B,YAAY,EAAE,IAAI,CAAC,YAAY,IAAI,SAAS;IAC5C,QAAQ,EAAE,IAAI,CAAC,QAAQ;CACxB,CAAC,CAAC,CAAC"}

package/frontend-vue/layers/dms-core/app/utils/formatter.ts

@@ -271,6 +271,20 @@ export function formatNumber(
   }
 }
 
+const CURRENCY_CODE = /^[A-Za-z]{3}$/;
+
+/**
+ * The currency an amount is written in: `options.currency` when it is an
+ * ISO 4217 code, euros otherwise (a missing or malformed code never turns the
+ * amount into a bare number).
+ */
+function priceCurrency(options: Intl.NumberFormatOptions | undefined): string {
+  const code = options?.currency;
+  return typeof code === "string" && CURRENCY_CODE.test(code)
+    ? code.toUpperCase()
+    : DEFAULT_CURRENCY;
+}
+
 /** An amount, in euros unless `options.currency` says otherwise. */
 export function formatPrice(
   value: number,
@@ -289,10 +303,10 @@ export function formatPrice(
 ): Parameters<typeof isNumber>[0] {
   return formatNumber(value, locale, {
     style: "currency",
-    currency: DEFAULT_CURRENCY,
     minimumFractionDigits: DEFAULT_PRICE_FRACTION_DIGITS,
     maximumFractionDigits: DEFAULT_PRICE_FRACTION_DIGITS,
     ...options,
+    currency: priceCurrency(options),
   });
 }
 

package/frontend-vue/layers/dms-core/i18n/locales/core-en-GB.json

@@ -64,6 +64,7 @@
     "invite_used": "This invitation was already used. Please log in.",
     "onboarding_already_completed": "Onboarding already completed.",
     "admin_already_set": "An administrator account already exists.",
+    "invalid_setup_token": "The setup token is missing or wrong. Use the address in the server log, or the value of DMS_SETUP_TOKEN.",
     "user_creation_failed": "The user account could not be created. Please try again.",
     "settings_not_found": "General settings not found.",
     "token_expired": "The validation code has expired.",

package/frontend-vue/layers/dms-core/i18n/locales/core-fr-FR.json

@@ -64,6 +64,7 @@
     "invite_used": "Cette invitation a déjà été utilisée. Veuillez vous connecter.",
     "onboarding_already_completed": "L'onboarding a déjà été completé.",
     "admin_already_set": "Un compte administrateur existe déjà.",
+    "invalid_setup_token": "Le jeton d'installation est absent ou incorrect. Utilisez l'adresse affichée dans les logs du serveur, ou la valeur de DMS_SETUP_TOKEN.",
     "user_creation_failed": "Le compte utilisateur n'a pas pu être créé. Veuillez réessayer.",
     "settings_not_found": "Les paramètres généraux n'ont pas été trouvés.",
     "token_expired": "Le code de validation a expiré.",

package/frontend-vue/layers/dms-core/shared/types/app-config.ts

@@ -14,6 +14,11 @@ export interface DmsLogoSources {
 
 /** The logos of an instance, one per place it is drawn. */
 export interface DmsBrandingLogo {
+  /**
+   * The name a screen reader announces for the logo: the application's name.
+   * Set it with a logo of your own.
+   */
+  alt?: string;
   /** The expanded sidebar and the auth pages. */
   default: DmsLogoSources;
   /** The icon-only sidebar. */

package/frontend-vue/layers/dms-layout/app/app.config.ts

@@ -30,6 +30,7 @@ function dmsColors(): DmsUiColors {
 
 function dmsLogo(): DmsBrandingLogo {
   return {
+    alt: "Antelope DMS",
     default: {
       light: "/images/antelope-logo/light.svg",
       dark: "/images/antelope-logo/dark.svg",