@terreno/api 57.1.0 → 57.3.0
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/README.md +17 -7
- package/dist/actions.js +19 -7
- package/dist/adminTypes.d.ts +26 -0
- package/dist/api.d.ts +4 -0
- package/dist/api.js +12 -24
- package/dist/auth.d.ts +23 -10
- package/dist/auth.js +97 -32
- package/dist/authRecovery.d.ts +5 -0
- package/dist/authRecovery.js +350 -0
- package/dist/authTokens.d.ts +8 -0
- package/dist/authTokens.js +162 -0
- package/dist/betterAuth.d.ts +33 -0
- package/dist/betterAuthApp.d.ts +4 -0
- package/dist/betterAuthApp.js +26 -8
- package/dist/betterAuthSetup.d.ts +44 -2
- package/dist/betterAuthSetup.js +288 -18
- package/dist/collectionRegistry.d.ts +38 -0
- package/dist/collectionRegistry.js +72 -0
- package/dist/configurationApp.d.ts +11 -2
- package/dist/configurationApp.js +2 -4
- package/dist/docLoader.js +35 -6
- package/dist/expressServer.d.ts +26 -3
- package/dist/expressServer.js +79 -11
- package/dist/index.d.ts +16 -0
- package/dist/index.js +38 -2
- package/dist/mcp/auth.d.ts +1 -0
- package/dist/mcp/auth.js +47 -25
- package/dist/mcp/handlers.d.ts +1 -1
- package/dist/mcp/handlers.js +67 -233
- package/dist/mcp/query.d.ts +2 -2
- package/dist/mcp/registry.d.ts +1 -5
- package/dist/mcp/registry.js +31 -20
- package/dist/mcp/schemaGenerator.d.ts +2 -7
- package/dist/mcp/schemaGenerator.js +41 -116
- package/dist/mcp/server.d.ts +1 -0
- package/dist/mcp/server.js +1 -0
- package/dist/mcp/serviceTokens.d.ts +16 -0
- package/dist/mcp/serviceTokens.js +345 -0
- package/dist/mcp/types.d.ts +2 -2
- package/dist/models/mcpServiceToken.d.ts +3 -0
- package/dist/models/mcpServiceToken.js +208 -0
- package/dist/openApiBuilder.d.ts +5 -4
- package/dist/openApiBuilder.js +61 -8
- package/dist/openApiCompat.js +1 -1
- package/dist/openApiValidator.js +0 -2
- package/dist/plugins.d.ts +14 -1
- package/dist/plugins.js +17 -6
- package/dist/populate.d.ts +2 -2
- package/dist/populate.js +47 -42
- package/dist/rateLimit/applyTrustProxy.d.ts +3 -0
- package/dist/rateLimit/applyTrustProxy.js +17 -0
- package/dist/rateLimit/createStore.d.ts +2 -0
- package/dist/rateLimit/createStore.js +28 -0
- package/dist/rateLimit/memoryStore.d.ts +2 -0
- package/dist/rateLimit/memoryStore.js +108 -0
- package/dist/rateLimit/middleware.d.ts +11 -0
- package/dist/rateLimit/middleware.js +110 -0
- package/dist/rateLimit/mongoStore.d.ts +3 -0
- package/dist/rateLimit/mongoStore.js +122 -0
- package/dist/rateLimit/policies.d.ts +14 -0
- package/dist/rateLimit/policies.js +151 -0
- package/dist/rateLimit/redisStore.d.ts +3 -0
- package/dist/rateLimit/redisStore.js +155 -0
- package/dist/rateLimit/types.d.ts +54 -0
- package/dist/rateLimit/types.js +9 -0
- package/dist/rbac/access.js +5 -1
- package/dist/rbac/assertAllowed.d.ts +9 -0
- package/dist/rbac/assertAllowed.js +182 -0
- package/dist/rbac/modelRouterAccess.d.ts +1 -0
- package/dist/rbac/modelRouterAccess.js +8 -4
- package/dist/rbac/permissionUtils.js +3 -2
- package/dist/rbac/resolve.js +5 -4
- package/dist/rbac/routes.js +15 -6
- package/dist/rbac/statements.d.ts +10 -0
- package/dist/rbac/statements.js +13 -2
- package/dist/realtime/deprecation.d.ts +12 -0
- package/dist/realtime/deprecation.js +32 -0
- package/dist/realtime/realtimeApp.d.ts +1 -1
- package/dist/realtime/realtimeApp.js +10 -11
- package/dist/realtime/registry.d.ts +0 -31
- package/dist/realtime/registry.js +44 -31
- package/dist/realtime/socketAuth.d.ts +5 -5
- package/dist/realtime/socketAuth.js +11 -1
- package/dist/realtime/socketUser.d.ts +5 -1
- package/dist/realtime/types.d.ts +14 -4
- package/dist/schemaMetadata.d.ts +56 -0
- package/dist/schemaMetadata.js +513 -0
- package/dist/seedRunner.d.ts +88 -0
- package/dist/seedRunner.js +627 -0
- package/dist/sync/executors.d.ts +12 -2
- package/dist/sync/executors.js +8 -10
- package/dist/sync/loadHarness.js +28 -19
- package/dist/sync/models.js +26 -24
- package/dist/sync/mutationHandler.d.ts +9 -0
- package/dist/sync/mutationHandler.js +11 -6
- package/dist/sync/registrationSideEffects.d.ts +35 -0
- package/dist/sync/registrationSideEffects.js +151 -0
- package/dist/sync/registry.d.ts +2 -52
- package/dist/sync/registry.js +38 -187
- package/dist/sync/routes.js +3 -2
- package/dist/sync/scripts/compactTombstones.js +0 -2
- package/dist/sync/syncApp.d.ts +3 -3
- package/dist/sync/syncApp.js +4 -4
- package/dist/sync/syncBatch.js +3 -2
- package/dist/sync/syncSeqPlugin.d.ts +1 -1
- package/dist/sync/syncSeqPlugin.js +20 -16
- package/dist/terrenoApp.d.ts +19 -5
- package/dist/terrenoApp.js +66 -18
- package/dist/tests/models.d.ts +2 -0
- package/dist/tests/models.js +6 -0
- package/dist/types/authToken.d.ts +33 -0
- package/dist/types/authToken.js +2 -0
- package/dist/types/mcpServiceToken.d.ts +41 -0
- package/dist/types/mcpServiceToken.js +2 -0
- package/dist/webhooks/headerValue.d.ts +2 -0
- package/dist/webhooks/headerValue.js +14 -0
- package/dist/webhooks/idempotency/memoryStore.d.ts +10 -0
- package/dist/webhooks/idempotency/memoryStore.js +65 -0
- package/dist/webhooks/idempotency/mongoStore.d.ts +4 -0
- package/dist/webhooks/idempotency/mongoStore.js +150 -0
- package/dist/webhooks/idempotency/webhookReceipt.d.ts +62 -0
- package/dist/webhooks/idempotency/webhookReceipt.js +39 -0
- package/dist/webhooks/rawBody.d.ts +14 -0
- package/dist/webhooks/rawBody.js +22 -0
- package/dist/webhooks/timingSafeEqual.d.ts +4 -0
- package/dist/webhooks/timingSafeEqual.js +17 -0
- package/dist/webhooks/verifiers/hmac.d.ts +15 -0
- package/dist/webhooks/verifiers/hmac.js +49 -0
- package/dist/webhooks/verifiers/sendgrid.d.ts +10 -0
- package/dist/webhooks/verifiers/sendgrid.js +56 -0
- package/dist/webhooks/verifiers/stripe.d.ts +9 -0
- package/dist/webhooks/verifiers/stripe.js +99 -0
- package/dist/webhooks/verifiers/twilio.d.ts +9 -0
- package/dist/webhooks/verifiers/twilio.js +112 -0
- package/dist/webhooks/webhooksApp.d.ts +33 -0
- package/dist/webhooks/webhooksApp.js +195 -0
- package/package.json +5 -6
- package/src/__snapshots__/openApi.test.ts.snap +270 -0
- package/src/__snapshots__/openApiBuilder.test.ts.snap +30 -12
- package/src/__snapshots__/schemaMetadata.test.ts.snap +197 -0
- package/src/actions.ts +20 -13
- package/src/adminModelRouter.test.ts +133 -0
- package/src/adminTypes.ts +23 -0
- package/src/api.arrayOperations.test.ts +43 -31
- package/src/api.hooks.test.ts +38 -29
- package/src/api.query.test.ts +31 -31
- package/src/api.test.ts +95 -96
- package/src/api.ts +16 -27
- package/src/auth.test.ts +107 -51
- package/src/auth.ts +98 -29
- package/src/authRecovery.test.ts +281 -0
- package/src/authRecovery.ts +279 -0
- package/src/authTokens.test.ts +94 -0
- package/src/authTokens.ts +118 -0
- package/src/authVerification.test.ts +293 -0
- package/src/betterAuth.ts +24 -0
- package/src/betterAuthApp.test.ts +1 -0
- package/src/betterAuthApp.ts +27 -9
- package/src/betterAuthSetup.test.ts +568 -38
- package/src/betterAuthSetup.ts +260 -5
- package/src/collectionRegistry.test.ts +165 -0
- package/src/collectionRegistry.ts +115 -0
- package/src/configurationApp.ts +13 -7
- package/src/docLoader.test.ts +45 -1
- package/src/docLoader.ts +37 -6
- package/src/express.d.ts +1 -0
- package/src/expressServer.test.ts +130 -66
- package/src/expressServer.ts +75 -19
- package/src/githubAuth.test.ts +60 -55
- package/src/index.ts +58 -0
- package/src/mcp/auth.test.ts +47 -0
- package/src/mcp/auth.ts +32 -11
- package/src/mcp/handlers.ts +45 -172
- package/src/mcp/integration.test.ts +59 -9
- package/src/mcp/query.ts +2 -4
- package/src/mcp/registry.ts +29 -20
- package/src/mcp/schemaGenerator.test.ts +8 -0
- package/src/mcp/schemaGenerator.ts +49 -131
- package/src/mcp/server.ts +2 -0
- package/src/mcp/serviceTokens.test.ts +330 -0
- package/src/mcp/serviceTokens.ts +307 -0
- package/src/mcp/toolGenerator.test.ts +1 -1
- package/src/mcp/types.ts +2 -6
- package/src/models/mcpServiceToken.test.ts +129 -0
- package/src/models/mcpServiceToken.ts +158 -0
- package/src/openApi.test.ts +80 -64
- package/src/openApiBuilder.test.ts +95 -7
- package/src/openApiBuilder.ts +46 -9
- package/src/openApiCompat.ts +1 -1
- package/src/openApiValidator.test.ts +49 -54
- package/src/openApiValidator.ts +1 -3
- package/src/plugins.test.ts +14 -0
- package/src/plugins.ts +34 -9
- package/src/populate.test.ts +34 -0
- package/src/populate.ts +40 -29
- package/src/rateLimit/applyTrustProxy.ts +17 -0
- package/src/rateLimit/createStore.ts +25 -0
- package/src/rateLimit/memoryStore.ts +40 -0
- package/src/rateLimit/middleware.ts +79 -0
- package/src/rateLimit/mongoStore.test.ts +80 -0
- package/src/rateLimit/mongoStore.ts +76 -0
- package/src/rateLimit/policies.ts +130 -0
- package/src/rateLimit/rateLimit.test.ts +328 -0
- package/src/rateLimit/redisStore.ioredis.test.ts +29 -0
- package/src/rateLimit/redisStore.test.ts +114 -0
- package/src/rateLimit/redisStore.ts +85 -0
- package/src/rateLimit/types.ts +64 -0
- package/src/rbac/access.ts +5 -1
- package/src/rbac/assertAllowed.test.ts +325 -0
- package/src/rbac/assertAllowed.ts +157 -0
- package/src/rbac/backfillAdmins.test.ts +124 -0
- package/src/rbac/fieldViews.test.ts +89 -0
- package/src/rbac/modelRouterAccess.test.ts +126 -0
- package/src/rbac/modelRouterAccess.ts +5 -2
- package/src/rbac/permissionUtils.ts +3 -2
- package/src/rbac/realtimeAccess.test.ts +109 -1
- package/src/rbac/resolve.ts +5 -4
- package/src/rbac/roleManager.test.ts +169 -0
- package/src/rbac/routes.test.ts +233 -0
- package/src/rbac/routes.ts +16 -6
- package/src/rbac/statements.test.ts +2 -0
- package/src/rbac/statements.ts +12 -1
- package/src/realtime/deprecation.test.ts +60 -0
- package/src/realtime/deprecation.ts +32 -0
- package/src/realtime/realtime.test.ts +8 -4
- package/src/realtime/realtimeApp.ts +10 -11
- package/src/realtime/realtimeAppSetup.test.ts +32 -5
- package/src/realtime/registry.ts +48 -42
- package/src/realtime/sessionRevalidation.test.ts +57 -44
- package/src/realtime/socketAuth.test.ts +75 -23
- package/src/realtime/socketAuth.ts +17 -6
- package/src/realtime/socketUser.ts +5 -3
- package/src/realtime/types.ts +14 -4
- package/src/schemaMetadata.test.ts +405 -0
- package/src/schemaMetadata.ts +593 -0
- package/src/scrubAdminFields.test.ts +105 -0
- package/src/seedRunner.test.ts +591 -0
- package/src/seedRunner.ts +464 -0
- package/src/sync/docMatchesMutationData.test.ts +16 -0
- package/src/sync/ensureSyncIndexes.test.ts +54 -15
- package/src/sync/executors.test.ts +40 -0
- package/src/sync/executors.ts +24 -12
- package/src/sync/integration.test.ts +15 -7
- package/src/sync/loadHarness.ts +28 -19
- package/src/sync/models.ts +32 -18
- package/src/sync/mutationHandler.test.ts +16 -16
- package/src/sync/mutationHandler.ts +9 -7
- package/src/sync/registrationSideEffects.test.ts +126 -0
- package/src/sync/registrationSideEffects.ts +131 -0
- package/src/sync/registry.ts +45 -171
- package/src/sync/routes.ts +3 -2
- package/src/sync/scripts/compactTombstones.ts +0 -2
- package/src/sync/sessionRevalidationIntegration.test.ts +12 -11
- package/src/sync/sync.test.ts +25 -23
- package/src/sync/syncApp.ts +4 -4
- package/src/sync/syncBatch.ts +3 -2
- package/src/sync/syncFrontier.test.ts +17 -15
- package/src/sync/syncPhaseC.test.ts +54 -43
- package/src/sync/syncRoutes.test.ts +51 -36
- package/src/sync/syncSeqPlugin.ts +66 -44
- package/src/sync/syncSocket.test.ts +112 -81
- package/src/terrenoApp.mcpServiceTokens.test.ts +173 -0
- package/src/terrenoApp.ts +87 -15
- package/src/tests/models.ts +14 -1
- package/src/types/authToken.ts +43 -0
- package/src/types/mcpServiceToken.ts +54 -0
- package/src/webhooks/headerValue.test.ts +22 -0
- package/src/webhooks/headerValue.ts +12 -0
- package/src/webhooks/idempotency/memoryStore.ts +34 -0
- package/src/webhooks/idempotency/mongoStore.test.ts +274 -0
- package/src/webhooks/idempotency/mongoStore.ts +83 -0
- package/src/webhooks/idempotency/webhookReceipt.ts +70 -0
- package/src/webhooks/rawBody.test.ts +74 -0
- package/src/webhooks/rawBody.ts +23 -0
- package/src/webhooks/timingSafeEqual.ts +16 -0
- package/src/webhooks/verifiers/hmac.test.ts +110 -0
- package/src/webhooks/verifiers/hmac.ts +54 -0
- package/src/webhooks/verifiers/providerVerifiers.test.ts +388 -0
- package/src/webhooks/verifiers/sendgrid.ts +59 -0
- package/src/webhooks/verifiers/stripe.ts +67 -0
- package/src/webhooks/verifiers/twilio.ts +69 -0
- package/src/webhooks/webhooksApp.test.ts +221 -0
- package/src/webhooks/webhooksApp.ts +144 -0
|
@@ -0,0 +1,350 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
12
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
|
|
13
|
+
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
14
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
|
+
function step(op) {
|
|
16
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
18
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
|
+
switch (op[0]) {
|
|
21
|
+
case 0: case 1: t = op; break;
|
|
22
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
23
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
24
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
25
|
+
default:
|
|
26
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
27
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
28
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
29
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
30
|
+
if (t[2]) _.ops.pop();
|
|
31
|
+
_.trys.pop(); continue;
|
|
32
|
+
}
|
|
33
|
+
op = body.call(thisArg, _);
|
|
34
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
35
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
39
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
40
|
+
};
|
|
41
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
42
|
+
exports.addAuthRecoveryRoutes = exports.sendVerificationEmail = void 0;
|
|
43
|
+
var express_1 = __importDefault(require("express"));
|
|
44
|
+
var api_1 = require("./api");
|
|
45
|
+
var auth_1 = require("./auth");
|
|
46
|
+
var authTokens_1 = require("./authTokens");
|
|
47
|
+
var errors_1 = require("./errors");
|
|
48
|
+
var logger_1 = require("./logger");
|
|
49
|
+
var openApiBuilder_1 = require("./openApiBuilder");
|
|
50
|
+
var plugins_1 = require("./plugins");
|
|
51
|
+
var RESET_PASSWORD_SUBJECT = "Reset your password";
|
|
52
|
+
var VERIFY_EMAIL_SUBJECT = "Verify your email";
|
|
53
|
+
var resetPasswordText = function (resetUrl) {
|
|
54
|
+
return "Reset your password using this link: ".concat(resetUrl);
|
|
55
|
+
};
|
|
56
|
+
var resetPasswordHtml = function (resetUrl) {
|
|
57
|
+
return "<p><a href=\"".concat(resetUrl, "\">Reset your password</a></p>");
|
|
58
|
+
};
|
|
59
|
+
var verifyEmailText = function (verifyUrl) {
|
|
60
|
+
return "Verify your email using this link: ".concat(verifyUrl);
|
|
61
|
+
};
|
|
62
|
+
var verifyEmailHtml = function (verifyUrl) {
|
|
63
|
+
return "<p><a href=\"".concat(verifyUrl, "\">Verify your email</a></p>");
|
|
64
|
+
};
|
|
65
|
+
var normalizeEmail = function (value) {
|
|
66
|
+
if (typeof value !== "string") {
|
|
67
|
+
return "";
|
|
68
|
+
}
|
|
69
|
+
return value.trim().toLowerCase();
|
|
70
|
+
};
|
|
71
|
+
var escapeRegularExpression = function (value) {
|
|
72
|
+
return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
|
73
|
+
};
|
|
74
|
+
var findUserByEmail = function (userModel, email) { return __awaiter(void 0, void 0, void 0, function () {
|
|
75
|
+
return __generator(this, function (_a) {
|
|
76
|
+
return [2 /*return*/, (0, plugins_1.findOneOrNoneFor)(userModel, {
|
|
77
|
+
email: { $options: "i", $regex: "^".concat(escapeRegularExpression(email), "$") },
|
|
78
|
+
})];
|
|
79
|
+
});
|
|
80
|
+
}); };
|
|
81
|
+
var passwordFromBody = function (body) {
|
|
82
|
+
if (typeof body.password === "string" && body.password.length > 0) {
|
|
83
|
+
return body.password;
|
|
84
|
+
}
|
|
85
|
+
if (typeof body.newPassword === "string" && body.newPassword.length > 0) {
|
|
86
|
+
return body.newPassword;
|
|
87
|
+
}
|
|
88
|
+
return "";
|
|
89
|
+
};
|
|
90
|
+
var tokenFromBody = function (body) {
|
|
91
|
+
if (typeof body.token === "string") {
|
|
92
|
+
return body.token;
|
|
93
|
+
}
|
|
94
|
+
return "";
|
|
95
|
+
};
|
|
96
|
+
var buildAppUrl = function (publicAppUrl, path, token) {
|
|
97
|
+
var base = (publicAppUrl !== null && publicAppUrl !== void 0 ? publicAppUrl : "").replace(/\/$/, "");
|
|
98
|
+
return "".concat(base).concat(path, "?token=").concat(encodeURIComponent(token));
|
|
99
|
+
};
|
|
100
|
+
var buildResetUrl = function (publicAppUrl, token) {
|
|
101
|
+
return buildAppUrl(publicAppUrl, "/resetPassword", token);
|
|
102
|
+
};
|
|
103
|
+
var buildVerifyUrl = function (publicAppUrl, token) {
|
|
104
|
+
return buildAppUrl(publicAppUrl, "/verifyEmail", token);
|
|
105
|
+
};
|
|
106
|
+
var userEmail = function (user, fallback) {
|
|
107
|
+
if (fallback === void 0) { fallback = ""; }
|
|
108
|
+
if (typeof user.email === "string") {
|
|
109
|
+
return user.email;
|
|
110
|
+
}
|
|
111
|
+
return fallback;
|
|
112
|
+
};
|
|
113
|
+
var isEmailVerified = function (user) {
|
|
114
|
+
return user.emailVerified === true;
|
|
115
|
+
};
|
|
116
|
+
var markEmailVerified = function (user) {
|
|
117
|
+
user.emailVerified = true;
|
|
118
|
+
};
|
|
119
|
+
var sendVerificationEmail = function (user, authOptions) { return __awaiter(void 0, void 0, void 0, function () {
|
|
120
|
+
var issued, verifyUrl;
|
|
121
|
+
return __generator(this, function (_a) {
|
|
122
|
+
switch (_a.label) {
|
|
123
|
+
case 0:
|
|
124
|
+
if (!(authOptions === null || authOptions === void 0 ? void 0 : authOptions.publicAppUrl)) {
|
|
125
|
+
logger_1.logger.error("[auth] publicAppUrl is required to send verification mail");
|
|
126
|
+
throw new errors_1.APIError({
|
|
127
|
+
status: 501,
|
|
128
|
+
title: "publicAppUrl is required to send verification mail",
|
|
129
|
+
});
|
|
130
|
+
}
|
|
131
|
+
if (isEmailVerified(user)) {
|
|
132
|
+
return [2 /*return*/];
|
|
133
|
+
}
|
|
134
|
+
return [4 /*yield*/, authTokens_1.AuthToken.issueFor({ _id: String(user._id) }, "emailVerification")];
|
|
135
|
+
case 1:
|
|
136
|
+
issued = _a.sent();
|
|
137
|
+
verifyUrl = buildVerifyUrl(authOptions.publicAppUrl, issued.token);
|
|
138
|
+
return [4 /*yield*/, deliverRecoveryMail(authOptions, {
|
|
139
|
+
html: verifyEmailHtml(verifyUrl),
|
|
140
|
+
subject: VERIFY_EMAIL_SUBJECT,
|
|
141
|
+
text: verifyEmailText(verifyUrl),
|
|
142
|
+
to: userEmail(user),
|
|
143
|
+
})];
|
|
144
|
+
case 2:
|
|
145
|
+
_a.sent();
|
|
146
|
+
return [2 /*return*/];
|
|
147
|
+
}
|
|
148
|
+
});
|
|
149
|
+
}); };
|
|
150
|
+
exports.sendVerificationEmail = sendVerificationEmail;
|
|
151
|
+
var deliverRecoveryMail = function (authOptions, message) { return __awaiter(void 0, void 0, void 0, function () {
|
|
152
|
+
return __generator(this, function (_a) {
|
|
153
|
+
switch (_a.label) {
|
|
154
|
+
case 0:
|
|
155
|
+
if (!(authOptions === null || authOptions === void 0 ? void 0 : authOptions.sendMail)) return [3 /*break*/, 2];
|
|
156
|
+
return [4 /*yield*/, authOptions.sendMail(message)];
|
|
157
|
+
case 1:
|
|
158
|
+
_a.sent();
|
|
159
|
+
return [2 /*return*/];
|
|
160
|
+
case 2:
|
|
161
|
+
if (process.env.NODE_ENV === "production") {
|
|
162
|
+
throw new errors_1.APIError({ status: 501, title: "Mail is not configured" });
|
|
163
|
+
}
|
|
164
|
+
logger_1.logger.info("[auth] Console recovery mail subject=".concat(message.subject, " textLength=").concat(message.text.length));
|
|
165
|
+
return [2 /*return*/];
|
|
166
|
+
}
|
|
167
|
+
});
|
|
168
|
+
}); };
|
|
169
|
+
var incrementTokenEpoch = function (user) {
|
|
170
|
+
var _a;
|
|
171
|
+
user.tokenEpoch = ((_a = user.tokenEpoch) !== null && _a !== void 0 ? _a : 0) + 1;
|
|
172
|
+
};
|
|
173
|
+
var addAuthRecoveryRoutes = function (app, userModel, authOptions) {
|
|
174
|
+
var forgotPassword = (0, api_1.asyncHandler)(function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
|
|
175
|
+
var email, user, issued, resetUrl, error_1;
|
|
176
|
+
var _a;
|
|
177
|
+
return __generator(this, function (_b) {
|
|
178
|
+
switch (_b.label) {
|
|
179
|
+
case 0:
|
|
180
|
+
email = normalizeEmail((_a = req.body) === null || _a === void 0 ? void 0 : _a.email);
|
|
181
|
+
if (!email) return [3 /*break*/, 8];
|
|
182
|
+
_b.label = 1;
|
|
183
|
+
case 1:
|
|
184
|
+
_b.trys.push([1, 7, , 8]);
|
|
185
|
+
return [4 /*yield*/, findUserByEmail(userModel, email)];
|
|
186
|
+
case 2:
|
|
187
|
+
user = _b.sent();
|
|
188
|
+
if (!user) return [3 /*break*/, 6];
|
|
189
|
+
if (!!(authOptions === null || authOptions === void 0 ? void 0 : authOptions.publicAppUrl)) return [3 /*break*/, 3];
|
|
190
|
+
logger_1.logger.error("[auth] publicAppUrl is required to send password reset mail");
|
|
191
|
+
return [3 /*break*/, 6];
|
|
192
|
+
case 3: return [4 /*yield*/, authTokens_1.AuthToken.issueFor({ _id: String(user._id) }, "passwordReset")];
|
|
193
|
+
case 4:
|
|
194
|
+
issued = _b.sent();
|
|
195
|
+
resetUrl = buildResetUrl(authOptions.publicAppUrl, issued.token);
|
|
196
|
+
return [4 /*yield*/, deliverRecoveryMail(authOptions, {
|
|
197
|
+
html: resetPasswordHtml(resetUrl),
|
|
198
|
+
subject: RESET_PASSWORD_SUBJECT,
|
|
199
|
+
text: resetPasswordText(resetUrl),
|
|
200
|
+
to: userEmail(user, email),
|
|
201
|
+
})];
|
|
202
|
+
case 5:
|
|
203
|
+
_b.sent();
|
|
204
|
+
_b.label = 6;
|
|
205
|
+
case 6: return [3 /*break*/, 8];
|
|
206
|
+
case 7:
|
|
207
|
+
error_1 = _b.sent();
|
|
208
|
+
logger_1.logger.error("[auth] Failed to send password reset mail", { error: error_1 });
|
|
209
|
+
return [3 /*break*/, 8];
|
|
210
|
+
case 8: return [2 /*return*/, res.status(202).json({ data: { ok: true } })];
|
|
211
|
+
}
|
|
212
|
+
});
|
|
213
|
+
}); });
|
|
214
|
+
var resetPassword = (0, api_1.asyncHandler)(function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
|
|
215
|
+
var body, token, password, consumed, user, tokens;
|
|
216
|
+
var _a;
|
|
217
|
+
return __generator(this, function (_b) {
|
|
218
|
+
switch (_b.label) {
|
|
219
|
+
case 0:
|
|
220
|
+
body = ((_a = req.body) !== null && _a !== void 0 ? _a : {});
|
|
221
|
+
token = tokenFromBody(body);
|
|
222
|
+
password = passwordFromBody(body);
|
|
223
|
+
if (!token || !password) {
|
|
224
|
+
throw new errors_1.APIError({ status: 400, title: "token and password are required" });
|
|
225
|
+
}
|
|
226
|
+
if (password.length > auth_1.MAX_PASSWORD_LENGTH) {
|
|
227
|
+
throw new errors_1.APIError({
|
|
228
|
+
status: 400,
|
|
229
|
+
title: "Password must be at most ".concat(auth_1.MAX_PASSWORD_LENGTH, " characters"),
|
|
230
|
+
});
|
|
231
|
+
}
|
|
232
|
+
return [4 /*yield*/, authTokens_1.AuthToken.consume(token, "passwordReset")];
|
|
233
|
+
case 1:
|
|
234
|
+
consumed = _b.sent();
|
|
235
|
+
if (!consumed) {
|
|
236
|
+
throw new errors_1.APIError({ status: 400, title: "Invalid or expired reset token" });
|
|
237
|
+
}
|
|
238
|
+
return [4 /*yield*/, userModel.findById(consumed.userId)];
|
|
239
|
+
case 2:
|
|
240
|
+
user = _b.sent();
|
|
241
|
+
if (!user) {
|
|
242
|
+
throw new errors_1.APIError({ status: 400, title: "Invalid or expired reset token" });
|
|
243
|
+
}
|
|
244
|
+
return [4 /*yield*/, (0, auth_1.setPasswordForUser)(user, password)];
|
|
245
|
+
case 3:
|
|
246
|
+
_b.sent();
|
|
247
|
+
incrementTokenEpoch(user);
|
|
248
|
+
return [4 /*yield*/, user.save()];
|
|
249
|
+
case 4:
|
|
250
|
+
_b.sent();
|
|
251
|
+
if (!(authOptions === null || authOptions === void 0 ? void 0 : authOptions.syncPasswordResetToBetterAuth)) return [3 /*break*/, 6];
|
|
252
|
+
return [4 /*yield*/, authOptions.syncPasswordResetToBetterAuth(user, password)];
|
|
253
|
+
case 5:
|
|
254
|
+
_b.sent();
|
|
255
|
+
_b.label = 6;
|
|
256
|
+
case 6: return [4 /*yield*/, (0, auth_1.generateTokens)(user, authOptions)];
|
|
257
|
+
case 7:
|
|
258
|
+
tokens = _b.sent();
|
|
259
|
+
return [2 /*return*/, res.json({
|
|
260
|
+
data: { refreshToken: tokens.refreshToken, token: tokens.token, userId: user._id },
|
|
261
|
+
})];
|
|
262
|
+
}
|
|
263
|
+
});
|
|
264
|
+
}); });
|
|
265
|
+
var forgotOpenApi = (0, openApiBuilder_1.createOpenApiBuilder)({})
|
|
266
|
+
.withTags(["auth"])
|
|
267
|
+
.withSummary("Request a password reset email")
|
|
268
|
+
.withRequestBody({ email: { type: "string" } })
|
|
269
|
+
.withResponse(202, { ok: { type: "boolean" } })
|
|
270
|
+
.build();
|
|
271
|
+
var resetOpenApi = (0, openApiBuilder_1.createOpenApiBuilder)({})
|
|
272
|
+
.withTags(["auth"])
|
|
273
|
+
.withSummary("Reset password with a one-time token")
|
|
274
|
+
.withRequestBody({
|
|
275
|
+
newPassword: { type: "string" },
|
|
276
|
+
password: { type: "string" },
|
|
277
|
+
token: { type: "string" },
|
|
278
|
+
})
|
|
279
|
+
.withResponse(200, {
|
|
280
|
+
refreshToken: { type: "string" },
|
|
281
|
+
token: { type: "string" },
|
|
282
|
+
userId: { type: "string" },
|
|
283
|
+
})
|
|
284
|
+
.build();
|
|
285
|
+
var sendVerification = (0, api_1.asyncHandler)(function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
|
|
286
|
+
var user;
|
|
287
|
+
return __generator(this, function (_a) {
|
|
288
|
+
switch (_a.label) {
|
|
289
|
+
case 0:
|
|
290
|
+
user = req.user;
|
|
291
|
+
if (!user) {
|
|
292
|
+
throw new errors_1.APIError({ status: 401, title: "Unauthorized" });
|
|
293
|
+
}
|
|
294
|
+
return [4 /*yield*/, (0, exports.sendVerificationEmail)(user, authOptions)];
|
|
295
|
+
case 1:
|
|
296
|
+
_a.sent();
|
|
297
|
+
return [2 /*return*/, res.status(202).json({ data: { ok: true } })];
|
|
298
|
+
}
|
|
299
|
+
});
|
|
300
|
+
}); });
|
|
301
|
+
var verifyEmail = (0, api_1.asyncHandler)(function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
|
|
302
|
+
var token, consumed, user;
|
|
303
|
+
var _a;
|
|
304
|
+
return __generator(this, function (_b) {
|
|
305
|
+
switch (_b.label) {
|
|
306
|
+
case 0:
|
|
307
|
+
token = tokenFromBody(((_a = req.body) !== null && _a !== void 0 ? _a : {}));
|
|
308
|
+
if (!token) {
|
|
309
|
+
throw new errors_1.APIError({ status: 400, title: "token is required" });
|
|
310
|
+
}
|
|
311
|
+
return [4 /*yield*/, authTokens_1.AuthToken.consume(token, "emailVerification")];
|
|
312
|
+
case 1:
|
|
313
|
+
consumed = _b.sent();
|
|
314
|
+
if (!consumed) {
|
|
315
|
+
throw new errors_1.APIError({ status: 400, title: "Invalid or expired verification token" });
|
|
316
|
+
}
|
|
317
|
+
return [4 /*yield*/, userModel.findById(consumed.userId)];
|
|
318
|
+
case 2:
|
|
319
|
+
user = _b.sent();
|
|
320
|
+
if (!user) {
|
|
321
|
+
throw new errors_1.APIError({ status: 400, title: "Invalid or expired verification token" });
|
|
322
|
+
}
|
|
323
|
+
markEmailVerified(user);
|
|
324
|
+
return [4 /*yield*/, user.save()];
|
|
325
|
+
case 3:
|
|
326
|
+
_b.sent();
|
|
327
|
+
return [2 /*return*/, res.json({ data: { ok: true } })];
|
|
328
|
+
}
|
|
329
|
+
});
|
|
330
|
+
}); });
|
|
331
|
+
var sendVerificationOpenApi = (0, openApiBuilder_1.createOpenApiBuilder)({})
|
|
332
|
+
.withTags(["auth"])
|
|
333
|
+
.withSummary("Send or resend an email verification link")
|
|
334
|
+
.withResponse(202, { ok: { type: "boolean" } })
|
|
335
|
+
.build();
|
|
336
|
+
var verifyEmailOpenApi = (0, openApiBuilder_1.createOpenApiBuilder)({})
|
|
337
|
+
.withTags(["auth"])
|
|
338
|
+
.withSummary("Verify email with a one-time token")
|
|
339
|
+
.withRequestBody({ token: { type: "string" } })
|
|
340
|
+
.withResponse(200, { ok: { type: "boolean" } })
|
|
341
|
+
.build();
|
|
342
|
+
var router = express_1.default.Router();
|
|
343
|
+
router.post("/forgotPassword", forgotOpenApi, forgotPassword);
|
|
344
|
+
router.post("/resetPassword", resetOpenApi, resetPassword);
|
|
345
|
+
router.post("/sendVerification", (0, auth_1.authenticateMiddleware)(), sendVerificationOpenApi, sendVerification);
|
|
346
|
+
router.post("/verifyEmail", verifyEmailOpenApi, verifyEmail);
|
|
347
|
+
app.use("/auth", router);
|
|
348
|
+
app.post("/resetPassword", resetOpenApi, resetPassword);
|
|
349
|
+
};
|
|
350
|
+
exports.addAuthRecoveryRoutes = addAuthRecoveryRoutes;
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { Duration } from "luxon";
|
|
2
|
+
import type { AuthTokenModel } from "./types/authToken";
|
|
3
|
+
export type { AuthTokenDocument, AuthTokenModel, AuthTokenType } from "./types/authToken";
|
|
4
|
+
export declare const AUTH_TOKEN_TTL: {
|
|
5
|
+
readonly emailVerification: Duration<true>;
|
|
6
|
+
readonly passwordReset: Duration<true>;
|
|
7
|
+
};
|
|
8
|
+
export declare const AuthToken: AuthTokenModel;
|
|
@@ -0,0 +1,162 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __assign = (this && this.__assign) || function () {
|
|
3
|
+
__assign = Object.assign || function(t) {
|
|
4
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
+
s = arguments[i];
|
|
6
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
+
t[p] = s[p];
|
|
8
|
+
}
|
|
9
|
+
return t;
|
|
10
|
+
};
|
|
11
|
+
return __assign.apply(this, arguments);
|
|
12
|
+
};
|
|
13
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
14
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
15
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
16
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
17
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
18
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
19
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
20
|
+
});
|
|
21
|
+
};
|
|
22
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
23
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
|
|
24
|
+
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
25
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
26
|
+
function step(op) {
|
|
27
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
28
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
29
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
30
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
31
|
+
switch (op[0]) {
|
|
32
|
+
case 0: case 1: t = op; break;
|
|
33
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
34
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
35
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
36
|
+
default:
|
|
37
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
38
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
39
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
40
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
41
|
+
if (t[2]) _.ops.pop();
|
|
42
|
+
_.trys.pop(); continue;
|
|
43
|
+
}
|
|
44
|
+
op = body.call(thisArg, _);
|
|
45
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
46
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
47
|
+
}
|
|
48
|
+
};
|
|
49
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
50
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
51
|
+
};
|
|
52
|
+
var _a;
|
|
53
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
54
|
+
exports.AuthToken = exports.AUTH_TOKEN_TTL = void 0;
|
|
55
|
+
var node_crypto_1 = require("node:crypto");
|
|
56
|
+
var luxon_1 = require("luxon");
|
|
57
|
+
var mongoose_1 = __importDefault(require("mongoose"));
|
|
58
|
+
var plugins_1 = require("./plugins");
|
|
59
|
+
exports.AUTH_TOKEN_TTL = {
|
|
60
|
+
emailVerification: luxon_1.Duration.fromObject({ hours: 24 }),
|
|
61
|
+
passwordReset: luxon_1.Duration.fromObject({ hours: 1 }),
|
|
62
|
+
};
|
|
63
|
+
var AUTH_TOKEN_TYPES = ["passwordReset", "emailVerification"];
|
|
64
|
+
var hashToken = function (token) { return (0, node_crypto_1.createHash)("sha256").update(token).digest("hex"); };
|
|
65
|
+
var authTokenSchema = new mongoose_1.default.Schema({
|
|
66
|
+
consumedAt: {
|
|
67
|
+
description: "When this token was consumed; unset until first successful consume",
|
|
68
|
+
type: Date,
|
|
69
|
+
},
|
|
70
|
+
expiresAt: {
|
|
71
|
+
description: "When this token expires and can no longer be consumed",
|
|
72
|
+
required: true,
|
|
73
|
+
type: Date,
|
|
74
|
+
},
|
|
75
|
+
tokenHash: {
|
|
76
|
+
description: "SHA-256 hash of the one-time token plaintext",
|
|
77
|
+
required: true,
|
|
78
|
+
type: String,
|
|
79
|
+
unique: true,
|
|
80
|
+
},
|
|
81
|
+
type: {
|
|
82
|
+
description: "Whether this token is for password reset or email verification",
|
|
83
|
+
enum: AUTH_TOKEN_TYPES,
|
|
84
|
+
required: true,
|
|
85
|
+
type: String,
|
|
86
|
+
},
|
|
87
|
+
userId: {
|
|
88
|
+
description: "The user this token was issued for",
|
|
89
|
+
index: true,
|
|
90
|
+
ref: "User",
|
|
91
|
+
required: true,
|
|
92
|
+
type: mongoose_1.default.Schema.Types.ObjectId,
|
|
93
|
+
},
|
|
94
|
+
}, { strict: "throw", toJSON: { virtuals: true }, toObject: { virtuals: true } });
|
|
95
|
+
authTokenSchema.index({ expiresAt: 1 }, { expireAfterSeconds: 0 });
|
|
96
|
+
authTokenSchema.plugin(plugins_1.createdUpdatedPlugin);
|
|
97
|
+
authTokenSchema.plugin(plugins_1.findOneOrNone);
|
|
98
|
+
authTokenSchema.plugin(plugins_1.findExactlyOne);
|
|
99
|
+
authTokenSchema.statics = __assign(__assign({}, authTokenSchema.statics), { consume: function (token, type) {
|
|
100
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
101
|
+
var now, consumed;
|
|
102
|
+
return __generator(this, function (_a) {
|
|
103
|
+
switch (_a.label) {
|
|
104
|
+
case 0:
|
|
105
|
+
now = luxon_1.DateTime.now().toJSDate();
|
|
106
|
+
return [4 /*yield*/, this.findOneAndUpdate({
|
|
107
|
+
consumedAt: { $exists: false },
|
|
108
|
+
expiresAt: { $gt: now },
|
|
109
|
+
tokenHash: hashToken(token),
|
|
110
|
+
type: type,
|
|
111
|
+
}, { $set: { consumedAt: now } }, { returnDocument: "after" })];
|
|
112
|
+
case 1:
|
|
113
|
+
consumed = _a.sent();
|
|
114
|
+
return [2 /*return*/, consumed];
|
|
115
|
+
}
|
|
116
|
+
});
|
|
117
|
+
});
|
|
118
|
+
}, invalidateUnusedFor: function (user, type) {
|
|
119
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
120
|
+
var userId;
|
|
121
|
+
return __generator(this, function (_a) {
|
|
122
|
+
switch (_a.label) {
|
|
123
|
+
case 0:
|
|
124
|
+
userId = new mongoose_1.default.Types.ObjectId(String(user._id));
|
|
125
|
+
return [4 /*yield*/, this.updateMany({
|
|
126
|
+
consumedAt: { $exists: false },
|
|
127
|
+
type: type,
|
|
128
|
+
userId: userId,
|
|
129
|
+
}, { $set: { consumedAt: luxon_1.DateTime.now().toJSDate() } })];
|
|
130
|
+
case 1:
|
|
131
|
+
_a.sent();
|
|
132
|
+
return [2 /*return*/];
|
|
133
|
+
}
|
|
134
|
+
});
|
|
135
|
+
});
|
|
136
|
+
}, issueFor: function (user, type) {
|
|
137
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
138
|
+
var token, ttl, now, userId, authToken;
|
|
139
|
+
return __generator(this, function (_a) {
|
|
140
|
+
switch (_a.label) {
|
|
141
|
+
case 0:
|
|
142
|
+
token = (0, node_crypto_1.randomBytes)(32).toString("hex");
|
|
143
|
+
ttl = exports.AUTH_TOKEN_TTL[type];
|
|
144
|
+
now = luxon_1.DateTime.now();
|
|
145
|
+
userId = new mongoose_1.default.Types.ObjectId(String(user._id));
|
|
146
|
+
return [4 /*yield*/, this.invalidateUnusedFor(user, type)];
|
|
147
|
+
case 1:
|
|
148
|
+
_a.sent();
|
|
149
|
+
return [4 /*yield*/, this.create({
|
|
150
|
+
expiresAt: now.plus(ttl).toJSDate(),
|
|
151
|
+
tokenHash: hashToken(token),
|
|
152
|
+
type: type,
|
|
153
|
+
userId: userId,
|
|
154
|
+
})];
|
|
155
|
+
case 2:
|
|
156
|
+
authToken = _a.sent();
|
|
157
|
+
return [2 /*return*/, { authToken: authToken, token: token }];
|
|
158
|
+
}
|
|
159
|
+
});
|
|
160
|
+
});
|
|
161
|
+
} });
|
|
162
|
+
exports.AuthToken = (_a = mongoose_1.default.models.AuthToken) !== null && _a !== void 0 ? _a : mongoose_1.default.model("AuthToken", authTokenSchema);
|
package/dist/betterAuth.d.ts
CHANGED
|
@@ -56,6 +56,39 @@ export interface BetterAuthConfig {
|
|
|
56
56
|
* If not provided, falls back to BETTER_AUTH_URL environment variable.
|
|
57
57
|
*/
|
|
58
58
|
baseURL?: string;
|
|
59
|
+
/** Public web/app origin used in password-reset and verification links. */
|
|
60
|
+
publicAppUrl?: string;
|
|
61
|
+
/** Deliver auth mail. Typically `getCommsService().sendMail`. */
|
|
62
|
+
sendMail?: (message: {
|
|
63
|
+
html?: string;
|
|
64
|
+
subject: string;
|
|
65
|
+
text: string;
|
|
66
|
+
to: string;
|
|
67
|
+
}) => Promise<void>;
|
|
68
|
+
/**
|
|
69
|
+
* Render reset/verify mail. Pass `@terreno/comms` `renderAuthMail` so JWT and
|
|
70
|
+
* Better Auth send identical templates.
|
|
71
|
+
*/
|
|
72
|
+
renderAuthMail?: (options: {
|
|
73
|
+
publicAppUrl: string;
|
|
74
|
+
templateId: "resetPassword" | "verifyEmail";
|
|
75
|
+
token: string;
|
|
76
|
+
templates?: Partial<Record<"resetPassword" | "verifyEmail", {
|
|
77
|
+
html?: string;
|
|
78
|
+
subject: string;
|
|
79
|
+
text?: string;
|
|
80
|
+
}>>;
|
|
81
|
+
}) => {
|
|
82
|
+
html?: string;
|
|
83
|
+
subject: string;
|
|
84
|
+
text?: string;
|
|
85
|
+
};
|
|
86
|
+
/** Optional per-app subject/text/html overrides for auth mail. */
|
|
87
|
+
authMailTemplates?: Partial<Record<"resetPassword" | "verifyEmail", {
|
|
88
|
+
html?: string;
|
|
89
|
+
subject: string;
|
|
90
|
+
text?: string;
|
|
91
|
+
}>>;
|
|
59
92
|
}
|
|
60
93
|
/**
|
|
61
94
|
* Auth provider selection for TerrenoApp.
|
package/dist/betterAuthApp.d.ts
CHANGED
|
@@ -16,7 +16,11 @@ export interface BetterAuthAppOptions {
|
|
|
16
16
|
export declare class BetterAuthApp implements TerrenoPlugin {
|
|
17
17
|
private auth;
|
|
18
18
|
private options;
|
|
19
|
+
private sessionMiddlewareMounted;
|
|
19
20
|
constructor(options: BetterAuthAppOptions);
|
|
21
|
+
ensureAuth(): BetterAuthInstance;
|
|
22
|
+
markSessionMiddlewareMounted(): void;
|
|
20
23
|
register(app: express.Application): void;
|
|
24
|
+
getBetterAuthBasePath(): string;
|
|
21
25
|
getAuth(): BetterAuthInstance | undefined;
|
|
22
26
|
}
|
package/dist/betterAuthApp.js
CHANGED
|
@@ -11,25 +11,43 @@ var betterAuthSetup_1 = require("./betterAuthSetup");
|
|
|
11
11
|
var logger_1 = require("./logger");
|
|
12
12
|
var BetterAuthApp = /** @class */ (function () {
|
|
13
13
|
function BetterAuthApp(options) {
|
|
14
|
+
this.sessionMiddlewareMounted = false;
|
|
14
15
|
this.options = options;
|
|
15
16
|
}
|
|
16
|
-
BetterAuthApp.prototype.
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
17
|
+
BetterAuthApp.prototype.ensureAuth = function () {
|
|
18
|
+
if (this.auth) {
|
|
19
|
+
return this.auth;
|
|
20
|
+
}
|
|
21
|
+
var _a = this.options, config = _a.config, userModel = _a.userModel;
|
|
20
22
|
this.auth = (0, betterAuthSetup_1.createBetterAuth)({
|
|
21
23
|
config: config,
|
|
22
|
-
mongoClient:
|
|
24
|
+
mongoClient: (0, betterAuthSetup_1.getMongoClientFromMongoose)(),
|
|
23
25
|
userModel: userModel,
|
|
24
26
|
});
|
|
25
|
-
var basePath = (_a = config.basePath) !== null && _a !== void 0 ? _a : "/api/auth";
|
|
26
|
-
(0, betterAuthSetup_1.mountBetterAuthRoutes)(app, this.auth, basePath);
|
|
27
|
-
app.use((0, betterAuthSetup_1.createBetterAuthSessionMiddleware)(this.auth, userModel));
|
|
28
27
|
if (userModel) {
|
|
29
28
|
(0, betterAuthSetup_1.setupBetterAuthUserSync)(this.auth, userModel);
|
|
30
29
|
}
|
|
30
|
+
return this.auth;
|
|
31
|
+
};
|
|
32
|
+
BetterAuthApp.prototype.markSessionMiddlewareMounted = function () {
|
|
33
|
+
this.sessionMiddlewareMounted = true;
|
|
34
|
+
};
|
|
35
|
+
BetterAuthApp.prototype.register = function (app) {
|
|
36
|
+
var _a;
|
|
37
|
+
var _b = this.options, config = _b.config, userModel = _b.userModel;
|
|
38
|
+
var auth = this.ensureAuth();
|
|
39
|
+
var basePath = (_a = config.basePath) !== null && _a !== void 0 ? _a : "/api/auth";
|
|
40
|
+
(0, betterAuthSetup_1.mountBetterAuthRoutes)(app, auth, basePath);
|
|
41
|
+
if (!this.sessionMiddlewareMounted) {
|
|
42
|
+
app.use((0, betterAuthSetup_1.createBetterAuthSessionMiddleware)(auth, userModel));
|
|
43
|
+
this.sessionMiddlewareMounted = true;
|
|
44
|
+
}
|
|
31
45
|
logger_1.logger.info("Better Auth initialized via BetterAuthApp plugin");
|
|
32
46
|
};
|
|
47
|
+
BetterAuthApp.prototype.getBetterAuthBasePath = function () {
|
|
48
|
+
var _a;
|
|
49
|
+
return (_a = this.options.config.basePath) !== null && _a !== void 0 ? _a : "/api/auth";
|
|
50
|
+
};
|
|
33
51
|
BetterAuthApp.prototype.getAuth = function () {
|
|
34
52
|
return this.auth;
|
|
35
53
|
};
|