@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/githubAuth.js
CHANGED
|
@@ -1,52 +1,16 @@
|
|
|
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.addGitHubAuthRoutes = exports.setupGitHubAuth = exports.githubUserPlugin = void 0;
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
7
|
+
const express_1 = require("express");
|
|
8
|
+
const passport_1 = __importDefault(require("passport"));
|
|
9
|
+
const passport_github2_1 = require("passport-github2");
|
|
10
|
+
const auth_1 = require("./auth");
|
|
11
|
+
const errors_1 = require("./errors");
|
|
12
|
+
const logger_1 = require("./logger");
|
|
13
|
+
const plugins_1 = require("./plugins");
|
|
50
14
|
/**
|
|
51
15
|
* Plugin to add GitHub authentication fields to a user schema.
|
|
52
16
|
* Apply this plugin to your User schema if you want to enable GitHub auth.
|
|
@@ -60,7 +24,7 @@ var plugins_1 = require("./plugins");
|
|
|
60
24
|
*/
|
|
61
25
|
// noExplicitAny: Schema generics must be loose to accept arbitrary consumer schemas
|
|
62
26
|
// biome-ignore lint/suspicious/noExplicitAny: Schema generics must be loose to accept arbitrary consumer schemas
|
|
63
|
-
|
|
27
|
+
const githubUserPlugin = (schema) => {
|
|
64
28
|
schema.add({
|
|
65
29
|
githubAvatarUrl: { description: "GitHub avatar image URL", type: String },
|
|
66
30
|
githubId: {
|
|
@@ -79,104 +43,94 @@ exports.githubUserPlugin = githubUserPlugin;
|
|
|
79
43
|
* Sets up GitHub OAuth authentication strategy.
|
|
80
44
|
* Call this after setupAuth() in your server initialization.
|
|
81
45
|
*/
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
var scope = (_a = githubOptions.scope) !== null && _a !== void 0 ? _a : ["user:email"];
|
|
46
|
+
const setupGitHubAuth = (_app, userModel, githubOptions) => {
|
|
47
|
+
const scope = githubOptions.scope ?? ["user:email"];
|
|
85
48
|
passport_1.default.use("github", new passport_github2_1.Strategy({
|
|
86
49
|
callbackURL: githubOptions.callbackURL,
|
|
87
50
|
clientID: githubOptions.clientId,
|
|
88
51
|
clientSecret: githubOptions.clientSecret,
|
|
89
52
|
passReqToCallback: true,
|
|
90
|
-
scope
|
|
91
|
-
},
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
return
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
}
|
|
120
|
-
return [4 /*yield*/, userModel.findById(existingUser._id)];
|
|
121
|
-
case 4:
|
|
122
|
-
user = _j.sent();
|
|
123
|
-
if (!user) return [3 /*break*/, 6];
|
|
124
|
-
userWithGitHub = user;
|
|
53
|
+
scope,
|
|
54
|
+
}, async (req, accessToken, refreshToken, profile, done) => {
|
|
55
|
+
try {
|
|
56
|
+
const existingUser = req.user;
|
|
57
|
+
// If custom handler provided, use it
|
|
58
|
+
if (githubOptions.findOrCreateUser) {
|
|
59
|
+
const user = await githubOptions.findOrCreateUser(profile, accessToken, refreshToken, existingUser);
|
|
60
|
+
return done(null, user);
|
|
61
|
+
}
|
|
62
|
+
// Default implementation
|
|
63
|
+
const githubId = profile.id;
|
|
64
|
+
// Check if user with this GitHub ID already exists
|
|
65
|
+
const existingGitHubUser = await (0, plugins_1.findOneOrNoneFor)(userModel, { githubId });
|
|
66
|
+
// Case 1: User is authenticated and wants to link GitHub account
|
|
67
|
+
if (existingUser) {
|
|
68
|
+
if (!githubOptions.allowAccountLinking) {
|
|
69
|
+
return done(new errors_1.APIError({ status: 400, title: "Account linking is disabled" }));
|
|
70
|
+
}
|
|
71
|
+
if (existingGitHubUser &&
|
|
72
|
+
existingGitHubUser._id.toString() !== existingUser._id.toString()) {
|
|
73
|
+
return done(new errors_1.APIError({
|
|
74
|
+
status: 400,
|
|
75
|
+
title: "This GitHub account is already linked to another user",
|
|
76
|
+
}));
|
|
77
|
+
}
|
|
78
|
+
// Link GitHub to existing user
|
|
79
|
+
const user = await userModel.findById(existingUser._id);
|
|
80
|
+
if (user) {
|
|
81
|
+
const userWithGitHub = user;
|
|
125
82
|
userWithGitHub.githubId = githubId;
|
|
126
83
|
userWithGitHub.githubUsername = profile.username;
|
|
127
84
|
userWithGitHub.githubProfileUrl = profile.profileUrl;
|
|
128
|
-
userWithGitHub.githubAvatarUrl =
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
85
|
+
userWithGitHub.githubAvatarUrl = profile.photos?.[0]?.value;
|
|
86
|
+
await user.save();
|
|
87
|
+
return done(null, user);
|
|
88
|
+
}
|
|
89
|
+
return done(new errors_1.APIError({ status: 404, title: "User not found" }));
|
|
90
|
+
}
|
|
91
|
+
// Case 2: User with this GitHub ID exists - log them in
|
|
92
|
+
if (existingGitHubUser) {
|
|
93
|
+
return done(null, existingGitHubUser);
|
|
94
|
+
}
|
|
95
|
+
// Case 3: Create new user with GitHub credentials
|
|
96
|
+
const email = profile.emails?.[0]?.value;
|
|
97
|
+
// Check if user with this email already exists
|
|
98
|
+
if (email) {
|
|
99
|
+
const existingEmailUser = await (0, plugins_1.findOneOrNoneFor)(userModel, { email });
|
|
100
|
+
if (existingEmailUser) {
|
|
101
|
+
// If account linking is allowed, link GitHub to existing email account
|
|
102
|
+
if (githubOptions.allowAccountLinking !== false) {
|
|
103
|
+
const emailUserWithGitHub = existingEmailUser;
|
|
104
|
+
emailUserWithGitHub.githubId = githubId;
|
|
105
|
+
emailUserWithGitHub.githubUsername = profile.username;
|
|
106
|
+
emailUserWithGitHub.githubProfileUrl = profile.profileUrl;
|
|
107
|
+
emailUserWithGitHub.githubAvatarUrl = profile.photos?.[0]?.value;
|
|
108
|
+
await existingEmailUser.save();
|
|
109
|
+
return done(null, existingEmailUser);
|
|
138
110
|
}
|
|
139
|
-
|
|
140
|
-
if (!email) return [3 /*break*/, 11];
|
|
141
|
-
return [4 /*yield*/, (0, plugins_1.findOneOrNoneFor)(userModel, { email: email })];
|
|
142
|
-
case 8:
|
|
143
|
-
existingEmailUser = _j.sent();
|
|
144
|
-
if (!existingEmailUser) return [3 /*break*/, 11];
|
|
145
|
-
if (!(githubOptions.allowAccountLinking !== false)) return [3 /*break*/, 10];
|
|
146
|
-
emailUserWithGitHub = existingEmailUser;
|
|
147
|
-
emailUserWithGitHub.githubId = githubId;
|
|
148
|
-
emailUserWithGitHub.githubUsername = profile.username;
|
|
149
|
-
emailUserWithGitHub.githubProfileUrl = profile.profileUrl;
|
|
150
|
-
emailUserWithGitHub.githubAvatarUrl = (_f = (_e = profile.photos) === null || _e === void 0 ? void 0 : _e[0]) === null || _f === void 0 ? void 0 : _f.value;
|
|
151
|
-
return [4 /*yield*/, existingEmailUser.save()];
|
|
152
|
-
case 9:
|
|
153
|
-
_j.sent();
|
|
154
|
-
return [2 /*return*/, done(null, existingEmailUser)];
|
|
155
|
-
case 10: return [2 /*return*/, done(new errors_1.APIError({
|
|
111
|
+
return done(new errors_1.APIError({
|
|
156
112
|
status: 400,
|
|
157
113
|
title: "An account with this email already exists. Please log in and link your GitHub account.",
|
|
158
|
-
}))
|
|
159
|
-
|
|
160
|
-
newUser = new userModel({
|
|
161
|
-
admin: false,
|
|
162
|
-
email: email,
|
|
163
|
-
githubAvatarUrl: (_h = (_g = profile.photos) === null || _g === void 0 ? void 0 : _g[0]) === null || _h === void 0 ? void 0 : _h.value,
|
|
164
|
-
githubId: githubId,
|
|
165
|
-
githubProfileUrl: profile.profileUrl,
|
|
166
|
-
githubUsername: profile.username,
|
|
167
|
-
});
|
|
168
|
-
return [4 /*yield*/, newUser.save()];
|
|
169
|
-
case 12:
|
|
170
|
-
_j.sent();
|
|
171
|
-
return [2 /*return*/, done(null, newUser)];
|
|
172
|
-
case 13:
|
|
173
|
-
error_1 = _j.sent();
|
|
174
|
-
logger_1.logger.error("GitHub auth error: ".concat(error_1));
|
|
175
|
-
return [2 /*return*/, done(error_1)];
|
|
176
|
-
case 14: return [2 /*return*/];
|
|
114
|
+
}));
|
|
115
|
+
}
|
|
177
116
|
}
|
|
178
|
-
|
|
179
|
-
|
|
117
|
+
// Create new user
|
|
118
|
+
const newUser = new userModel({
|
|
119
|
+
admin: false,
|
|
120
|
+
email,
|
|
121
|
+
githubAvatarUrl: profile.photos?.[0]?.value,
|
|
122
|
+
githubId,
|
|
123
|
+
githubProfileUrl: profile.profileUrl,
|
|
124
|
+
githubUsername: profile.username,
|
|
125
|
+
});
|
|
126
|
+
await newUser.save();
|
|
127
|
+
return done(null, newUser);
|
|
128
|
+
}
|
|
129
|
+
catch (error) {
|
|
130
|
+
logger_1.logger.error(`GitHub auth error: ${error}`);
|
|
131
|
+
return done(error);
|
|
132
|
+
}
|
|
133
|
+
}));
|
|
180
134
|
};
|
|
181
135
|
exports.setupGitHubAuth = setupGitHubAuth;
|
|
182
136
|
/**
|
|
@@ -188,16 +142,15 @@ exports.setupGitHubAuth = setupGitHubAuth;
|
|
|
188
142
|
* - POST /auth/github/link - Links GitHub account to authenticated user (requires JWT auth)
|
|
189
143
|
* - DELETE /auth/github/unlink - Unlinks GitHub account from authenticated user (requires JWT auth)
|
|
190
144
|
*/
|
|
191
|
-
|
|
192
|
-
|
|
145
|
+
const addGitHubAuthRoutes = (app, userModel, githubOptions, authOptions) => {
|
|
146
|
+
const router = (0, express_1.Router)();
|
|
193
147
|
// Initiate GitHub OAuth flow
|
|
194
|
-
router.get("/github",
|
|
195
|
-
var _a;
|
|
148
|
+
router.get("/github", (req, _res, next) => {
|
|
196
149
|
// Store the return URL in session or query for redirect after auth
|
|
197
|
-
|
|
150
|
+
const returnTo = req.query.returnTo;
|
|
198
151
|
if (returnTo) {
|
|
199
|
-
|
|
200
|
-
reqWithSession.session =
|
|
152
|
+
const reqWithSession = req;
|
|
153
|
+
reqWithSession.session = reqWithSession.session ?? {};
|
|
201
154
|
reqWithSession.session.returnTo = returnTo;
|
|
202
155
|
}
|
|
203
156
|
next();
|
|
@@ -206,52 +159,44 @@ var addGitHubAuthRoutes = function (app, userModel, githubOptions, authOptions)
|
|
|
206
159
|
router.get("/github/callback", passport_1.default.authenticate("github", {
|
|
207
160
|
failureRedirect: "/auth/github/failure",
|
|
208
161
|
session: false,
|
|
209
|
-
}),
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
url.searchParams.set("token", (_b = tokens.token) !== null && _b !== void 0 ? _b : "");
|
|
224
|
-
if (tokens.refreshToken) {
|
|
225
|
-
url.searchParams.set("refreshToken", tokens.refreshToken);
|
|
226
|
-
}
|
|
227
|
-
url.searchParams.set("userId", ((_c = req.user) === null || _c === void 0 ? void 0 : _c._id) ? String(req.user._id) : "");
|
|
228
|
-
return [2 /*return*/, res.redirect(url.toString())];
|
|
229
|
-
}
|
|
230
|
-
// Otherwise return JSON response
|
|
231
|
-
return [2 /*return*/, res.json({
|
|
232
|
-
data: {
|
|
233
|
-
refreshToken: tokens.refreshToken,
|
|
234
|
-
token: tokens.token,
|
|
235
|
-
userId: (_d = req.user) === null || _d === void 0 ? void 0 : _d._id,
|
|
236
|
-
},
|
|
237
|
-
})];
|
|
238
|
-
case 2:
|
|
239
|
-
error_2 = _e.sent();
|
|
240
|
-
logger_1.logger.error("GitHub callback error: ".concat(error_2));
|
|
241
|
-
return [2 /*return*/, res.status(500).json({ message: "Authentication failed" })];
|
|
242
|
-
case 3: return [2 /*return*/];
|
|
162
|
+
}), async (req, res) => {
|
|
163
|
+
try {
|
|
164
|
+
const tokens = await (0, auth_1.generateTokens)(req.user, authOptions);
|
|
165
|
+
const returnTo = req.session
|
|
166
|
+
?.returnTo;
|
|
167
|
+
// If there's a return URL, redirect with tokens as query params
|
|
168
|
+
if (returnTo) {
|
|
169
|
+
const url = new URL(returnTo);
|
|
170
|
+
url.searchParams.set("token", tokens.token ?? "");
|
|
171
|
+
if (tokens.refreshToken) {
|
|
172
|
+
url.searchParams.set("refreshToken", tokens.refreshToken);
|
|
173
|
+
}
|
|
174
|
+
url.searchParams.set("userId", req.user?._id ? String(req.user._id) : "");
|
|
175
|
+
return res.redirect(url.toString());
|
|
243
176
|
}
|
|
244
|
-
|
|
245
|
-
|
|
177
|
+
// Otherwise return JSON response
|
|
178
|
+
return res.json({
|
|
179
|
+
data: {
|
|
180
|
+
refreshToken: tokens.refreshToken,
|
|
181
|
+
token: tokens.token,
|
|
182
|
+
userId: req.user?._id,
|
|
183
|
+
},
|
|
184
|
+
});
|
|
185
|
+
}
|
|
186
|
+
catch (error) {
|
|
187
|
+
logger_1.logger.error(`GitHub callback error: ${error}`);
|
|
188
|
+
return res.status(500).json({ message: "Authentication failed" });
|
|
189
|
+
}
|
|
190
|
+
});
|
|
246
191
|
// GitHub auth failure handler
|
|
247
|
-
router.get("/github/failure",
|
|
192
|
+
router.get("/github/failure", (_req, res) => {
|
|
248
193
|
return res.status(401).json({ message: "GitHub authentication failed" });
|
|
249
194
|
});
|
|
250
195
|
// Link GitHub to existing authenticated user
|
|
251
196
|
if (githubOptions.allowAccountLinking !== false) {
|
|
252
|
-
router.get("/github/link",
|
|
197
|
+
router.get("/github/link", (req, res, next) => {
|
|
253
198
|
// Require JWT authentication for linking
|
|
254
|
-
passport_1.default.authenticate("jwt", { session: false },
|
|
199
|
+
passport_1.default.authenticate("jwt", { session: false }, (err, user) => {
|
|
255
200
|
if (err || !user) {
|
|
256
201
|
res.status(401).json({ message: "Authentication required to link GitHub account" });
|
|
257
202
|
return;
|
|
@@ -261,47 +206,38 @@ var addGitHubAuthRoutes = function (app, userModel, githubOptions, authOptions)
|
|
|
261
206
|
})(req, res, next);
|
|
262
207
|
}, passport_1.default.authenticate("github", { session: false }));
|
|
263
208
|
// Unlink GitHub from user account
|
|
264
|
-
router.delete("/github/unlink", passport_1.default.authenticate("jwt", { session: false }),
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
case 1:
|
|
274
|
-
_a.trys.push([1, 4, , 5]);
|
|
275
|
-
return [4 /*yield*/, userModel.findById(req.user._id).select("+hash +salt")];
|
|
276
|
-
case 2:
|
|
277
|
-
user = _a.sent();
|
|
278
|
-
if (!user) {
|
|
279
|
-
return [2 /*return*/, res.status(404).json({ message: "User not found" })];
|
|
280
|
-
}
|
|
281
|
-
userWithAuth = user;
|
|
282
|
-
hasPassword = !!userWithAuth.hash || !!userWithAuth.salt;
|
|
283
|
-
if (!hasPassword) {
|
|
284
|
-
return [2 /*return*/, res.status(400).json({
|
|
285
|
-
message: "Cannot unlink GitHub account without another authentication method. Set a password first.",
|
|
286
|
-
})];
|
|
287
|
-
}
|
|
288
|
-
userWithGitHub = user;
|
|
289
|
-
userWithGitHub.githubId = undefined;
|
|
290
|
-
userWithGitHub.githubUsername = undefined;
|
|
291
|
-
userWithGitHub.githubProfileUrl = undefined;
|
|
292
|
-
userWithGitHub.githubAvatarUrl = undefined;
|
|
293
|
-
return [4 /*yield*/, user.save()];
|
|
294
|
-
case 3:
|
|
295
|
-
_a.sent();
|
|
296
|
-
return [2 /*return*/, res.json({ data: { message: "GitHub account unlinked successfully" } })];
|
|
297
|
-
case 4:
|
|
298
|
-
error_3 = _a.sent();
|
|
299
|
-
logger_1.logger.error("GitHub unlink error: ".concat(error_3));
|
|
300
|
-
return [2 /*return*/, res.status(500).json({ message: "Failed to unlink GitHub account" })];
|
|
301
|
-
case 5: return [2 /*return*/];
|
|
209
|
+
router.delete("/github/unlink", passport_1.default.authenticate("jwt", { session: false }), async (req, res) => {
|
|
210
|
+
if (!req.user) {
|
|
211
|
+
return res.status(401).json({ message: "Authentication required" });
|
|
212
|
+
}
|
|
213
|
+
try {
|
|
214
|
+
// Explicitly select hash and salt fields which may be hidden by default
|
|
215
|
+
const user = await userModel.findById(req.user._id).select("+hash +salt");
|
|
216
|
+
if (!user) {
|
|
217
|
+
return res.status(404).json({ message: "User not found" });
|
|
302
218
|
}
|
|
303
|
-
|
|
304
|
-
|
|
219
|
+
// Check if user has other authentication methods before unlinking
|
|
220
|
+
// passport-local-mongoose stores password in hash and salt fields
|
|
221
|
+
const userWithAuth = user;
|
|
222
|
+
const hasPassword = !!userWithAuth.hash || !!userWithAuth.salt;
|
|
223
|
+
if (!hasPassword) {
|
|
224
|
+
return res.status(400).json({
|
|
225
|
+
message: "Cannot unlink GitHub account without another authentication method. Set a password first.",
|
|
226
|
+
});
|
|
227
|
+
}
|
|
228
|
+
const userWithGitHub = user;
|
|
229
|
+
userWithGitHub.githubId = undefined;
|
|
230
|
+
userWithGitHub.githubUsername = undefined;
|
|
231
|
+
userWithGitHub.githubProfileUrl = undefined;
|
|
232
|
+
userWithGitHub.githubAvatarUrl = undefined;
|
|
233
|
+
await user.save();
|
|
234
|
+
return res.json({ data: { message: "GitHub account unlinked successfully" } });
|
|
235
|
+
}
|
|
236
|
+
catch (error) {
|
|
237
|
+
logger_1.logger.error(`GitHub unlink error: ${error}`);
|
|
238
|
+
return res.status(500).json({ message: "Failed to unlink GitHub account" });
|
|
239
|
+
}
|
|
240
|
+
});
|
|
305
241
|
}
|
|
306
242
|
app.use("/auth", router);
|
|
307
243
|
};
|