@terreno/api 57.20.0 → 57.22.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 +81 -0
- package/biome.jsonc +3 -2
- package/dist/api.d.ts +3 -3
- package/dist/frameworkModelNames.d.ts +4 -0
- package/dist/frameworkModelNames.js +4 -0
- package/dist/index.d.ts +4 -0
- package/dist/index.js +9 -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/server.d.ts +8 -0
- package/dist/mcp/server.js +48 -4
- package/dist/models/mcpOAuthToken.js +27 -0
- 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/rbac/auditModel.d.ts +2 -1
- package/dist/terrenoApp.d.ts +12 -0
- package/dist/terrenoApp.js +3 -0
- package/dist/tests/models.d.ts +17 -22
- package/dist/tests/models.js +7 -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/mcpAdmin.d.ts +58 -0
- package/dist/types/mcpAdmin.js +2 -0
- package/dist/types/mcpOAuth.d.ts +2 -0
- package/dist/types/mcpServiceToken.d.ts +2 -0
- package/e2e/smoke.ts +193 -0
- package/package.json +7 -5
- package/src/adminModelRouter.test.ts +8 -6
- package/src/api.arrayOperations.test.ts +31 -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 +3 -3
- package/src/audit/auditApp.test.ts +1 -1
- package/src/audit/cloudTasksEnqueue.test.ts +19 -14
- package/src/auth.test.ts +21 -7
- package/src/authRecovery.test.ts +10 -10
- package/src/authVerification.test.ts +7 -7
- package/src/betterAuthFeatures.test.ts +3 -2
- package/src/betterAuthLinking.test.ts +3 -1
- package/src/betterAuthSetup.test.ts +77 -51
- package/src/collectionRegistry.test.ts +4 -4
- package/src/frameworkModelNames.test.ts +8 -0
- package/src/frameworkModelNames.ts +4 -0
- package/src/githubAuth.test.ts +11 -11
- package/src/index.ts +8 -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 +1 -1
- 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/mcpOAuthToken.test.ts +42 -0
- package/src/models/mcpOAuthToken.ts +32 -0
- 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/orgPermissions.test.ts +2 -2
- package/src/orgs/orgPlugin.test.ts +4 -3
- package/src/orgs/orgSecurityDefects.test.ts +3 -1
- package/src/orgs/organizationSettings.test.ts +1 -1
- package/src/orgs/orgsApp.test.ts +5 -3
- package/src/permissions.test.ts +2 -2
- package/src/rateLimit/redisStore.ioredis.test.ts +3 -2
- 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/routes.test.ts +1 -1
- package/src/rbac/userWriteGuards.test.ts +8 -5
- package/src/realtime/realtime.test.ts +35 -31
- package/src/scrubAdminFields.test.ts +1 -1
- 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 +14 -0
- package/src/tests/betterAuthStubs.ts +3 -2
- package/src/tests/bunSetup.ts +1 -1
- package/src/tests/models.ts +10 -0
- package/src/tests/testEnv.ts +7 -0
- package/src/tests.ts +1 -0
- package/src/types/mcpAdmin.ts +80 -0
- package/src/types/mcpOAuth.ts +5 -0
- 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
|
);
|
|
@@ -464,7 +486,7 @@ describe("applyBetterAuthPasswordResetToJwt", () => {
|
|
|
464
486
|
method: "POST",
|
|
465
487
|
});
|
|
466
488
|
await applyBetterAuthPasswordResetToJwt(
|
|
467
|
-
DualAuthUser,
|
|
489
|
+
asUserModel(DualAuthUser),
|
|
468
490
|
{email: "social-only@example.com", id: "ba-social-only"},
|
|
469
491
|
request
|
|
470
492
|
);
|
|
@@ -482,7 +504,7 @@ describe("applyBetterAuthPasswordResetToJwt", () => {
|
|
|
482
504
|
method: "POST",
|
|
483
505
|
});
|
|
484
506
|
await applyBetterAuthPasswordResetToJwt(
|
|
485
|
-
DualAuthUser,
|
|
507
|
+
asUserModel(DualAuthUser),
|
|
486
508
|
{email: "missing-jwt@example.com", id: "ba-missing"},
|
|
487
509
|
request
|
|
488
510
|
);
|
|
@@ -507,7 +529,7 @@ describe("applyBetterAuthPasswordResetToJwt", () => {
|
|
|
507
529
|
});
|
|
508
530
|
await expect(
|
|
509
531
|
applyBetterAuthPasswordResetToJwt(
|
|
510
|
-
DualAuthUser,
|
|
532
|
+
asUserModel(DualAuthUser),
|
|
511
533
|
{email: "nopw-jwt@example.com", id: "ba-dual-nopw"},
|
|
512
534
|
request
|
|
513
535
|
)
|
|
@@ -640,7 +662,7 @@ describe("createBetterAuth email and password-reset wiring", () => {
|
|
|
640
662
|
const auth = createBetterAuth({
|
|
641
663
|
config: baseConfig,
|
|
642
664
|
mongoClient: getClient(),
|
|
643
|
-
userModel: DualAuthUser,
|
|
665
|
+
userModel: asUserModel(DualAuthUser),
|
|
644
666
|
});
|
|
645
667
|
const registerable = DualAuthUser as unknown as {
|
|
646
668
|
register: (user: {betterAuthId: string; email: string}, password: string) => Promise<unknown>;
|
|
@@ -773,9 +795,10 @@ describe("applyJwtPasswordResetToBetterAuth lookups", () => {
|
|
|
773
795
|
const auth = makeAuth();
|
|
774
796
|
const ctx = (await auth.$context) as {
|
|
775
797
|
internalAdapter: {
|
|
776
|
-
createUser: (
|
|
777
|
-
|
|
778
|
-
|
|
798
|
+
createUser: (
|
|
799
|
+
user: {email: string; emailVerified: boolean; name: string},
|
|
800
|
+
source?: unknown
|
|
801
|
+
) => Promise<{id: string}>;
|
|
779
802
|
findAccounts: (userId: string) => Promise<Array<{providerId?: string}>>;
|
|
780
803
|
};
|
|
781
804
|
};
|
|
@@ -809,7 +832,7 @@ describe("syncBetterAuthUser", () => {
|
|
|
809
832
|
it("creates a new user when none exists", async () => {
|
|
810
833
|
await setup;
|
|
811
834
|
const baUser = makeBetterAuthUser();
|
|
812
|
-
const result = await syncBetterAuthUser(TestUser, baUser);
|
|
835
|
+
const result = await syncBetterAuthUser(asUserModel(TestUser), baUser);
|
|
813
836
|
|
|
814
837
|
expect(result).toBeDefined();
|
|
815
838
|
expect(result.email).toBe("test@example.com");
|
|
@@ -821,7 +844,7 @@ describe("syncBetterAuthUser", () => {
|
|
|
821
844
|
it("creates a user on a strict-throw schema that omits oauthProvider", async () => {
|
|
822
845
|
await setup;
|
|
823
846
|
const baUser = makeBetterAuthUser({email: "strict@example.com"});
|
|
824
|
-
const result = await syncBetterAuthUser(StrictUser, baUser);
|
|
847
|
+
const result = await syncBetterAuthUser(asUserModel(StrictUser), baUser);
|
|
825
848
|
|
|
826
849
|
assert.equal(result.email, "strict@example.com");
|
|
827
850
|
assert.equal(result.betterAuthId, "ba-user-123");
|
|
@@ -833,11 +856,11 @@ describe("syncBetterAuthUser", () => {
|
|
|
833
856
|
it("sets oauthProvider on create when a provider is passed", async () => {
|
|
834
857
|
await setup;
|
|
835
858
|
const baUser = makeBetterAuthUser({email: "oauth-create@example.com"});
|
|
836
|
-
const result = await syncBetterAuthUser(TestUser, baUser, "google");
|
|
859
|
+
const result = await syncBetterAuthUser(asUserModel(TestUser), baUser, "google");
|
|
837
860
|
|
|
838
861
|
assert.equal(result.oauthProvider, "google");
|
|
839
862
|
const saved = await TestUser.findOne({email: "oauth-create@example.com"}).lean();
|
|
840
|
-
assert.equal(saved
|
|
863
|
+
assert.equal(saved?.oauthProvider, "google");
|
|
841
864
|
});
|
|
842
865
|
|
|
843
866
|
it("updates an existing user matched by betterAuthId", async () => {
|
|
@@ -849,7 +872,7 @@ describe("syncBetterAuthUser", () => {
|
|
|
849
872
|
});
|
|
850
873
|
|
|
851
874
|
const baUser = makeBetterAuthUser({email: "new@example.com", name: "New Name"});
|
|
852
|
-
const result = await syncBetterAuthUser(TestUser, baUser);
|
|
875
|
+
const result = await syncBetterAuthUser(asUserModel(TestUser), baUser);
|
|
853
876
|
|
|
854
877
|
expect(result.email).toBe("new@example.com");
|
|
855
878
|
expect(result.name).toBe("New Name");
|
|
@@ -867,7 +890,7 @@ describe("syncBetterAuthUser", () => {
|
|
|
867
890
|
});
|
|
868
891
|
|
|
869
892
|
const baUser = makeBetterAuthUser();
|
|
870
|
-
const result = await syncBetterAuthUser(TestUser, baUser);
|
|
893
|
+
const result = await syncBetterAuthUser(asUserModel(TestUser), baUser);
|
|
871
894
|
|
|
872
895
|
expect(result.betterAuthId).toBe("ba-user-123");
|
|
873
896
|
expect(result.email).toBe("test@example.com");
|
|
@@ -884,7 +907,7 @@ describe("syncBetterAuthUser", () => {
|
|
|
884
907
|
});
|
|
885
908
|
|
|
886
909
|
const baUser = makeBetterAuthUser();
|
|
887
|
-
const result = await syncBetterAuthUser(TestUser, baUser, "google");
|
|
910
|
+
const result = await syncBetterAuthUser(asUserModel(TestUser), baUser, "google");
|
|
888
911
|
|
|
889
912
|
expect(result.oauthProvider).toBe("google");
|
|
890
913
|
});
|
|
@@ -892,7 +915,7 @@ describe("syncBetterAuthUser", () => {
|
|
|
892
915
|
it("uses email prefix as name when name is null", async () => {
|
|
893
916
|
await setup;
|
|
894
917
|
const baUser = makeBetterAuthUser({name: null});
|
|
895
|
-
const result = await syncBetterAuthUser(TestUser, baUser);
|
|
918
|
+
const result = await syncBetterAuthUser(asUserModel(TestUser), baUser);
|
|
896
919
|
|
|
897
920
|
expect(result.name).toBe("test");
|
|
898
921
|
});
|
|
@@ -906,7 +929,7 @@ describe("syncBetterAuthUser", () => {
|
|
|
906
929
|
});
|
|
907
930
|
|
|
908
931
|
const baUser = makeBetterAuthUser({name: null});
|
|
909
|
-
const result = await syncBetterAuthUser(TestUser, baUser);
|
|
932
|
+
const result = await syncBetterAuthUser(asUserModel(TestUser), baUser);
|
|
910
933
|
|
|
911
934
|
expect(result.name).toBe("Keep This Name");
|
|
912
935
|
});
|
|
@@ -916,7 +939,7 @@ describe("syncBetterAuthUser", () => {
|
|
|
916
939
|
await TestUser.create({admin: true, email: "test@example.com", name: "Existing Admin"});
|
|
917
940
|
|
|
918
941
|
const baUser = makeBetterAuthUser({emailVerified: false});
|
|
919
|
-
await expect(syncBetterAuthUser(TestUser, baUser)).rejects.toThrow(
|
|
942
|
+
await expect(syncBetterAuthUser(asUserModel(TestUser), baUser)).rejects.toThrow(
|
|
920
943
|
"Verify your email to use this account"
|
|
921
944
|
);
|
|
922
945
|
|
|
@@ -929,7 +952,7 @@ describe("syncBetterAuthUser", () => {
|
|
|
929
952
|
await setup;
|
|
930
953
|
await TestUser.create({betterAuthId: "ba-other", email: "test@example.com"});
|
|
931
954
|
|
|
932
|
-
await expect(syncBetterAuthUser(TestUser, makeBetterAuthUser())).rejects.toThrow(
|
|
955
|
+
await expect(syncBetterAuthUser(asUserModel(TestUser), makeBetterAuthUser())).rejects.toThrow(
|
|
933
956
|
"An account with this email already exists"
|
|
934
957
|
);
|
|
935
958
|
|
|
@@ -942,7 +965,7 @@ describe("syncBetterAuthUser", () => {
|
|
|
942
965
|
await TestUser.create({betterAuthId: "ba-other", email: "test@example.com"});
|
|
943
966
|
|
|
944
967
|
const result = await syncBetterAuthUser(
|
|
945
|
-
TestUser,
|
|
968
|
+
asUserModel(TestUser),
|
|
946
969
|
makeBetterAuthUser({emailVerified: false}),
|
|
947
970
|
undefined,
|
|
948
971
|
{trustEmail: true}
|
|
@@ -958,7 +981,7 @@ describe("syncBetterAuthUser", () => {
|
|
|
958
981
|
};
|
|
959
982
|
await registrable.register({email: "test@example.com", name: "Legacy"}, "legacy-pass-123");
|
|
960
983
|
|
|
961
|
-
const result = await syncBetterAuthUser(DualAuthUser, makeBetterAuthUser());
|
|
984
|
+
const result = await syncBetterAuthUser(asUserModel(DualAuthUser), makeBetterAuthUser());
|
|
962
985
|
assert.equal(result.betterAuthId, "ba-user-123");
|
|
963
986
|
|
|
964
987
|
const saved = await DualAuthUser.findOne({email: "test@example.com"})
|
|
@@ -979,7 +1002,7 @@ describe("syncBetterAuthUser", () => {
|
|
|
979
1002
|
"legacy-pass-123"
|
|
980
1003
|
);
|
|
981
1004
|
|
|
982
|
-
await syncBetterAuthUser(DualAuthUser, makeBetterAuthUser());
|
|
1005
|
+
await syncBetterAuthUser(asUserModel(DualAuthUser), makeBetterAuthUser());
|
|
983
1006
|
|
|
984
1007
|
const saved = await DualAuthUser.findOne({email: "test@example.com"})
|
|
985
1008
|
.select("+hash +salt")
|
|
@@ -1062,14 +1085,14 @@ describe("createBetterAuthSessionMiddleware", () => {
|
|
|
1062
1085
|
|
|
1063
1086
|
const auth = createBetterAuth({config, mongoClient: getClient()});
|
|
1064
1087
|
|
|
1065
|
-
const mockSession = {
|
|
1088
|
+
const mockSession = asSessionData({
|
|
1066
1089
|
session: {id: "session-1", userId: "user-1"},
|
|
1067
1090
|
user: {
|
|
1068
1091
|
email: "user@example.com",
|
|
1069
1092
|
id: "user-1",
|
|
1070
1093
|
name: "Test User",
|
|
1071
1094
|
},
|
|
1072
|
-
};
|
|
1095
|
+
});
|
|
1073
1096
|
|
|
1074
1097
|
// Override getSession to return mock session
|
|
1075
1098
|
setGetSession(auth, async () => mockSession);
|
|
@@ -1083,9 +1106,9 @@ describe("createBetterAuthSessionMiddleware", () => {
|
|
|
1083
1106
|
|
|
1084
1107
|
expect(next).toHaveBeenCalledTimes(1);
|
|
1085
1108
|
expect(req.user).toBeDefined();
|
|
1086
|
-
expect(req.user
|
|
1087
|
-
expect(req.user
|
|
1088
|
-
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);
|
|
1089
1112
|
expect(req.betterAuthSession).toBe(mockSession);
|
|
1090
1113
|
});
|
|
1091
1114
|
|
|
@@ -1106,18 +1129,18 @@ describe("createBetterAuthSessionMiddleware", () => {
|
|
|
1106
1129
|
|
|
1107
1130
|
const auth = createBetterAuth({config, mongoClient: getClient()});
|
|
1108
1131
|
|
|
1109
|
-
const mockSession = {
|
|
1132
|
+
const mockSession = asSessionData({
|
|
1110
1133
|
session: {id: "session-1", userId: "user-1"},
|
|
1111
1134
|
user: {
|
|
1112
1135
|
email: "user@example.com",
|
|
1113
1136
|
id: "user-1",
|
|
1114
1137
|
name: "Test User",
|
|
1115
1138
|
},
|
|
1116
|
-
};
|
|
1139
|
+
});
|
|
1117
1140
|
|
|
1118
1141
|
setGetSession(auth, async () => mockSession);
|
|
1119
1142
|
|
|
1120
|
-
const middleware = createBetterAuthSessionMiddleware(auth, TestUser);
|
|
1143
|
+
const middleware = createBetterAuthSessionMiddleware(auth, asUserModel(TestUser));
|
|
1121
1144
|
const req = makeReq();
|
|
1122
1145
|
const res = makeRes();
|
|
1123
1146
|
const next = mock(() => {});
|
|
@@ -1126,7 +1149,7 @@ describe("createBetterAuthSessionMiddleware", () => {
|
|
|
1126
1149
|
|
|
1127
1150
|
expect(next).toHaveBeenCalledTimes(1);
|
|
1128
1151
|
expect(req.user).toBeDefined();
|
|
1129
|
-
expect(req.user
|
|
1152
|
+
expect(req.user?._id.toString()).toBe(appUser._id.toString());
|
|
1130
1153
|
expect(req.betterAuthSession).toBe(mockSession);
|
|
1131
1154
|
});
|
|
1132
1155
|
|
|
@@ -1151,7 +1174,7 @@ describe("createBetterAuthSessionMiddleware", () => {
|
|
|
1151
1174
|
|
|
1152
1175
|
setGetSession(auth, async () => mockSession);
|
|
1153
1176
|
|
|
1154
|
-
const middleware = createBetterAuthSessionMiddleware(auth, TestUser);
|
|
1177
|
+
const middleware = createBetterAuthSessionMiddleware(auth, asUserModel(TestUser));
|
|
1155
1178
|
const req = makeReq();
|
|
1156
1179
|
const res = makeRes();
|
|
1157
1180
|
const next = mock(() => {});
|
|
@@ -1160,8 +1183,8 @@ describe("createBetterAuthSessionMiddleware", () => {
|
|
|
1160
1183
|
|
|
1161
1184
|
expect(next).toHaveBeenCalledTimes(1);
|
|
1162
1185
|
expect(req.user).toBeDefined();
|
|
1163
|
-
expect(req.user
|
|
1164
|
-
expect(req.user
|
|
1186
|
+
expect(req.user?.betterAuthId).toBe("new-user-1");
|
|
1187
|
+
expect(req.user?.email).toBe("newuser@example.com");
|
|
1165
1188
|
|
|
1166
1189
|
// Verify user was persisted
|
|
1167
1190
|
const count = await TestUser.countDocuments();
|
|
@@ -1256,14 +1279,15 @@ describe("resolveBetterAuthAppUser", () => {
|
|
|
1256
1279
|
email: "first-contact@example.com",
|
|
1257
1280
|
emailVerified: false,
|
|
1258
1281
|
id: new mongoose.Types.ObjectId().toString(),
|
|
1282
|
+
image: null,
|
|
1259
1283
|
name: "First Contact",
|
|
1260
1284
|
updatedAt: new Date(),
|
|
1261
1285
|
};
|
|
1262
1286
|
|
|
1263
1287
|
const results = await Promise.all([
|
|
1264
|
-
resolveBetterAuthAppUser({betterAuthUser, userModel: TestUser}),
|
|
1265
|
-
resolveBetterAuthAppUser({betterAuthUser, userModel: TestUser}),
|
|
1266
|
-
resolveBetterAuthAppUser({betterAuthUser, userModel: TestUser}),
|
|
1288
|
+
resolveBetterAuthAppUser({betterAuthUser, userModel: asUserModel(TestUser)}),
|
|
1289
|
+
resolveBetterAuthAppUser({betterAuthUser, userModel: asUserModel(TestUser)}),
|
|
1290
|
+
resolveBetterAuthAppUser({betterAuthUser, userModel: asUserModel(TestUser)}),
|
|
1267
1291
|
]);
|
|
1268
1292
|
|
|
1269
1293
|
expect(new Set(results.map((result) => String(result.user.id))).size).toBe(1);
|
|
@@ -1275,6 +1299,7 @@ describe("resolveBetterAuthAppUser", () => {
|
|
|
1275
1299
|
// between this lookup and this insert.
|
|
1276
1300
|
let insertedByOtherRequest: Record<string, unknown> | null = null;
|
|
1277
1301
|
class RacingUser {
|
|
1302
|
+
[key: string]: unknown;
|
|
1278
1303
|
constructor(doc: Record<string, unknown>) {
|
|
1279
1304
|
Object.assign(this, doc);
|
|
1280
1305
|
}
|
|
@@ -1295,6 +1320,7 @@ describe("resolveBetterAuthAppUser", () => {
|
|
|
1295
1320
|
email: "raced@example.com",
|
|
1296
1321
|
emailVerified: false,
|
|
1297
1322
|
id: "ba-raced",
|
|
1323
|
+
image: null,
|
|
1298
1324
|
name: "Raced",
|
|
1299
1325
|
updatedAt: new Date(),
|
|
1300
1326
|
},
|
|
@@ -1330,7 +1356,7 @@ describe("createBetterAuthSessionMiddleware with disabled users", () => {
|
|
|
1330
1356
|
// then a route that requires an authenticated user.
|
|
1331
1357
|
const buildApp = (auth: BetterAuthInstance): express.Application => {
|
|
1332
1358
|
const app = express();
|
|
1333
|
-
app.use(createBetterAuthSessionMiddleware(auth, TestUser));
|
|
1359
|
+
app.use(createBetterAuthSessionMiddleware(auth, asUserModel(TestUser)));
|
|
1334
1360
|
mountBetterAuthRoutes(app, auth);
|
|
1335
1361
|
app.get("/protected", (req, res) => {
|
|
1336
1362
|
if (!req.user) {
|
|
@@ -1400,7 +1426,7 @@ describe("createBetterAuthSessionMiddleware with an existing app user's email",
|
|
|
1400
1426
|
assert.isFalse(created.user.emailVerified);
|
|
1401
1427
|
|
|
1402
1428
|
const app = express();
|
|
1403
|
-
app.use(createBetterAuthSessionMiddleware(auth, TestUser));
|
|
1429
|
+
app.use(createBetterAuthSessionMiddleware(auth, asUserModel(TestUser)));
|
|
1404
1430
|
app.get("/protected", (req, res) => {
|
|
1405
1431
|
if (!req.user) {
|
|
1406
1432
|
return res.status(401).json({status: 401, title: "Unauthorized"});
|
|
@@ -1559,6 +1585,6 @@ describe("setupBetterAuthUserSync", () => {
|
|
|
1559
1585
|
|
|
1560
1586
|
const auth = createBetterAuth({config, mongoClient: getClient()});
|
|
1561
1587
|
|
|
1562
|
-
expect(() => setupBetterAuthUserSync(auth, TestUser)).not.toThrow();
|
|
1588
|
+
expect(() => setupBetterAuthUserSync(auth, asUserModel(TestUser))).not.toThrow();
|
|
1563
1589
|
});
|
|
1564
1590
|
});
|
|
@@ -39,8 +39,8 @@ const syncOptions = {
|
|
|
39
39
|
read: [Permissions.IsAuthenticated],
|
|
40
40
|
update: [Permissions.IsAuthenticated],
|
|
41
41
|
},
|
|
42
|
-
sync: {scope: {type: "owner"}},
|
|
43
|
-
}
|
|
42
|
+
sync: {scope: {type: "owner" as const}},
|
|
43
|
+
};
|
|
44
44
|
|
|
45
45
|
const baseOptions = {
|
|
46
46
|
permissions: {
|
|
@@ -66,7 +66,7 @@ describe("CollectionRegistry", () => {
|
|
|
66
66
|
|
|
67
67
|
const record = getCollection("/food");
|
|
68
68
|
expect(record?.routePath).toBe("/food");
|
|
69
|
-
expect(record?.model).toBe(FoodModel);
|
|
69
|
+
expect<unknown>(record?.model).toBe(FoodModel);
|
|
70
70
|
expect(record?.options).toBe(baseOptions);
|
|
71
71
|
expect(listCollections()).toHaveLength(1);
|
|
72
72
|
});
|
|
@@ -158,7 +158,7 @@ describe("CollectionRegistry", () => {
|
|
|
158
158
|
throw new Error("should not run");
|
|
159
159
|
});
|
|
160
160
|
clearCollectionRegistry();
|
|
161
|
-
const {ensureSyncIndexes} = await import("./sync/registrationSideEffects");
|
|
161
|
+
const {ensureSyncIndexes} = await import("./sync/registrationSideEffects.js");
|
|
162
162
|
await expect(ensureSyncIndexes()).resolves.toBeUndefined();
|
|
163
163
|
});
|
|
164
164
|
});
|
|
@@ -5,7 +5,11 @@ import mongoose from "mongoose";
|
|
|
5
5
|
import {createAuditEventModel} from "./audit/auditEventModel";
|
|
6
6
|
import {AuthToken} from "./authTokens";
|
|
7
7
|
import {FRAMEWORK_MODEL_PUBLIC_NAMES, publicFrameworkModelName} from "./frameworkModelNames";
|
|
8
|
+
import {McpOAuthClient} from "./models/mcpOAuthClient";
|
|
9
|
+
import {McpOAuthToken} from "./models/mcpOAuthToken";
|
|
10
|
+
import {McpRequestLog} from "./models/mcpRequestLog";
|
|
8
11
|
import {McpServiceToken} from "./models/mcpServiceToken";
|
|
12
|
+
import {McpToolSetting} from "./models/mcpToolSetting";
|
|
9
13
|
import {Notification} from "./models/notification";
|
|
10
14
|
import {NotificationPreference} from "./models/notificationPreference";
|
|
11
15
|
import {getMembershipModel, getOrganizationModel} from "./orgs/organizationModel";
|
|
@@ -35,7 +39,11 @@ describe("framework model names", () => {
|
|
|
35
39
|
const models = [
|
|
36
40
|
[createAuditEventModel(mongoose.connection), "TerrenoAuditEvent", "auditevents"],
|
|
37
41
|
[AuthToken, "TerrenoAuthToken", "authtokens"],
|
|
42
|
+
[McpOAuthClient, "TerrenoMcpOAuthClient", "mcpoauthclients"],
|
|
43
|
+
[McpOAuthToken, "TerrenoMcpOAuthToken", "mcpoauthtokens"],
|
|
44
|
+
[McpRequestLog, "TerrenoMcpRequestLog", "mcprequestlogs"],
|
|
38
45
|
[McpServiceToken, "TerrenoMcpServiceToken", "mcpservicetokens"],
|
|
46
|
+
[McpToolSetting, "TerrenoMcpToolSetting", "mcptoolsettings"],
|
|
39
47
|
[getMembershipModel(), "TerrenoMembership", "memberships"],
|
|
40
48
|
[Notification, "TerrenoInboxNotification", "notifications"],
|
|
41
49
|
[NotificationPreference, "TerrenoNotificationPreference", "notificationpreferences"],
|
|
@@ -9,7 +9,11 @@ export const FRAMEWORK_MODEL_PUBLIC_NAMES = {
|
|
|
9
9
|
TerrenoInboxNotification: "Notification",
|
|
10
10
|
TerrenoJob: "Job",
|
|
11
11
|
TerrenoJobSchedule: "JobSchedule",
|
|
12
|
+
TerrenoMcpOAuthClient: "McpOAuthClient",
|
|
13
|
+
TerrenoMcpOAuthToken: "McpOAuthToken",
|
|
14
|
+
TerrenoMcpRequestLog: "McpRequestLog",
|
|
12
15
|
TerrenoMcpServiceToken: "McpServiceToken",
|
|
16
|
+
TerrenoMcpToolSetting: "McpToolSetting",
|
|
13
17
|
TerrenoMembership: "Membership",
|
|
14
18
|
TerrenoNotificationPreference: "NotificationPreference",
|
|
15
19
|
TerrenoOrganization: "Organization",
|
package/src/githubAuth.test.ts
CHANGED
|
@@ -314,7 +314,7 @@ const invokeGitHubVerify = (
|
|
|
314
314
|
if (!strategy) {
|
|
315
315
|
throw new Error("github strategy not registered");
|
|
316
316
|
}
|
|
317
|
-
return new Promise<{err: VerifyError | null; user
|
|
317
|
+
return new Promise<{err: VerifyError | null; user?: VerifiedUser}>((resolve) => {
|
|
318
318
|
const done = (err: VerifyError | null, user?: VerifiedUser) => resolve({err, user});
|
|
319
319
|
strategy._verify(req, accessToken, refreshToken, profile, done);
|
|
320
320
|
});
|
|
@@ -399,9 +399,9 @@ describe("GitHub strategy verify callback", () => {
|
|
|
399
399
|
const result = await invokeGitHubVerify({}, "access", "refresh", profile);
|
|
400
400
|
expect(result.err).toBeNull();
|
|
401
401
|
expect(result.user).toBeDefined();
|
|
402
|
-
expect(result.user
|
|
403
|
-
expect(result.user
|
|
404
|
-
expect(result.user
|
|
402
|
+
expect(result.user?.githubId).toBe("gh-new-1");
|
|
403
|
+
expect(result.user?.githubUsername).toBe("newghuser");
|
|
404
|
+
expect(result.user?.email).toBe("new@example.com");
|
|
405
405
|
});
|
|
406
406
|
|
|
407
407
|
it("logs in existing GitHub user", async () => {
|
|
@@ -423,7 +423,7 @@ describe("GitHub strategy verify callback", () => {
|
|
|
423
423
|
username: "ghuser",
|
|
424
424
|
});
|
|
425
425
|
expect(result.err).toBeNull();
|
|
426
|
-
expect(result.user
|
|
426
|
+
expect(result.user?._id.toString()).toBe(existingUser._id.toString());
|
|
427
427
|
});
|
|
428
428
|
|
|
429
429
|
it("links GitHub to authenticated user when allowAccountLinking=true", async () => {
|
|
@@ -447,9 +447,9 @@ describe("GitHub strategy verify callback", () => {
|
|
|
447
447
|
username: "linkedghuser",
|
|
448
448
|
});
|
|
449
449
|
expect(result.err).toBeNull();
|
|
450
|
-
expect(result.user
|
|
451
|
-
expect(result.user
|
|
452
|
-
expect(result.user
|
|
450
|
+
expect(result.user?._id.toString()).toBe(existingUser._id.toString());
|
|
451
|
+
expect(result.user?.githubId).toBe("gh-link-1");
|
|
452
|
+
expect(result.user?.githubUsername).toBe("linkedghuser");
|
|
453
453
|
});
|
|
454
454
|
|
|
455
455
|
it("does not treat an ambient req.user as a link target", async () => {
|
|
@@ -467,7 +467,7 @@ describe("GitHub strategy verify callback", () => {
|
|
|
467
467
|
id: "gh-ambient-1",
|
|
468
468
|
});
|
|
469
469
|
expect(result.err).toBeNull();
|
|
470
|
-
expect(result.user
|
|
470
|
+
expect(result.user?._id.toString()).not.toBe(ambientUser._id.toString());
|
|
471
471
|
const ambientRow = await GitHubTestUserModel.findById(ambientUser._id);
|
|
472
472
|
expect(ambientRow?.githubId).toBeUndefined();
|
|
473
473
|
});
|
|
@@ -547,8 +547,8 @@ describe("GitHub strategy verify callback", () => {
|
|
|
547
547
|
username: "emailuserghuser",
|
|
548
548
|
});
|
|
549
549
|
expect(result.err).toBeNull();
|
|
550
|
-
expect(result.user
|
|
551
|
-
expect(result.user
|
|
550
|
+
expect(result.user?.githubId).toBe("gh-email-link-1");
|
|
551
|
+
expect(result.user?.email).toBe("emailuser@example.com");
|
|
552
552
|
});
|
|
553
553
|
|
|
554
554
|
it("rejects email-link when allowAccountLinking=false", async () => {
|
package/src/index.ts
CHANGED
|
@@ -81,6 +81,11 @@ export {
|
|
|
81
81
|
export * from "./githubAuth";
|
|
82
82
|
export * from "./httpClient";
|
|
83
83
|
export * from "./logger";
|
|
84
|
+
export {
|
|
85
|
+
type McpRequestLogAppOption,
|
|
86
|
+
type ResolvedMcpRequestLogOptions,
|
|
87
|
+
resolveMcpRequestLogOption,
|
|
88
|
+
} from "./mcp/adminTracking";
|
|
84
89
|
export {
|
|
85
90
|
extractAuthFromHeaders,
|
|
86
91
|
extractUserFromHeaders,
|
|
@@ -141,7 +146,9 @@ export {McpOAuthAuthorization} from "./models/mcpOAuthAuthorization";
|
|
|
141
146
|
export {McpOAuthClient} from "./models/mcpOAuthClient";
|
|
142
147
|
export {McpOAuthRevokedFamily} from "./models/mcpOAuthRevokedFamily";
|
|
143
148
|
export {McpOAuthFamilyRevokedError, McpOAuthToken} from "./models/mcpOAuthToken";
|
|
149
|
+
export {McpRequestLog} from "./models/mcpRequestLog";
|
|
144
150
|
export * from "./models/mcpServiceToken";
|
|
151
|
+
export {McpToolSetting} from "./models/mcpToolSetting";
|
|
145
152
|
export * from "./models/notification";
|
|
146
153
|
export * from "./models/notificationPreference";
|
|
147
154
|
export * from "./models/versionConfig";
|
|
@@ -347,6 +354,7 @@ export * from "./terrenoPlugin";
|
|
|
347
354
|
export * from "./transformers";
|
|
348
355
|
export * from "./types/consentForm";
|
|
349
356
|
export * from "./types/consentResponse";
|
|
357
|
+
export type * from "./types/mcpAdmin";
|
|
350
358
|
export type {
|
|
351
359
|
McpOAuthAuthorizationDocument,
|
|
352
360
|
McpOAuthAuthorizationStatus,
|
|
@@ -9,9 +9,10 @@ import {assert} from "chai";
|
|
|
9
9
|
import mongoose from "mongoose";
|
|
10
10
|
import {runMigrateCli} from "../migrations/cli";
|
|
11
11
|
import {setupDb} from "../tests";
|
|
12
|
+
import {partialEnv} from "../tests/testEnv";
|
|
12
13
|
|
|
13
14
|
const fixtures = (...parts: string[]): string => {
|
|
14
|
-
return join(
|
|
15
|
+
return join(__dirname, "..", "migrations", "fixtures", ...parts);
|
|
15
16
|
};
|
|
16
17
|
|
|
17
18
|
describe("runMigrateCli Mongo URI connect", () => {
|
|
@@ -27,7 +28,7 @@ describe("runMigrateCli Mongo URI connect", () => {
|
|
|
27
28
|
const err: string[] = [];
|
|
28
29
|
const code = await runMigrateCli({
|
|
29
30
|
argv: ["status", "--dir", fixtures("valid")],
|
|
30
|
-
env: {MONGODB_URI: uri, NODE_ENV: "test"},
|
|
31
|
+
env: partialEnv({MONGODB_URI: uri, NODE_ENV: "test"}),
|
|
31
32
|
stderr: {
|
|
32
33
|
write: (chunk: string): void => {
|
|
33
34
|
err.push(chunk);
|
|
@@ -57,7 +57,9 @@ const widgetRouter = (extra: Record<string, unknown> = {}) =>
|
|
|
57
57
|
collectionActions: {
|
|
58
58
|
countMine: {
|
|
59
59
|
handler: async ({req, user}) => ({
|
|
60
|
-
count: await WidgetModel.countDocuments({
|
|
60
|
+
count: await WidgetModel.countDocuments({
|
|
61
|
+
ownerId: user?._id as mongoose.Types.ObjectId | undefined,
|
|
62
|
+
}),
|
|
61
63
|
credential: getCurrentRequestContext()?.credential ?? null,
|
|
62
64
|
isMCPRequest: (req as unknown as {isMCPRequest?: boolean}).isMCPRequest ?? false,
|
|
63
65
|
}),
|
|
@@ -67,7 +69,7 @@ const widgetRouter = (extra: Record<string, unknown> = {}) =>
|
|
|
67
69
|
},
|
|
68
70
|
echoId: {
|
|
69
71
|
body: z.object({id: z.string()}).strict(),
|
|
70
|
-
handler: async ({body}) => ({id: body.id}),
|
|
72
|
+
handler: async ({body}) => ({id: (body as {id: string}).id}),
|
|
71
73
|
mcp: {name: "widgets_echo_id"},
|
|
72
74
|
method: "POST",
|
|
73
75
|
permissions: [Permissions.IsAuthenticated],
|
|
@@ -84,7 +86,10 @@ const widgetRouter = (extra: Record<string, unknown> = {}) =>
|
|
|
84
86
|
},
|
|
85
87
|
instanceActions: {
|
|
86
88
|
peek: {
|
|
87
|
-
handler: async ({doc, query}) => ({
|
|
89
|
+
handler: async ({doc, query}) => ({
|
|
90
|
+
name: doc.name,
|
|
91
|
+
verbose: (query as {verbose?: boolean}).verbose,
|
|
92
|
+
}),
|
|
88
93
|
mcp: {name: "widgets_peek"},
|
|
89
94
|
method: "GET",
|
|
90
95
|
permissions: [Permissions.IsAuthenticated],
|
|
@@ -94,10 +99,11 @@ const widgetRouter = (extra: Record<string, unknown> = {}) =>
|
|
|
94
99
|
body: z.object({amount: z.number().int().min(1)}).strict(),
|
|
95
100
|
description: "Add stars to a widget",
|
|
96
101
|
handler: async ({body, doc, req}) => {
|
|
97
|
-
|
|
102
|
+
const {amount} = body as {amount: number};
|
|
103
|
+
await WidgetModel.updateOne({_id: doc._id}, {$inc: {stars: amount}});
|
|
98
104
|
return {
|
|
99
105
|
isMCPRequest: (req as unknown as {isMCPRequest?: boolean}).isMCPRequest ?? false,
|
|
100
|
-
stars: doc.stars +
|
|
106
|
+
stars: doc.stars + amount,
|
|
101
107
|
};
|
|
102
108
|
},
|
|
103
109
|
mcp: {name: "widgets_star"},
|