@terreno/api 57.4.0 → 57.6.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 +5 -5
- package/bunfig.toml +1 -1
- package/dist/actions.js +197 -368
- package/dist/adminModelRouter.js +88 -173
- package/dist/api.js +598 -852
- package/dist/audit/auditApp.js +48 -89
- package/dist/audit/auditEventModel.js +15 -16
- package/dist/audit/cloudTasksEnqueue.js +56 -149
- package/dist/audit/diff.js +70 -160
- package/dist/audit/processQueue.js +25 -70
- package/dist/audit/rbacSink.js +25 -66
- package/dist/audit/record.js +129 -251
- package/dist/auth.js +432 -681
- package/dist/authRecovery.js +155 -269
- package/dist/authTokens.js +43 -118
- package/dist/betterAuthApp.js +25 -26
- package/dist/betterAuthSetup.js +258 -413
- package/dist/browserLogsRoute.d.ts +6 -0
- package/dist/browserLogsRoute.js +97 -0
- package/dist/collectionRegistry.js +32 -47
- package/dist/config.js +53 -122
- package/dist/configurationApp.js +180 -361
- package/dist/configurationPlugin.js +130 -302
- package/dist/consentApp.js +276 -421
- package/dist/docLoader.js +78 -126
- package/dist/envConfigurationPlugin.js +25 -147
- package/dist/errors.js +151 -247
- package/dist/example.js +28 -34
- package/dist/expressServer.d.ts +10 -0
- package/dist/expressServer.js +109 -255
- package/dist/frameworkModelNames.d.ts +24 -0
- package/dist/frameworkModelNames.js +31 -0
- package/dist/githubAuth.js +152 -216
- package/dist/httpClient.js +176 -264
- package/dist/index.d.ts +2 -0
- package/dist/index.js +7 -2
- package/dist/logger.js +145 -278
- package/dist/mcp/auth.js +76 -128
- package/dist/mcp/createMCPRequest.js +4 -5
- package/dist/mcp/handlers.js +268 -480
- package/dist/mcp/query.js +56 -150
- package/dist/mcp/registry.js +17 -30
- package/dist/mcp/schemaGenerator.js +95 -181
- package/dist/mcp/server.js +28 -100
- package/dist/mcp/serviceTokens.js +102 -191
- package/dist/mcp/toolGenerator.js +78 -191
- package/dist/middleware.js +15 -27
- package/dist/migrations/fixtures/all-down/20260910120000-one.js +2 -42
- package/dist/migrations/fixtures/all-down/20260910120001-two.js +2 -42
- package/dist/migrations/fixtures/bad-id/20260910120000-mismatch.js +1 -39
- package/dist/migrations/fixtures/bad-name/not-a-migration.js +1 -39
- package/dist/migrations/fixtures/valid/20260910120000-alpha.js +1 -39
- package/dist/migrations/fixtures/valid/20260910120001-beta.js +2 -42
- package/dist/migrations/generate.js +107 -229
- package/dist/migrations/load.js +75 -201
- package/dist/migrations/lock.js +54 -126
- package/dist/migrations/runner.js +192 -446
- package/dist/migrations/schemaCatalog.js +122 -263
- package/dist/models/consentForm.js +6 -6
- package/dist/models/consentResponse.js +5 -5
- package/dist/models/mcpServiceToken.js +66 -156
- package/dist/models/notification.js +6 -6
- package/dist/models/notificationPreference.js +6 -6
- package/dist/models/versionConfig.js +5 -5
- package/dist/notifications/notificationService.js +133 -273
- package/dist/notifications/notificationsApp.js +85 -179
- package/dist/notifications/notificationsBeforeSend.js +19 -64
- package/dist/notifiers/googleChatNotifier.js +36 -117
- package/dist/notifiers/slackNotifier.d.ts +31 -2
- package/dist/notifiers/slackNotifier.js +170 -119
- package/dist/notifiers/zoomNotifier.js +60 -111
- package/dist/openApi.js +107 -122
- package/dist/openApiBuilder.js +117 -159
- package/dist/openApiCompat.js +81 -148
- package/dist/openApiEtag.js +7 -7
- package/dist/openApiValidator.js +177 -286
- package/dist/orgs/orgContext.js +87 -157
- package/dist/orgs/orgPermissions.js +29 -68
- package/dist/orgs/orgPlugin.js +9 -27
- package/dist/orgs/organizationModel.js +65 -166
- package/dist/orgs/organizationSettings.js +29 -36
- package/dist/orgs/orgsApp.js +346 -608
- package/dist/permissions.js +88 -181
- package/dist/plugins.js +125 -218
- package/dist/populate.js +130 -240
- package/dist/rateLimit/applyTrustProxy.js +1 -1
- package/dist/rateLimit/createStore.js +7 -8
- package/dist/rateLimit/memoryStore.js +22 -100
- package/dist/rateLimit/middleware.js +48 -99
- package/dist/rateLimit/mongoStore.js +54 -112
- package/dist/rateLimit/policies.js +41 -75
- package/dist/rateLimit/redisStore.js +39 -133
- package/dist/rbac/access.js +119 -267
- package/dist/rbac/assertAllowed.js +95 -171
- package/dist/rbac/auditModel.js +14 -58
- package/dist/rbac/backfillAdmins.js +24 -130
- package/dist/rbac/fieldViews.js +46 -141
- package/dist/rbac/membershipOrgAdminSource.js +28 -99
- package/dist/rbac/middleware.js +30 -96
- package/dist/rbac/modelRouterAccess.js +130 -307
- package/dist/rbac/permissionUtils.js +40 -179
- package/dist/rbac/realtimeAccess.js +81 -147
- package/dist/rbac/resolve.d.ts +1 -1
- package/dist/rbac/resolve.js +148 -342
- package/dist/rbac/roleManager.js +318 -700
- package/dist/rbac/roleModel.js +44 -171
- package/dist/rbac/routes.js +93 -196
- package/dist/rbac/scopes.js +39 -133
- package/dist/rbac/statements.js +23 -91
- package/dist/rbac/userPlugin.js +3 -29
- package/dist/realtime/changeStreamWatcher.js +489 -800
- package/dist/realtime/deprecation.js +8 -10
- package/dist/realtime/queryMatcher.js +110 -191
- package/dist/realtime/queryStore.js +35 -118
- package/dist/realtime/realtimeApp.js +247 -401
- package/dist/realtime/registry.js +19 -30
- package/dist/realtime/sessionRevalidation.js +132 -358
- package/dist/realtime/socketAuth.js +89 -208
- package/dist/realtime/socketUser.js +10 -56
- package/dist/requestContext.js +93 -139
- package/dist/schemaMetadata.js +179 -274
- package/dist/scriptRunner.js +96 -266
- package/dist/scrubAdminFields.js +36 -108
- package/dist/secretProviders.js +130 -299
- package/dist/seedRunner.js +221 -514
- package/dist/sync/adminBroadcastScope.js +58 -170
- package/dist/sync/adminWindowAccess.js +15 -86
- package/dist/sync/adminWindowMutation.js +110 -181
- package/dist/sync/executors.js +425 -629
- package/dist/sync/loadHarness.js +392 -689
- package/dist/sync/models.js +181 -341
- package/dist/sync/mutationHandler.js +533 -801
- package/dist/sync/registrationSideEffects.js +41 -95
- package/dist/sync/registry.js +29 -49
- package/dist/sync/routes.js +484 -817
- package/dist/sync/scripts/compactTombstones.js +83 -228
- package/dist/sync/serialize.js +18 -58
- package/dist/sync/socketHandlers.js +253 -478
- package/dist/sync/streams.js +49 -117
- package/dist/sync/syncApp.js +12 -15
- package/dist/sync/syncBatch.js +63 -168
- package/dist/sync/syncSeqPlugin.js +430 -702
- package/dist/syncConsents.js +113 -253
- package/dist/terrenoApp.js +166 -276
- package/dist/tests/createTestData.js +146 -256
- package/dist/tests/models.js +14 -54
- package/dist/tests/mongoTestSetup.js +42 -103
- package/dist/tests/testHelper.js +31 -93
- package/dist/tests.js +12 -51
- package/dist/transformers.js +61 -164
- package/dist/utils.js +31 -93
- package/dist/vendor/wesleytodd-openapi/index.js +37 -51
- package/dist/vendor/wesleytodd-openapi/lib/generate-doc.js +32 -40
- package/dist/vendor/wesleytodd-openapi/lib/layer-schema.js +3 -3
- package/dist/vendor/wesleytodd-openapi/lib/ui.js +50 -19
- package/dist/vendor/wesleytodd-openapi/lib/validate.js +19 -47
- package/dist/versionCheckPlugin.js +52 -100
- package/dist/webhooks/headerValue.js +2 -2
- package/dist/webhooks/idempotency/memoryStore.js +16 -59
- package/dist/webhooks/idempotency/mongoStore.js +55 -130
- package/dist/webhooks/idempotency/webhookReceipt.js +9 -9
- package/dist/webhooks/rawBody.js +1 -1
- package/dist/webhooks/timingSafeEqual.js +4 -5
- package/dist/webhooks/verifiers/hmac.js +17 -18
- package/dist/webhooks/verifiers/sendgrid.js +20 -22
- package/dist/webhooks/verifiers/stripe.js +31 -65
- package/dist/webhooks/verifiers/twilio.js +23 -73
- package/dist/webhooks/webhooksApp.js +78 -177
- package/dist/zodOpenApi.js +2 -2
- package/package.json +6 -6
- package/src/__tests__/browserLogsRoute.test.ts +165 -0
- package/src/audit/auditApp.test.ts +5 -5
- package/src/audit/auditEventModel.ts +7 -3
- package/src/audit/auditRouter.test.ts +5 -5
- package/src/audit/rbacSink.test.ts +2 -2
- package/src/audit/record.test.ts +2 -2
- package/src/audit/record.ts +3 -2
- package/src/auth.ts +1 -1
- package/src/authRecovery.test.ts +43 -0
- package/src/authRecovery.ts +16 -10
- package/src/authTokens.ts +6 -2
- package/src/authVerification.test.ts +22 -0
- package/src/browserLogsRoute.ts +110 -0
- package/src/configurationPlugin.test.ts +1 -11
- package/src/expressServer.ts +10 -0
- package/src/frameworkModelNames.test.ts +62 -0
- package/src/frameworkModelNames.ts +33 -0
- package/src/index.ts +7 -0
- package/src/isolated/migrateCliConnect.isolated.ts +51 -0
- package/src/mcp/auth.test.ts +34 -1
- package/src/migrations/cli.test.ts +0 -23
- package/src/models/mcpServiceToken.ts +4 -3
- package/src/models/notification.ts +3 -2
- package/src/models/notificationPreference.ts +1 -1
- package/src/notifications/notificationsApp.test.ts +24 -1
- package/src/notifiers/slackNotifier.test.ts +186 -1
- package/src/notifiers/slackNotifier.ts +167 -8
- package/src/orgs/orgPlugin.ts +1 -1
- package/src/orgs/organizationModel.ts +11 -6
- package/src/plugins.test.ts +5 -0
- package/src/plugins.ts +3 -0
- package/src/realtime/realtimeApp.ts +1 -1
- package/src/sync/integration.test.ts +2 -2
- package/src/terrenoApp.ts +3 -0
- package/src/types.d.ts +1 -0
- package/src/webhooks/idempotency/webhookReceipt.ts +4 -3
- package/tsconfig.json +13 -54
- package/tsconfig.typedoc.json +2 -0
package/dist/authRecovery.js
CHANGED
|
@@ -1,84 +1,38 @@
|
|
|
1
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
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
39
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
40
4
|
};
|
|
41
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
42
6
|
exports.addAuthRecoveryRoutes = exports.sendVerificationEmail = void 0;
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
}
|
|
56
|
-
|
|
57
|
-
|
|
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) {
|
|
7
|
+
const express_1 = __importDefault(require("express"));
|
|
8
|
+
const api_1 = require("./api");
|
|
9
|
+
const auth_1 = require("./auth");
|
|
10
|
+
const authTokens_1 = require("./authTokens");
|
|
11
|
+
const errors_1 = require("./errors");
|
|
12
|
+
const logger_1 = require("./logger");
|
|
13
|
+
const openApiBuilder_1 = require("./openApiBuilder");
|
|
14
|
+
const plugins_1 = require("./plugins");
|
|
15
|
+
const RESET_PASSWORD_SUBJECT = "Reset your password";
|
|
16
|
+
const VERIFY_EMAIL_SUBJECT = "Verify your email";
|
|
17
|
+
const resetPasswordText = (resetUrl) => `Reset your password using this link: ${resetUrl}`;
|
|
18
|
+
const resetPasswordHtml = (resetUrl) => `<p><a href="${resetUrl}">Reset your password</a></p>`;
|
|
19
|
+
const verifyEmailText = (verifyUrl) => `Verify your email using this link: ${verifyUrl}`;
|
|
20
|
+
const verifyEmailHtml = (verifyUrl) => `<p><a href="${verifyUrl}">Verify your email</a></p>`;
|
|
21
|
+
const normalizeEmail = (value) => {
|
|
66
22
|
if (typeof value !== "string") {
|
|
67
23
|
return "";
|
|
68
24
|
}
|
|
69
25
|
return value.trim().toLowerCase();
|
|
70
26
|
};
|
|
71
|
-
|
|
27
|
+
const escapeRegularExpression = (value) => {
|
|
72
28
|
return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
|
73
29
|
};
|
|
74
|
-
|
|
75
|
-
return
|
|
76
|
-
|
|
77
|
-
email: { $options: "i", $regex: "^".concat(escapeRegularExpression(email), "$") },
|
|
78
|
-
})];
|
|
30
|
+
const findUserByEmail = async (userModel, email) => {
|
|
31
|
+
return (0, plugins_1.findOneOrNoneFor)(userModel, {
|
|
32
|
+
email: { $options: "i", $regex: `^${escapeRegularExpression(email)}$` },
|
|
79
33
|
});
|
|
80
|
-
}
|
|
81
|
-
|
|
34
|
+
};
|
|
35
|
+
const passwordFromBody = (body) => {
|
|
82
36
|
if (typeof body.password === "string" && body.password.length > 0) {
|
|
83
37
|
return body.password;
|
|
84
38
|
}
|
|
@@ -87,188 +41,135 @@ var passwordFromBody = function (body) {
|
|
|
87
41
|
}
|
|
88
42
|
return "";
|
|
89
43
|
};
|
|
90
|
-
|
|
44
|
+
const tokenFromBody = (body) => {
|
|
91
45
|
if (typeof body.token === "string") {
|
|
92
46
|
return body.token;
|
|
93
47
|
}
|
|
94
48
|
return "";
|
|
95
49
|
};
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
return
|
|
50
|
+
const buildAppUrl = (publicAppUrl, path, token) => {
|
|
51
|
+
const base = (publicAppUrl ?? "").replace(/\/$/, "");
|
|
52
|
+
return `${base}${path}?token=${encodeURIComponent(token)}`;
|
|
99
53
|
};
|
|
100
|
-
|
|
54
|
+
const buildResetUrl = (publicAppUrl, token) => {
|
|
101
55
|
return buildAppUrl(publicAppUrl, "/resetPassword", token);
|
|
102
56
|
};
|
|
103
|
-
|
|
57
|
+
const buildVerifyUrl = (publicAppUrl, token) => {
|
|
104
58
|
return buildAppUrl(publicAppUrl, "/verifyEmail", token);
|
|
105
59
|
};
|
|
106
|
-
|
|
107
|
-
if (fallback === void 0) { fallback = ""; }
|
|
60
|
+
const userEmail = (user, fallback = "") => {
|
|
108
61
|
if (typeof user.email === "string") {
|
|
109
62
|
return user.email;
|
|
110
63
|
}
|
|
111
64
|
return fallback;
|
|
112
65
|
};
|
|
113
|
-
|
|
66
|
+
const isEmailVerified = (user) => {
|
|
114
67
|
return user.emailVerified === true;
|
|
115
68
|
};
|
|
116
|
-
|
|
69
|
+
const markEmailVerified = (user) => {
|
|
117
70
|
user.emailVerified = true;
|
|
118
71
|
};
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
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
|
-
}
|
|
72
|
+
const sendVerificationEmail = async (user, authOptions) => {
|
|
73
|
+
if (!authOptions?.publicAppUrl) {
|
|
74
|
+
logger_1.logger.error("[auth] publicAppUrl is required to send verification mail");
|
|
75
|
+
throw new errors_1.APIError({
|
|
76
|
+
status: 501,
|
|
77
|
+
title: "publicAppUrl is required to send verification mail",
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
if (isEmailVerified(user)) {
|
|
81
|
+
return;
|
|
82
|
+
}
|
|
83
|
+
const issued = await authTokens_1.AuthToken.issueFor({ _id: String(user._id) }, "emailVerification");
|
|
84
|
+
const verifyUrl = buildVerifyUrl(authOptions.publicAppUrl, issued.token);
|
|
85
|
+
await deliverRecoveryMail(authOptions, {
|
|
86
|
+
html: verifyEmailHtml(verifyUrl),
|
|
87
|
+
subject: VERIFY_EMAIL_SUBJECT,
|
|
88
|
+
text: verifyEmailText(verifyUrl),
|
|
89
|
+
to: userEmail(user),
|
|
167
90
|
});
|
|
168
|
-
}); };
|
|
169
|
-
var incrementTokenEpoch = function (user) {
|
|
170
|
-
var _a;
|
|
171
|
-
user.tokenEpoch = ((_a = user.tokenEpoch) !== null && _a !== void 0 ? _a : 0) + 1;
|
|
172
91
|
};
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
return
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
92
|
+
exports.sendVerificationEmail = sendVerificationEmail;
|
|
93
|
+
const deliverRecoveryMail = async (authOptions, message) => {
|
|
94
|
+
if (authOptions?.sendMail) {
|
|
95
|
+
await authOptions.sendMail(message);
|
|
96
|
+
return;
|
|
97
|
+
}
|
|
98
|
+
if (process.env.NODE_ENV === "production") {
|
|
99
|
+
throw new errors_1.APIError({ status: 501, title: "Mail is not configured" });
|
|
100
|
+
}
|
|
101
|
+
logger_1.logger.info(`[auth] Console recovery mail subject=${message.subject} textLength=${message.text.length}`);
|
|
102
|
+
};
|
|
103
|
+
const incrementTokenEpoch = (user) => {
|
|
104
|
+
user.tokenEpoch = (user.tokenEpoch ?? 0) + 1;
|
|
105
|
+
};
|
|
106
|
+
const addAuthRecoveryRoutes = (app, userModel, authOptions) => {
|
|
107
|
+
const forgotPassword = (0, api_1.asyncHandler)(async (req, res) => {
|
|
108
|
+
const email = normalizeEmail(req.body?.email);
|
|
109
|
+
if (email) {
|
|
110
|
+
try {
|
|
111
|
+
const user = await findUserByEmail(userModel, email);
|
|
112
|
+
if (user) {
|
|
113
|
+
if (!authOptions?.publicAppUrl) {
|
|
114
|
+
logger_1.logger.error("[auth] publicAppUrl is required to send password reset mail");
|
|
115
|
+
}
|
|
116
|
+
else {
|
|
117
|
+
const issued = await authTokens_1.AuthToken.issueFor({ _id: String(user._id) }, "passwordReset");
|
|
118
|
+
const resetUrl = buildResetUrl(authOptions.publicAppUrl, issued.token);
|
|
119
|
+
await deliverRecoveryMail(authOptions, {
|
|
197
120
|
html: resetPasswordHtml(resetUrl),
|
|
198
121
|
subject: RESET_PASSWORD_SUBJECT,
|
|
199
122
|
text: resetPasswordText(resetUrl),
|
|
200
123
|
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
124
|
});
|
|
231
125
|
}
|
|
232
|
-
|
|
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
|
-
})];
|
|
126
|
+
}
|
|
262
127
|
}
|
|
128
|
+
catch (error) {
|
|
129
|
+
logger_1.logger.error("[auth] Failed to send password reset mail", { error });
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
return res.status(202).json({ data: { ok: true } });
|
|
133
|
+
});
|
|
134
|
+
const resetPassword = (0, api_1.asyncHandler)(async (req, res) => {
|
|
135
|
+
const body = (req.body ?? {});
|
|
136
|
+
const token = tokenFromBody(body);
|
|
137
|
+
const password = passwordFromBody(body);
|
|
138
|
+
if (!token || !password) {
|
|
139
|
+
throw new errors_1.APIError({ status: 400, title: "token and password are required" });
|
|
140
|
+
}
|
|
141
|
+
if (password.length > auth_1.MAX_PASSWORD_LENGTH) {
|
|
142
|
+
throw new errors_1.APIError({
|
|
143
|
+
status: 400,
|
|
144
|
+
title: `Password must be at most ${auth_1.MAX_PASSWORD_LENGTH} characters`,
|
|
145
|
+
});
|
|
146
|
+
}
|
|
147
|
+
const consumed = await authTokens_1.AuthToken.consume(token, "passwordReset");
|
|
148
|
+
if (!consumed) {
|
|
149
|
+
throw new errors_1.APIError({ status: 400, title: "Invalid or expired reset token" });
|
|
150
|
+
}
|
|
151
|
+
const user = await userModel.findById(consumed.userId);
|
|
152
|
+
if (!user) {
|
|
153
|
+
throw new errors_1.APIError({ status: 400, title: "Invalid or expired reset token" });
|
|
154
|
+
}
|
|
155
|
+
await (0, auth_1.setPasswordForUser)(user, password);
|
|
156
|
+
incrementTokenEpoch(user);
|
|
157
|
+
await user.save();
|
|
158
|
+
if (authOptions?.syncPasswordResetToBetterAuth) {
|
|
159
|
+
await authOptions.syncPasswordResetToBetterAuth(user, password);
|
|
160
|
+
}
|
|
161
|
+
const tokens = await (0, auth_1.generateTokens)(user, authOptions);
|
|
162
|
+
return res.json({
|
|
163
|
+
data: { refreshToken: tokens.refreshToken, token: tokens.token, userId: user._id },
|
|
263
164
|
});
|
|
264
|
-
});
|
|
265
|
-
|
|
165
|
+
});
|
|
166
|
+
const forgotOpenApi = (0, openApiBuilder_1.createOpenApiBuilder)({})
|
|
266
167
|
.withTags(["auth"])
|
|
267
168
|
.withSummary("Request a password reset email")
|
|
268
169
|
.withRequestBody({ email: { type: "string" } })
|
|
269
170
|
.withResponse(202, { ok: { type: "boolean" } })
|
|
270
171
|
.build();
|
|
271
|
-
|
|
172
|
+
const resetOpenApi = (0, openApiBuilder_1.createOpenApiBuilder)({})
|
|
272
173
|
.withTags(["auth"])
|
|
273
174
|
.withSummary("Reset password with a one-time token")
|
|
274
175
|
.withRequestBody({
|
|
@@ -282,69 +183,54 @@ var addAuthRecoveryRoutes = function (app, userModel, authOptions) {
|
|
|
282
183
|
userId: { type: "string" },
|
|
283
184
|
})
|
|
284
185
|
.build();
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
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)({})
|
|
186
|
+
const sendVerification = (0, api_1.asyncHandler)(async (req, res) => {
|
|
187
|
+
const user = req.user;
|
|
188
|
+
if (!user) {
|
|
189
|
+
throw new errors_1.APIError({ status: 401, title: "Unauthorized" });
|
|
190
|
+
}
|
|
191
|
+
await (0, exports.sendVerificationEmail)(user, authOptions);
|
|
192
|
+
return res.status(202).json({ data: { ok: true } });
|
|
193
|
+
});
|
|
194
|
+
const verifyEmail = (0, api_1.asyncHandler)(async (req, res) => {
|
|
195
|
+
const token = tokenFromBody((req.body ?? {}));
|
|
196
|
+
if (!token) {
|
|
197
|
+
throw new errors_1.APIError({ status: 400, title: "token is required" });
|
|
198
|
+
}
|
|
199
|
+
const consumed = await authTokens_1.AuthToken.consume(token, "emailVerification");
|
|
200
|
+
if (!consumed) {
|
|
201
|
+
throw new errors_1.APIError({ status: 400, title: "Invalid or expired verification token" });
|
|
202
|
+
}
|
|
203
|
+
const user = await userModel.findById(consumed.userId);
|
|
204
|
+
if (!user) {
|
|
205
|
+
throw new errors_1.APIError({ status: 400, title: "Invalid or expired verification token" });
|
|
206
|
+
}
|
|
207
|
+
markEmailVerified(user);
|
|
208
|
+
await user.save();
|
|
209
|
+
return res.json({ data: { ok: true } });
|
|
210
|
+
});
|
|
211
|
+
const sendVerificationOpenApi = (0, openApiBuilder_1.createOpenApiBuilder)({})
|
|
332
212
|
.withTags(["auth"])
|
|
333
213
|
.withSummary("Send or resend an email verification link")
|
|
334
214
|
.withResponse(202, { ok: { type: "boolean" } })
|
|
335
215
|
.build();
|
|
336
|
-
|
|
216
|
+
const verifyEmailOpenApi = (0, openApiBuilder_1.createOpenApiBuilder)({})
|
|
337
217
|
.withTags(["auth"])
|
|
338
218
|
.withSummary("Verify email with a one-time token")
|
|
339
219
|
.withRequestBody({ token: { type: "string" } })
|
|
340
220
|
.withResponse(200, { ok: { type: "boolean" } })
|
|
341
221
|
.build();
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
222
|
+
const router = express_1.default.Router();
|
|
223
|
+
if (authOptions?.passwordReset !== false) {
|
|
224
|
+
router.post("/forgotPassword", forgotOpenApi, forgotPassword);
|
|
225
|
+
router.post("/resetPassword", resetOpenApi, resetPassword);
|
|
226
|
+
}
|
|
227
|
+
if (authOptions?.emailVerification !== false) {
|
|
228
|
+
router.post("/sendVerification", (0, auth_1.authenticateMiddleware)(), sendVerificationOpenApi, sendVerification);
|
|
229
|
+
router.post("/verifyEmail", verifyEmailOpenApi, verifyEmail);
|
|
230
|
+
}
|
|
347
231
|
app.use("/auth", router);
|
|
348
|
-
|
|
232
|
+
if (authOptions?.passwordReset !== false && authOptions?.legacyResetPasswordRoute !== false) {
|
|
233
|
+
app.post("/resetPassword", resetOpenApi, resetPassword);
|
|
234
|
+
}
|
|
349
235
|
};
|
|
350
236
|
exports.addAuthRecoveryRoutes = addAuthRecoveryRoutes;
|