@terreno/api 57.19.2 → 57.21.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/CHANGELOG.md +443 -0
- package/biome.jsonc +1 -0
- package/dist/accountSecurity/accessActions.d.ts +38 -0
- package/dist/accountSecurity/accessActions.js +157 -0
- package/dist/accountSecurity/accountSecurityApp.d.ts +219 -0
- package/dist/accountSecurity/accountSecurityApp.js +438 -0
- package/dist/accountSecurity/accountSecurityService.d.ts +200 -0
- package/dist/accountSecurity/accountSecurityService.js +481 -0
- package/dist/accountSecurity/credentialActions.d.ts +16 -0
- package/dist/accountSecurity/credentialActions.js +189 -0
- package/dist/accountSecurity/membershipActions.d.ts +15 -0
- package/dist/accountSecurity/membershipActions.js +81 -0
- package/dist/accountSecurity/orgSecurityRoutes.d.ts +50 -0
- package/dist/accountSecurity/orgSecurityRoutes.js +149 -0
- package/dist/accountSecurity/securityEventHooks.d.ts +44 -0
- package/dist/accountSecurity/securityEventHooks.js +223 -0
- package/dist/accountSecurity/securityEvents.d.ts +162 -0
- package/dist/accountSecurity/securityEvents.js +114 -0
- package/dist/accountSecurity/securityNotifications.d.ts +125 -0
- package/dist/accountSecurity/securityNotifications.js +333 -0
- package/dist/api.d.ts +3 -3
- package/dist/api.js +38 -6
- package/dist/audit/auditEventModel.d.ts +5 -3
- package/dist/audit/auditEventModel.js +8 -6
- package/dist/audit/processQueue.js +4 -2
- package/dist/audit/record.d.ts +2 -2
- package/dist/audit/record.js +3 -0
- package/dist/authRecovery.js +29 -1
- package/dist/betterAuth.d.ts +179 -10
- package/dist/betterAuthApp.d.ts +15 -0
- package/dist/betterAuthApp.js +23 -0
- package/dist/betterAuthChallengeHeaders.d.ts +37 -0
- package/dist/betterAuthChallengeHeaders.js +180 -0
- package/dist/betterAuthFeatures.d.ts +54 -0
- package/dist/betterAuthFeatures.js +239 -0
- package/dist/betterAuthMethods.d.ts +73 -0
- package/dist/betterAuthMethods.js +55 -0
- package/dist/betterAuthOAuthHandoff.d.ts +10 -2
- package/dist/betterAuthOAuthHandoff.js +222 -24
- package/dist/betterAuthSetPassword.d.ts +33 -0
- package/dist/betterAuthSetPassword.js +166 -0
- package/dist/betterAuthSetup.d.ts +57 -8
- package/dist/betterAuthSetup.js +327 -36
- package/dist/consentApp.d.ts +9 -4
- package/dist/consentApp.js +344 -28
- package/dist/consentStatus.d.ts +60 -0
- package/dist/consentStatus.js +111 -0
- package/dist/errors.d.ts +6 -0
- package/dist/errors.js +41 -2
- package/dist/expressServer.js +3 -2
- package/dist/frameworkModelNames.d.ts +4 -0
- package/dist/frameworkModelNames.js +4 -0
- package/dist/index.d.ts +18 -2
- package/dist/index.js +29 -3
- package/dist/mcp/adminTracking.d.ts +28 -0
- package/dist/mcp/adminTracking.js +80 -0
- package/dist/mcp/auth.d.ts +6 -0
- package/dist/mcp/auth.js +12 -2
- package/dist/mcp/oauth.js +151 -11
- package/dist/mcp/oauthMetadata.d.ts +2 -1
- package/dist/mcp/oauthMetadata.js +7 -4
- package/dist/mcp/server.d.ts +8 -0
- package/dist/mcp/server.js +48 -4
- package/dist/models/consentResponse.js +51 -0
- package/dist/models/mcpOAuthClient.js +78 -2
- package/dist/models/mcpOAuthToken.js +55 -4
- package/dist/models/mcpRequestLog.d.ts +2 -0
- package/dist/models/mcpRequestLog.js +73 -0
- package/dist/models/mcpServiceToken.js +4 -0
- package/dist/models/mcpToolSetting.d.ts +2 -0
- package/dist/models/mcpToolSetting.js +119 -0
- package/dist/models/versionConfig.d.ts +2 -0
- package/dist/orgs/membershipGuards.d.ts +7 -0
- package/dist/orgs/membershipGuards.js +32 -0
- package/dist/orgs/orgsApp.d.ts +19 -1
- package/dist/orgs/orgsApp.js +55 -24
- package/dist/rateLimit/policies.js +8 -0
- package/dist/rbac/access.js +2 -1
- package/dist/rbac/auditModel.d.ts +2 -1
- package/dist/rbac/resolve.d.ts +9 -1
- package/dist/rbac/resolve.js +21 -16
- package/dist/rbac/roleManager.d.ts +6 -0
- package/dist/rbac/roleManager.js +8 -7
- package/dist/rbac/roleModel.d.ts +1 -0
- package/dist/rbac/roleModel.js +45 -3
- package/dist/rbac/statements.d.ts +2 -2
- package/dist/rbac/statements.js +10 -1
- package/dist/rbac/types.d.ts +6 -0
- package/dist/rbac/userWriteGuards.js +2 -1
- package/dist/schemaMetadata.js +8 -1
- package/dist/seedRunner.js +7 -2
- package/dist/terrenoApp.d.ts +16 -0
- package/dist/terrenoApp.js +18 -0
- package/dist/tests/models.d.ts +22 -22
- package/dist/tests/models.js +15 -1
- package/dist/tests/testHelper.d.ts +6 -12
- package/dist/tests.d.ts +1 -0
- package/dist/tests.js +3 -1
- package/dist/types/consentResponse.d.ts +8 -0
- package/dist/types/mcpAdmin.d.ts +58 -0
- package/dist/types/mcpAdmin.js +2 -0
- package/dist/types/mcpOAuth.d.ts +37 -2
- package/dist/types/mcpServiceToken.d.ts +2 -0
- package/e2e/smoke.ts +193 -0
- package/package.json +10 -5
- package/src/__snapshots__/openApi.test.ts.snap +288 -0
- package/src/__snapshots__/openApiBuilder.test.ts.snap +96 -0
- package/src/accountSecurity/accessActions.test.ts +723 -0
- package/src/accountSecurity/accessActions.ts +173 -0
- package/src/accountSecurity/accountSecurity.test.ts +947 -0
- package/src/accountSecurity/accountSecurityApp.ts +720 -0
- package/src/accountSecurity/accountSecurityService.ts +826 -0
- package/src/accountSecurity/credentialActions.test.ts +867 -0
- package/src/accountSecurity/credentialActions.ts +260 -0
- package/src/accountSecurity/membershipActions.ts +89 -0
- package/src/accountSecurity/orgSecurityRoutes.test.ts +841 -0
- package/src/accountSecurity/orgSecurityRoutes.ts +232 -0
- package/src/accountSecurity/securityEventHooks.ts +294 -0
- package/src/accountSecurity/securityEvents.ts +165 -0
- package/src/accountSecurity/securityNotifications.test.ts +1323 -0
- package/src/accountSecurity/securityNotifications.ts +516 -0
- package/src/adminModelRouter.test.ts +8 -6
- package/src/api.arrayOperations.test.ts +102 -22
- package/src/api.hooks.test.ts +12 -11
- package/src/api.query.test.ts +2 -2
- package/src/api.test.ts +8 -7
- package/src/api.ts +41 -10
- package/src/audit/auditApp.test.ts +1 -1
- package/src/audit/auditEventModel.ts +10 -7
- package/src/audit/cloudTasksEnqueue.test.ts +19 -14
- package/src/audit/processQueue.ts +4 -2
- package/src/audit/record.test.ts +15 -0
- package/src/audit/record.ts +10 -2
- package/src/auth.test.ts +21 -7
- package/src/authRecovery.test.ts +33 -10
- package/src/authRecovery.ts +34 -1
- package/src/authRecoveryBetterAuth.test.ts +169 -0
- package/src/authVerification.test.ts +7 -7
- package/src/betterAuth.ts +194 -8
- package/src/betterAuthApp.ts +32 -0
- package/src/betterAuthChallengeHeaders.test.ts +476 -0
- package/src/betterAuthChallengeHeaders.ts +227 -0
- package/src/betterAuthFeatures.test.ts +490 -0
- package/src/betterAuthFeatures.ts +283 -0
- package/src/betterAuthLinking.test.ts +846 -0
- package/src/betterAuthMethods.test.ts +138 -0
- package/src/betterAuthMethods.ts +98 -0
- package/src/betterAuthOAuthHandoff.test.ts +482 -69
- package/src/betterAuthOAuthHandoff.ts +293 -33
- package/src/betterAuthOAuthProxy.test.ts +421 -0
- package/src/betterAuthPasswordReset.test.ts +190 -0
- package/src/betterAuthSetPassword.test.ts +378 -0
- package/src/betterAuthSetPassword.ts +213 -0
- package/src/betterAuthSetup.test.ts +115 -57
- package/src/betterAuthSetup.ts +457 -38
- package/src/collectionRegistry.test.ts +4 -4
- package/src/consentApp.test.ts +869 -2
- package/src/consentApp.ts +438 -36
- package/src/consentStatus.test.ts +226 -0
- package/src/consentStatus.ts +171 -0
- package/src/errors.test.ts +81 -0
- package/src/errors.ts +50 -1
- package/src/expressServer.test.ts +29 -0
- package/src/expressServer.ts +3 -2
- package/src/frameworkModelNames.test.ts +8 -0
- package/src/frameworkModelNames.ts +4 -0
- package/src/githubAuth.test.ts +11 -11
- package/src/index.ts +38 -0
- package/src/isolated/migrateCliConnect.isolated.ts +3 -2
- package/src/mcp/actionTools.test.ts +11 -5
- package/src/mcp/adminTracking.test.ts +272 -0
- package/src/mcp/adminTracking.ts +104 -0
- package/src/mcp/auth.ts +18 -2
- package/src/mcp/oauth.test.ts +463 -2
- package/src/mcp/oauth.ts +184 -13
- package/src/mcp/oauthMetadata.ts +5 -2
- package/src/mcp/server.ts +67 -4
- package/src/mcp/serviceTokens.test.ts +2 -1
- package/src/mcp/toolGenerator.test.ts +9 -5
- package/src/migrations/cli.test.ts +15 -14
- package/src/migrations/cli.ts +1 -1
- package/src/migrations/generate.test.ts +2 -2
- package/src/migrations/load.test.ts +1 -1
- package/src/migrations/lock.test.ts +8 -3
- package/src/migrations/runner.test.ts +16 -5
- package/src/migrations/schemaCatalog.test.ts +4 -1
- package/src/models/consentResponse.ts +53 -0
- package/src/models/mcpOAuthClient.ts +100 -3
- package/src/models/mcpOAuthToken.test.ts +42 -0
- package/src/models/mcpOAuthToken.ts +62 -5
- package/src/models/mcpRequestLog.ts +81 -0
- package/src/models/mcpServiceToken.test.ts +23 -0
- package/src/models/mcpServiceToken.ts +10 -0
- package/src/models/mcpToolSetting.test.ts +69 -0
- package/src/models/mcpToolSetting.ts +138 -0
- package/src/models/versionConfig.ts +2 -0
- package/src/notifications/notificationsApp.test.ts +5 -8
- package/src/notifiers/slackWebApi.test.ts +30 -8
- package/src/openApi.test.ts +4 -4
- package/src/openApiValidator.test.ts +3 -3
- package/src/orgs/membershipGuards.ts +39 -0
- package/src/orgs/orgPermissions.test.ts +2 -2
- package/src/orgs/orgPlugin.test.ts +4 -3
- package/src/orgs/orgRbac.test.ts +1 -1
- package/src/orgs/orgSecurityDefects.test.ts +3 -1
- package/src/orgs/organizationSettings.test.ts +1 -1
- package/src/orgs/orgsApp.test.ts +104 -3
- package/src/orgs/orgsApp.ts +69 -28
- package/src/permissions.test.ts +2 -2
- package/src/rateLimit/policies.test.ts +53 -0
- package/src/rateLimit/policies.ts +8 -0
- package/src/rateLimit/redisStore.ioredis.test.ts +3 -2
- package/src/rbac/access.ts +4 -1
- package/src/rbac/assertAllowed.test.ts +1 -1
- package/src/rbac/auditModel.ts +10 -2
- package/src/rbac/realtimeAccess.test.ts +3 -2
- package/src/rbac/resolve.test.ts +65 -0
- package/src/rbac/resolve.ts +37 -17
- package/src/rbac/roleManager.test.ts +64 -0
- package/src/rbac/roleManager.ts +15 -6
- package/src/rbac/roleModel.test.ts +174 -1
- package/src/rbac/roleModel.ts +66 -3
- package/src/rbac/routes.test.ts +58 -0
- package/src/rbac/statements.test.ts +4 -1
- package/src/rbac/statements.ts +11 -1
- package/src/rbac/types.ts +6 -1
- package/src/rbac/userWriteGuards.test.ts +56 -5
- package/src/rbac/userWriteGuards.ts +5 -2
- package/src/realtime/realtime.test.ts +35 -31
- package/src/schemaMetadata.test.ts +39 -0
- package/src/schemaMetadata.ts +11 -1
- package/src/scrubAdminFields.test.ts +1 -1
- package/src/seedRunner.test.ts +56 -0
- package/src/seedRunner.ts +7 -2
- package/src/sync/adminWindowMutation.test.ts +4 -3
- package/src/sync/executors.test.ts +1 -1
- package/src/sync/scripts/compactTombstones.test.ts +4 -3
- package/src/sync/sync.test.ts +1 -1
- package/src/sync/syncPhaseC.test.ts +14 -11
- package/src/sync/syncRoutes.test.ts +8 -8
- package/src/sync/syncSeqPlugin.test.ts +1 -2
- package/src/sync/syncSocket.test.ts +5 -4
- package/src/terrenoApp.mcpServiceTokens.test.ts +2 -2
- package/src/terrenoApp.migrations.test.ts +8 -7
- package/src/terrenoApp.ts +34 -0
- package/src/tests/accountSecurityTestApp.ts +290 -0
- package/src/tests/betterAuthStubs.ts +189 -0
- package/src/tests/bunSetup.ts +1 -1
- package/src/tests/mockOidcProvider.ts +105 -0
- package/src/tests/models.ts +23 -0
- package/src/tests/softwareAuthenticator.ts +183 -0
- package/src/tests/testEnv.ts +7 -0
- package/src/tests.ts +1 -0
- package/src/types/consentResponse.ts +8 -0
- package/src/types/mcpAdmin.ts +80 -0
- package/src/types/mcpOAuth.ts +44 -3
- package/src/types/mcpServiceToken.ts +5 -0
- package/src/webhooks/verifiers/hmac.test.ts +1 -1
- package/tsconfig.typecheck.json +14 -0
|
@@ -4,7 +4,7 @@ import {assert} from "chai";
|
|
|
4
4
|
import express, {type Request, type Response} from "express";
|
|
5
5
|
import {DateTime} from "luxon";
|
|
6
6
|
import {MongoMemoryServer} from "mongodb-memory-server";
|
|
7
|
-
import mongoose, {Schema} from "mongoose";
|
|
7
|
+
import mongoose, {type Model, Schema} from "mongoose";
|
|
8
8
|
import passportLocalMongoose from "passport-local-mongoose";
|
|
9
9
|
import supertest from "supertest";
|
|
10
10
|
import type {UserModel} from "./auth";
|
|
@@ -31,6 +31,11 @@ import {
|
|
|
31
31
|
type SessionRequest = Request & {betterAuthSession?: BetterAuthSessionData};
|
|
32
32
|
const makeReq = (overrides: Partial<SessionRequest> = {}): SessionRequest =>
|
|
33
33
|
({headers: {}, ...overrides}) as SessionRequest;
|
|
34
|
+
/** Session doubles carry only the fields the middleware reads. */
|
|
35
|
+
const asSessionData = (data: {
|
|
36
|
+
session: Partial<BetterAuthSessionData["session"]>;
|
|
37
|
+
user: Partial<BetterAuthUser>;
|
|
38
|
+
}): BetterAuthSessionData => data as BetterAuthSessionData;
|
|
34
39
|
const makeRes = (): Response => ({}) as Response;
|
|
35
40
|
const setGetSession = (auth: BetterAuthInstance, getSession: () => unknown): void => {
|
|
36
41
|
(auth.api as unknown as {getSession: () => unknown}).getSession = getSession;
|
|
@@ -39,12 +44,29 @@ const setGetSession = (auth: BetterAuthInstance, getSession: () => unknown): voi
|
|
|
39
44
|
// Use a separate connection to avoid conflict with bunSetup.ts preload
|
|
40
45
|
let conn: mongoose.Connection;
|
|
41
46
|
let mongod: MongoMemoryServer;
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
47
|
+
/** Union of the fields the Better Auth test user schemas below declare. */
|
|
48
|
+
interface BetterAuthTestUser {
|
|
49
|
+
admin: boolean;
|
|
50
|
+
betterAuthId?: string;
|
|
51
|
+
disabled?: boolean;
|
|
52
|
+
email: string;
|
|
53
|
+
emailVerified?: boolean;
|
|
54
|
+
name?: string;
|
|
55
|
+
oauthProvider?: string;
|
|
56
|
+
tokenEpoch?: number;
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
type BetterAuthTestUserModel = Model<BetterAuthTestUser>;
|
|
60
|
+
|
|
61
|
+
let TestUser: BetterAuthTestUserModel;
|
|
62
|
+
let StrictUser: BetterAuthTestUserModel;
|
|
63
|
+
let DualAuthUser: BetterAuthTestUserModel;
|
|
64
|
+
|
|
65
|
+
/** The Better Auth helpers take the app `UserModel`; these test schemas stand in for it. */
|
|
66
|
+
const asUserModel = (model: BetterAuthTestUserModel): UserModel => model as unknown as UserModel;
|
|
45
67
|
|
|
46
68
|
// Simple user schema for testing
|
|
47
|
-
const testUserSchema = new Schema({
|
|
69
|
+
const testUserSchema = new Schema<BetterAuthTestUser>({
|
|
48
70
|
admin: {default: false, type: Boolean},
|
|
49
71
|
betterAuthId: {type: String},
|
|
50
72
|
disabled: {default: false, type: Boolean},
|
|
@@ -53,7 +75,7 @@ const testUserSchema = new Schema({
|
|
|
53
75
|
oauthProvider: {type: String},
|
|
54
76
|
});
|
|
55
77
|
|
|
56
|
-
const dualAuthUserSchema = new Schema({
|
|
78
|
+
const dualAuthUserSchema = new Schema<BetterAuthTestUser>({
|
|
57
79
|
admin: {default: false, type: Boolean},
|
|
58
80
|
betterAuthId: {type: String},
|
|
59
81
|
email: {required: true, type: String},
|
|
@@ -69,7 +91,7 @@ dualAuthUserSchema.plugin(
|
|
|
69
91
|
}
|
|
70
92
|
);
|
|
71
93
|
|
|
72
|
-
const strictUserSchema = new Schema(
|
|
94
|
+
const strictUserSchema = new Schema<BetterAuthTestUser>(
|
|
73
95
|
{
|
|
74
96
|
admin: {default: false, type: Boolean},
|
|
75
97
|
betterAuthId: {type: String},
|
|
@@ -84,9 +106,9 @@ const setup = (async () => {
|
|
|
84
106
|
mongod = await MongoMemoryServer.create();
|
|
85
107
|
conn = mongoose.createConnection(mongod.getUri());
|
|
86
108
|
await conn.asPromise();
|
|
87
|
-
TestUser = conn.model("BetterAuthTestUser", testUserSchema)
|
|
88
|
-
StrictUser = conn.model("BetterAuthStrictUser", strictUserSchema)
|
|
89
|
-
DualAuthUser = conn.model("BetterAuthDualUser", dualAuthUserSchema)
|
|
109
|
+
TestUser = conn.model<BetterAuthTestUser>("BetterAuthTestUser", testUserSchema);
|
|
110
|
+
StrictUser = conn.model<BetterAuthTestUser>("BetterAuthStrictUser", strictUserSchema);
|
|
111
|
+
DualAuthUser = conn.model<BetterAuthTestUser>("BetterAuthDualUser", dualAuthUserSchema);
|
|
90
112
|
})();
|
|
91
113
|
|
|
92
114
|
// Helper to get the mongo client from our separate connection
|
|
@@ -282,7 +304,7 @@ describe("createBetterAuth", () => {
|
|
|
282
304
|
const auth = createBetterAuth({
|
|
283
305
|
config,
|
|
284
306
|
mongoClient: getClient(),
|
|
285
|
-
userModel: DualAuthUser,
|
|
307
|
+
userModel: asUserModel(DualAuthUser),
|
|
286
308
|
});
|
|
287
309
|
const options = (
|
|
288
310
|
auth as {
|
|
@@ -442,7 +464,7 @@ describe("applyBetterAuthPasswordResetToJwt", () => {
|
|
|
442
464
|
method: "POST",
|
|
443
465
|
});
|
|
444
466
|
await applyBetterAuthPasswordResetToJwt(
|
|
445
|
-
DualAuthUser,
|
|
467
|
+
asUserModel(DualAuthUser),
|
|
446
468
|
{email: "dual-jwt@example.com", id: "ba-dual-1"},
|
|
447
469
|
request
|
|
448
470
|
);
|
|
@@ -455,6 +477,25 @@ describe("applyBetterAuthPasswordResetToJwt", () => {
|
|
|
455
477
|
assert.equal(reloaded?.tokenEpoch, 1);
|
|
456
478
|
});
|
|
457
479
|
|
|
480
|
+
it("does not give an account without a JWT password one, but still bumps tokenEpoch", async () => {
|
|
481
|
+
await setup;
|
|
482
|
+
await DualAuthUser.create({betterAuthId: "ba-social-only", email: "social-only@example.com"});
|
|
483
|
+
const request = new globalThis.Request("http://localhost/api/auth/reset-password", {
|
|
484
|
+
body: JSON.stringify({newPassword: "new-password-123"}),
|
|
485
|
+
headers: {"Content-Type": "application/json"},
|
|
486
|
+
method: "POST",
|
|
487
|
+
});
|
|
488
|
+
await applyBetterAuthPasswordResetToJwt(
|
|
489
|
+
asUserModel(DualAuthUser),
|
|
490
|
+
{email: "social-only@example.com", id: "ba-social-only"},
|
|
491
|
+
request
|
|
492
|
+
);
|
|
493
|
+
const stored = await DualAuthUser.collection.findOne({email: "social-only@example.com"});
|
|
494
|
+
assert.isUndefined(stored?.hash);
|
|
495
|
+
assert.isUndefined(stored?.salt);
|
|
496
|
+
assert.equal(stored?.tokenEpoch, 1);
|
|
497
|
+
});
|
|
498
|
+
|
|
458
499
|
it("skips JWT sync when no app user exists", async () => {
|
|
459
500
|
await setup;
|
|
460
501
|
const request = new globalThis.Request("http://localhost/api/auth/reset-password", {
|
|
@@ -463,7 +504,7 @@ describe("applyBetterAuthPasswordResetToJwt", () => {
|
|
|
463
504
|
method: "POST",
|
|
464
505
|
});
|
|
465
506
|
await applyBetterAuthPasswordResetToJwt(
|
|
466
|
-
DualAuthUser,
|
|
507
|
+
asUserModel(DualAuthUser),
|
|
467
508
|
{email: "missing-jwt@example.com", id: "ba-missing"},
|
|
468
509
|
request
|
|
469
510
|
);
|
|
@@ -473,10 +514,14 @@ describe("applyBetterAuthPasswordResetToJwt", () => {
|
|
|
473
514
|
|
|
474
515
|
it("throws when the reset request does not carry a password", async () => {
|
|
475
516
|
await setup;
|
|
476
|
-
await
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
|
|
517
|
+
await (
|
|
518
|
+
DualAuthUser as unknown as {
|
|
519
|
+
register: (
|
|
520
|
+
user: {betterAuthId: string; email: string},
|
|
521
|
+
password: string
|
|
522
|
+
) => Promise<unknown>;
|
|
523
|
+
}
|
|
524
|
+
).register({betterAuthId: "ba-dual-nopw", email: "nopw-jwt@example.com"}, "old-password-123");
|
|
480
525
|
const request = new globalThis.Request("http://localhost/api/auth/reset-password", {
|
|
481
526
|
body: JSON.stringify({token: "reset-token"}),
|
|
482
527
|
headers: {"Content-Type": "application/json"},
|
|
@@ -484,7 +529,7 @@ describe("applyBetterAuthPasswordResetToJwt", () => {
|
|
|
484
529
|
});
|
|
485
530
|
await expect(
|
|
486
531
|
applyBetterAuthPasswordResetToJwt(
|
|
487
|
-
DualAuthUser,
|
|
532
|
+
asUserModel(DualAuthUser),
|
|
488
533
|
{email: "nopw-jwt@example.com", id: "ba-dual-nopw"},
|
|
489
534
|
request
|
|
490
535
|
)
|
|
@@ -617,7 +662,7 @@ describe("createBetterAuth email and password-reset wiring", () => {
|
|
|
617
662
|
const auth = createBetterAuth({
|
|
618
663
|
config: baseConfig,
|
|
619
664
|
mongoClient: getClient(),
|
|
620
|
-
userModel: DualAuthUser,
|
|
665
|
+
userModel: asUserModel(DualAuthUser),
|
|
621
666
|
});
|
|
622
667
|
const registerable = DualAuthUser as unknown as {
|
|
623
668
|
register: (user: {betterAuthId: string; email: string}, password: string) => Promise<unknown>;
|
|
@@ -750,9 +795,10 @@ describe("applyJwtPasswordResetToBetterAuth lookups", () => {
|
|
|
750
795
|
const auth = makeAuth();
|
|
751
796
|
const ctx = (await auth.$context) as {
|
|
752
797
|
internalAdapter: {
|
|
753
|
-
createUser: (
|
|
754
|
-
|
|
755
|
-
|
|
798
|
+
createUser: (
|
|
799
|
+
user: {email: string; emailVerified: boolean; name: string},
|
|
800
|
+
source?: unknown
|
|
801
|
+
) => Promise<{id: string}>;
|
|
756
802
|
findAccounts: (userId: string) => Promise<Array<{providerId?: string}>>;
|
|
757
803
|
};
|
|
758
804
|
};
|
|
@@ -786,7 +832,7 @@ describe("syncBetterAuthUser", () => {
|
|
|
786
832
|
it("creates a new user when none exists", async () => {
|
|
787
833
|
await setup;
|
|
788
834
|
const baUser = makeBetterAuthUser();
|
|
789
|
-
const result = await syncBetterAuthUser(TestUser, baUser);
|
|
835
|
+
const result = await syncBetterAuthUser(asUserModel(TestUser), baUser);
|
|
790
836
|
|
|
791
837
|
expect(result).toBeDefined();
|
|
792
838
|
expect(result.email).toBe("test@example.com");
|
|
@@ -798,7 +844,7 @@ describe("syncBetterAuthUser", () => {
|
|
|
798
844
|
it("creates a user on a strict-throw schema that omits oauthProvider", async () => {
|
|
799
845
|
await setup;
|
|
800
846
|
const baUser = makeBetterAuthUser({email: "strict@example.com"});
|
|
801
|
-
const result = await syncBetterAuthUser(StrictUser, baUser);
|
|
847
|
+
const result = await syncBetterAuthUser(asUserModel(StrictUser), baUser);
|
|
802
848
|
|
|
803
849
|
assert.equal(result.email, "strict@example.com");
|
|
804
850
|
assert.equal(result.betterAuthId, "ba-user-123");
|
|
@@ -810,11 +856,11 @@ describe("syncBetterAuthUser", () => {
|
|
|
810
856
|
it("sets oauthProvider on create when a provider is passed", async () => {
|
|
811
857
|
await setup;
|
|
812
858
|
const baUser = makeBetterAuthUser({email: "oauth-create@example.com"});
|
|
813
|
-
const result = await syncBetterAuthUser(TestUser, baUser, "google");
|
|
859
|
+
const result = await syncBetterAuthUser(asUserModel(TestUser), baUser, "google");
|
|
814
860
|
|
|
815
861
|
assert.equal(result.oauthProvider, "google");
|
|
816
862
|
const saved = await TestUser.findOne({email: "oauth-create@example.com"}).lean();
|
|
817
|
-
assert.equal(saved
|
|
863
|
+
assert.equal(saved?.oauthProvider, "google");
|
|
818
864
|
});
|
|
819
865
|
|
|
820
866
|
it("updates an existing user matched by betterAuthId", async () => {
|
|
@@ -826,7 +872,7 @@ describe("syncBetterAuthUser", () => {
|
|
|
826
872
|
});
|
|
827
873
|
|
|
828
874
|
const baUser = makeBetterAuthUser({email: "new@example.com", name: "New Name"});
|
|
829
|
-
const result = await syncBetterAuthUser(TestUser, baUser);
|
|
875
|
+
const result = await syncBetterAuthUser(asUserModel(TestUser), baUser);
|
|
830
876
|
|
|
831
877
|
expect(result.email).toBe("new@example.com");
|
|
832
878
|
expect(result.name).toBe("New Name");
|
|
@@ -844,7 +890,7 @@ describe("syncBetterAuthUser", () => {
|
|
|
844
890
|
});
|
|
845
891
|
|
|
846
892
|
const baUser = makeBetterAuthUser();
|
|
847
|
-
const result = await syncBetterAuthUser(TestUser, baUser);
|
|
893
|
+
const result = await syncBetterAuthUser(asUserModel(TestUser), baUser);
|
|
848
894
|
|
|
849
895
|
expect(result.betterAuthId).toBe("ba-user-123");
|
|
850
896
|
expect(result.email).toBe("test@example.com");
|
|
@@ -861,7 +907,7 @@ describe("syncBetterAuthUser", () => {
|
|
|
861
907
|
});
|
|
862
908
|
|
|
863
909
|
const baUser = makeBetterAuthUser();
|
|
864
|
-
const result = await syncBetterAuthUser(TestUser, baUser, "google");
|
|
910
|
+
const result = await syncBetterAuthUser(asUserModel(TestUser), baUser, "google");
|
|
865
911
|
|
|
866
912
|
expect(result.oauthProvider).toBe("google");
|
|
867
913
|
});
|
|
@@ -869,7 +915,7 @@ describe("syncBetterAuthUser", () => {
|
|
|
869
915
|
it("uses email prefix as name when name is null", async () => {
|
|
870
916
|
await setup;
|
|
871
917
|
const baUser = makeBetterAuthUser({name: null});
|
|
872
|
-
const result = await syncBetterAuthUser(TestUser, baUser);
|
|
918
|
+
const result = await syncBetterAuthUser(asUserModel(TestUser), baUser);
|
|
873
919
|
|
|
874
920
|
expect(result.name).toBe("test");
|
|
875
921
|
});
|
|
@@ -883,7 +929,7 @@ describe("syncBetterAuthUser", () => {
|
|
|
883
929
|
});
|
|
884
930
|
|
|
885
931
|
const baUser = makeBetterAuthUser({name: null});
|
|
886
|
-
const result = await syncBetterAuthUser(TestUser, baUser);
|
|
932
|
+
const result = await syncBetterAuthUser(asUserModel(TestUser), baUser);
|
|
887
933
|
|
|
888
934
|
expect(result.name).toBe("Keep This Name");
|
|
889
935
|
});
|
|
@@ -893,8 +939,8 @@ describe("syncBetterAuthUser", () => {
|
|
|
893
939
|
await TestUser.create({admin: true, email: "test@example.com", name: "Existing Admin"});
|
|
894
940
|
|
|
895
941
|
const baUser = makeBetterAuthUser({emailVerified: false});
|
|
896
|
-
await expect(syncBetterAuthUser(TestUser, baUser)).rejects.toThrow(
|
|
897
|
-
"
|
|
942
|
+
await expect(syncBetterAuthUser(asUserModel(TestUser), baUser)).rejects.toThrow(
|
|
943
|
+
"Verify your email to use this account"
|
|
898
944
|
);
|
|
899
945
|
|
|
900
946
|
const saved = await TestUser.findOne({email: "test@example.com"}).lean();
|
|
@@ -906,7 +952,7 @@ describe("syncBetterAuthUser", () => {
|
|
|
906
952
|
await setup;
|
|
907
953
|
await TestUser.create({betterAuthId: "ba-other", email: "test@example.com"});
|
|
908
954
|
|
|
909
|
-
await expect(syncBetterAuthUser(TestUser, makeBetterAuthUser())).rejects.toThrow(
|
|
955
|
+
await expect(syncBetterAuthUser(asUserModel(TestUser), makeBetterAuthUser())).rejects.toThrow(
|
|
910
956
|
"An account with this email already exists"
|
|
911
957
|
);
|
|
912
958
|
|
|
@@ -919,7 +965,7 @@ describe("syncBetterAuthUser", () => {
|
|
|
919
965
|
await TestUser.create({betterAuthId: "ba-other", email: "test@example.com"});
|
|
920
966
|
|
|
921
967
|
const result = await syncBetterAuthUser(
|
|
922
|
-
TestUser,
|
|
968
|
+
asUserModel(TestUser),
|
|
923
969
|
makeBetterAuthUser({emailVerified: false}),
|
|
924
970
|
undefined,
|
|
925
971
|
{trustEmail: true}
|
|
@@ -935,7 +981,7 @@ describe("syncBetterAuthUser", () => {
|
|
|
935
981
|
};
|
|
936
982
|
await registrable.register({email: "test@example.com", name: "Legacy"}, "legacy-pass-123");
|
|
937
983
|
|
|
938
|
-
const result = await syncBetterAuthUser(DualAuthUser, makeBetterAuthUser());
|
|
984
|
+
const result = await syncBetterAuthUser(asUserModel(DualAuthUser), makeBetterAuthUser());
|
|
939
985
|
assert.equal(result.betterAuthId, "ba-user-123");
|
|
940
986
|
|
|
941
987
|
const saved = await DualAuthUser.findOne({email: "test@example.com"})
|
|
@@ -956,7 +1002,7 @@ describe("syncBetterAuthUser", () => {
|
|
|
956
1002
|
"legacy-pass-123"
|
|
957
1003
|
);
|
|
958
1004
|
|
|
959
|
-
await syncBetterAuthUser(DualAuthUser, makeBetterAuthUser());
|
|
1005
|
+
await syncBetterAuthUser(asUserModel(DualAuthUser), makeBetterAuthUser());
|
|
960
1006
|
|
|
961
1007
|
const saved = await DualAuthUser.findOne({email: "test@example.com"})
|
|
962
1008
|
.select("+hash +salt")
|
|
@@ -1039,14 +1085,14 @@ describe("createBetterAuthSessionMiddleware", () => {
|
|
|
1039
1085
|
|
|
1040
1086
|
const auth = createBetterAuth({config, mongoClient: getClient()});
|
|
1041
1087
|
|
|
1042
|
-
const mockSession = {
|
|
1088
|
+
const mockSession = asSessionData({
|
|
1043
1089
|
session: {id: "session-1", userId: "user-1"},
|
|
1044
1090
|
user: {
|
|
1045
1091
|
email: "user@example.com",
|
|
1046
1092
|
id: "user-1",
|
|
1047
1093
|
name: "Test User",
|
|
1048
1094
|
},
|
|
1049
|
-
};
|
|
1095
|
+
});
|
|
1050
1096
|
|
|
1051
1097
|
// Override getSession to return mock session
|
|
1052
1098
|
setGetSession(auth, async () => mockSession);
|
|
@@ -1060,9 +1106,9 @@ describe("createBetterAuthSessionMiddleware", () => {
|
|
|
1060
1106
|
|
|
1061
1107
|
expect(next).toHaveBeenCalledTimes(1);
|
|
1062
1108
|
expect(req.user).toBeDefined();
|
|
1063
|
-
expect(req.user
|
|
1064
|
-
expect(req.user
|
|
1065
|
-
expect(req.user
|
|
1109
|
+
expect(req.user?.email).toBe("user@example.com");
|
|
1110
|
+
expect(req.user?.betterAuthId).toBe("user-1");
|
|
1111
|
+
expect(req.user?.admin).toBe(false);
|
|
1066
1112
|
expect(req.betterAuthSession).toBe(mockSession);
|
|
1067
1113
|
});
|
|
1068
1114
|
|
|
@@ -1083,18 +1129,18 @@ describe("createBetterAuthSessionMiddleware", () => {
|
|
|
1083
1129
|
|
|
1084
1130
|
const auth = createBetterAuth({config, mongoClient: getClient()});
|
|
1085
1131
|
|
|
1086
|
-
const mockSession = {
|
|
1132
|
+
const mockSession = asSessionData({
|
|
1087
1133
|
session: {id: "session-1", userId: "user-1"},
|
|
1088
1134
|
user: {
|
|
1089
1135
|
email: "user@example.com",
|
|
1090
1136
|
id: "user-1",
|
|
1091
1137
|
name: "Test User",
|
|
1092
1138
|
},
|
|
1093
|
-
};
|
|
1139
|
+
});
|
|
1094
1140
|
|
|
1095
1141
|
setGetSession(auth, async () => mockSession);
|
|
1096
1142
|
|
|
1097
|
-
const middleware = createBetterAuthSessionMiddleware(auth, TestUser);
|
|
1143
|
+
const middleware = createBetterAuthSessionMiddleware(auth, asUserModel(TestUser));
|
|
1098
1144
|
const req = makeReq();
|
|
1099
1145
|
const res = makeRes();
|
|
1100
1146
|
const next = mock(() => {});
|
|
@@ -1103,7 +1149,7 @@ describe("createBetterAuthSessionMiddleware", () => {
|
|
|
1103
1149
|
|
|
1104
1150
|
expect(next).toHaveBeenCalledTimes(1);
|
|
1105
1151
|
expect(req.user).toBeDefined();
|
|
1106
|
-
expect(req.user
|
|
1152
|
+
expect(req.user?._id.toString()).toBe(appUser._id.toString());
|
|
1107
1153
|
expect(req.betterAuthSession).toBe(mockSession);
|
|
1108
1154
|
});
|
|
1109
1155
|
|
|
@@ -1128,7 +1174,7 @@ describe("createBetterAuthSessionMiddleware", () => {
|
|
|
1128
1174
|
|
|
1129
1175
|
setGetSession(auth, async () => mockSession);
|
|
1130
1176
|
|
|
1131
|
-
const middleware = createBetterAuthSessionMiddleware(auth, TestUser);
|
|
1177
|
+
const middleware = createBetterAuthSessionMiddleware(auth, asUserModel(TestUser));
|
|
1132
1178
|
const req = makeReq();
|
|
1133
1179
|
const res = makeRes();
|
|
1134
1180
|
const next = mock(() => {});
|
|
@@ -1137,8 +1183,8 @@ describe("createBetterAuthSessionMiddleware", () => {
|
|
|
1137
1183
|
|
|
1138
1184
|
expect(next).toHaveBeenCalledTimes(1);
|
|
1139
1185
|
expect(req.user).toBeDefined();
|
|
1140
|
-
expect(req.user
|
|
1141
|
-
expect(req.user
|
|
1186
|
+
expect(req.user?.betterAuthId).toBe("new-user-1");
|
|
1187
|
+
expect(req.user?.email).toBe("newuser@example.com");
|
|
1142
1188
|
|
|
1143
1189
|
// Verify user was persisted
|
|
1144
1190
|
const count = await TestUser.countDocuments();
|
|
@@ -1210,8 +1256,17 @@ describe("createBetterAuth options and plugins passthrough", () => {
|
|
|
1210
1256
|
});
|
|
1211
1257
|
const plain = createBetterAuth({config, mongoClient: getClient()});
|
|
1212
1258
|
|
|
1213
|
-
expect(withPlugin.options.plugins?.map((p) => p.id)).toEqual([
|
|
1214
|
-
|
|
1259
|
+
expect(withPlugin.options.plugins?.map((p) => p.id)).toEqual([
|
|
1260
|
+
"bearer",
|
|
1261
|
+
"terreno-methods",
|
|
1262
|
+
"terreno-set-password",
|
|
1263
|
+
"terreno-test",
|
|
1264
|
+
]);
|
|
1265
|
+
expect(plain.options.plugins?.map((p) => p.id)).toEqual([
|
|
1266
|
+
"bearer",
|
|
1267
|
+
"terreno-methods",
|
|
1268
|
+
"terreno-set-password",
|
|
1269
|
+
]);
|
|
1215
1270
|
expect(plain.options.trustedOrigins).toEqual([]);
|
|
1216
1271
|
});
|
|
1217
1272
|
});
|
|
@@ -1224,14 +1279,15 @@ describe("resolveBetterAuthAppUser", () => {
|
|
|
1224
1279
|
email: "first-contact@example.com",
|
|
1225
1280
|
emailVerified: false,
|
|
1226
1281
|
id: new mongoose.Types.ObjectId().toString(),
|
|
1282
|
+
image: null,
|
|
1227
1283
|
name: "First Contact",
|
|
1228
1284
|
updatedAt: new Date(),
|
|
1229
1285
|
};
|
|
1230
1286
|
|
|
1231
1287
|
const results = await Promise.all([
|
|
1232
|
-
resolveBetterAuthAppUser({betterAuthUser, userModel: TestUser}),
|
|
1233
|
-
resolveBetterAuthAppUser({betterAuthUser, userModel: TestUser}),
|
|
1234
|
-
resolveBetterAuthAppUser({betterAuthUser, userModel: TestUser}),
|
|
1288
|
+
resolveBetterAuthAppUser({betterAuthUser, userModel: asUserModel(TestUser)}),
|
|
1289
|
+
resolveBetterAuthAppUser({betterAuthUser, userModel: asUserModel(TestUser)}),
|
|
1290
|
+
resolveBetterAuthAppUser({betterAuthUser, userModel: asUserModel(TestUser)}),
|
|
1235
1291
|
]);
|
|
1236
1292
|
|
|
1237
1293
|
expect(new Set(results.map((result) => String(result.user.id))).size).toBe(1);
|
|
@@ -1243,6 +1299,7 @@ describe("resolveBetterAuthAppUser", () => {
|
|
|
1243
1299
|
// between this lookup and this insert.
|
|
1244
1300
|
let insertedByOtherRequest: Record<string, unknown> | null = null;
|
|
1245
1301
|
class RacingUser {
|
|
1302
|
+
[key: string]: unknown;
|
|
1246
1303
|
constructor(doc: Record<string, unknown>) {
|
|
1247
1304
|
Object.assign(this, doc);
|
|
1248
1305
|
}
|
|
@@ -1263,6 +1320,7 @@ describe("resolveBetterAuthAppUser", () => {
|
|
|
1263
1320
|
email: "raced@example.com",
|
|
1264
1321
|
emailVerified: false,
|
|
1265
1322
|
id: "ba-raced",
|
|
1323
|
+
image: null,
|
|
1266
1324
|
name: "Raced",
|
|
1267
1325
|
updatedAt: new Date(),
|
|
1268
1326
|
},
|
|
@@ -1298,7 +1356,7 @@ describe("createBetterAuthSessionMiddleware with disabled users", () => {
|
|
|
1298
1356
|
// then a route that requires an authenticated user.
|
|
1299
1357
|
const buildApp = (auth: BetterAuthInstance): express.Application => {
|
|
1300
1358
|
const app = express();
|
|
1301
|
-
app.use(createBetterAuthSessionMiddleware(auth, TestUser));
|
|
1359
|
+
app.use(createBetterAuthSessionMiddleware(auth, asUserModel(TestUser)));
|
|
1302
1360
|
mountBetterAuthRoutes(app, auth);
|
|
1303
1361
|
app.get("/protected", (req, res) => {
|
|
1304
1362
|
if (!req.user) {
|
|
@@ -1368,7 +1426,7 @@ describe("createBetterAuthSessionMiddleware with an existing app user's email",
|
|
|
1368
1426
|
assert.isFalse(created.user.emailVerified);
|
|
1369
1427
|
|
|
1370
1428
|
const app = express();
|
|
1371
|
-
app.use(createBetterAuthSessionMiddleware(auth, TestUser));
|
|
1429
|
+
app.use(createBetterAuthSessionMiddleware(auth, asUserModel(TestUser)));
|
|
1372
1430
|
app.get("/protected", (req, res) => {
|
|
1373
1431
|
if (!req.user) {
|
|
1374
1432
|
return res.status(401).json({status: 401, title: "Unauthorized"});
|
|
@@ -1527,6 +1585,6 @@ describe("setupBetterAuthUserSync", () => {
|
|
|
1527
1585
|
|
|
1528
1586
|
const auth = createBetterAuth({config, mongoClient: getClient()});
|
|
1529
1587
|
|
|
1530
|
-
expect(() => setupBetterAuthUserSync(auth, TestUser)).not.toThrow();
|
|
1588
|
+
expect(() => setupBetterAuthUserSync(auth, asUserModel(TestUser))).not.toThrow();
|
|
1531
1589
|
});
|
|
1532
1590
|
});
|