@shivaedev/identity 0.17.0 → 0.19.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 +38 -0
- package/README.md +74 -45
- package/dist/server/adapters/authCall.d.ts +5 -0
- package/dist/server/adapters/authCall.d.ts.map +1 -0
- package/dist/server/adapters/authCall.js +7 -0
- package/dist/server/adapters/authCall.js.map +1 -0
- package/dist/server/adapters/betterAuthSessions.d.ts.map +1 -1
- package/dist/server/adapters/betterAuthSessions.js +3 -5
- package/dist/server/adapters/betterAuthSessions.js.map +1 -1
- package/dist/server/{local.d.ts → adapters/local.d.ts} +1 -1
- package/dist/server/adapters/local.d.ts.map +1 -0
- package/dist/server/{local.js → adapters/local.js} +7 -6
- package/dist/server/adapters/local.js.map +1 -0
- package/dist/server/adapters/proxyRanges.d.ts.map +1 -0
- package/dist/server/adapters/proxyRanges.js.map +1 -0
- package/dist/server/adapters/trustedOrigins.d.ts +3 -0
- package/dist/server/adapters/trustedOrigins.d.ts.map +1 -0
- package/dist/server/adapters/trustedOrigins.js +10 -0
- package/dist/server/adapters/trustedOrigins.js.map +1 -0
- package/dist/server/adapters/trustedProxy.d.ts.map +1 -0
- package/dist/server/{trustedProxy.js → adapters/trustedProxy.js} +1 -1
- package/dist/server/adapters/trustedProxy.js.map +1 -0
- package/dist/server/adapters/trustedProxyRanges.d.ts.map +1 -0
- package/dist/server/{trustedProxyRanges.js → adapters/trustedProxyRanges.js} +1 -1
- package/dist/server/adapters/trustedProxyRanges.js.map +1 -0
- package/dist/server/better-auth/accountRoleSeed.d.ts +2 -1
- package/dist/server/better-auth/accountRoleSeed.d.ts.map +1 -1
- package/dist/server/better-auth/accountRoleSeed.js +8 -6
- package/dist/server/better-auth/accountRoleSeed.js.map +1 -1
- package/dist/server/better-auth/adapters/assertSchema.d.ts.map +1 -0
- package/dist/server/better-auth/{assertSchema.js → adapters/assertSchema.js} +2 -2
- package/dist/server/better-auth/adapters/assertSchema.js.map +1 -0
- package/dist/server/better-auth/adapters/bearerSessions.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/bearerSessions.js.map +1 -0
- package/dist/server/better-auth/{clientIp.d.ts → adapters/clientIp.d.ts} +4 -3
- package/dist/server/better-auth/adapters/clientIp.d.ts.map +1 -0
- package/dist/server/better-auth/{clientIp.js → adapters/clientIp.js} +7 -5
- package/dist/server/better-auth/adapters/clientIp.js.map +1 -0
- package/dist/server/better-auth/adapters/closeRoleEndpoints.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/closeRoleEndpoints.js.map +1 -0
- package/dist/server/better-auth/adapters/columnDrift.d.ts.map +1 -0
- package/dist/server/better-auth/{columnDrift.js → adapters/columnDrift.js} +4 -3
- package/dist/server/better-auth/adapters/columnDrift.js.map +1 -0
- package/dist/server/better-auth/adapters/database.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/database.js +18 -3
- package/dist/server/better-auth/adapters/database.js.map +1 -1
- package/dist/server/better-auth/adapters/hookRuntime.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/hookRuntime.js +2 -1
- package/dist/server/better-auth/adapters/hookRuntime.js.map +1 -1
- package/dist/server/better-auth/adapters/migrate.d.ts.map +1 -0
- package/dist/server/better-auth/{migrate.js → adapters/migrate.js} +1 -1
- package/dist/server/better-auth/adapters/migrate.js.map +1 -0
- package/dist/server/better-auth/adapters/migrationPlan.d.ts.map +1 -0
- package/dist/server/better-auth/{migrationPlan.js → adapters/migrationPlan.js} +7 -5
- package/dist/server/better-auth/adapters/migrationPlan.js.map +1 -0
- package/dist/server/better-auth/adapters/migrations/generate.d.ts.map +1 -0
- package/dist/server/better-auth/{migrations → adapters/migrations}/generate.js +1 -1
- package/dist/server/better-auth/adapters/migrations/generate.js.map +1 -0
- package/dist/server/better-auth/{mount.d.ts → adapters/mount.d.ts} +13 -12
- package/dist/server/better-auth/adapters/mount.d.ts.map +1 -0
- package/dist/server/better-auth/{mount.js → adapters/mount.js} +32 -20
- package/dist/server/better-auth/adapters/mount.js.map +1 -0
- package/dist/server/better-auth/adapters/mountedSessions.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/mountedSessions.js.map +1 -0
- package/dist/server/better-auth/adapters/oauthGrants.d.ts +17 -0
- package/dist/server/better-auth/adapters/oauthGrants.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/oauthGrants.js +68 -0
- package/dist/server/better-auth/adapters/oauthGrants.js.map +1 -0
- package/dist/server/better-auth/adapters/oauthProvider.d.ts +18 -0
- package/dist/server/better-auth/adapters/oauthProvider.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/oauthProvider.js +13 -0
- package/dist/server/better-auth/adapters/oauthProvider.js.map +1 -0
- package/dist/server/better-auth/adapters/rateLimitStorage.d.ts +4 -0
- package/dist/server/better-auth/adapters/rateLimitStorage.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/rateLimitStorage.js +14 -0
- package/dist/server/better-auth/adapters/rateLimitStorage.js.map +1 -0
- package/dist/server/better-auth/adapters/response.d.ts +1 -1
- package/dist/server/better-auth/adapters/response.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/response.js +1 -1
- package/dist/server/better-auth/adapters/response.js.map +1 -1
- package/dist/server/better-auth/adapters/routeHandler.d.ts +5 -0
- package/dist/server/better-auth/adapters/routeHandler.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/routeHandler.js +20 -0
- package/dist/server/better-auth/adapters/routeHandler.js.map +1 -0
- package/dist/server/better-auth/adapters/storedRoleOptions.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/storedRoleOptions.js +8 -1
- package/dist/server/better-auth/adapters/storedRoleOptions.js.map +1 -1
- package/dist/server/better-auth/adapters/tables.d.ts +19 -0
- package/dist/server/better-auth/adapters/tables.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/tables.js +24 -0
- package/dist/server/better-auth/adapters/tables.js.map +1 -0
- package/dist/server/better-auth/admittedSessions.d.ts +1 -1
- package/dist/server/better-auth/admittedSessions.d.ts.map +1 -1
- package/dist/server/better-auth/admittedSessions.js +1 -1
- package/dist/server/better-auth/admittedSessions.js.map +1 -1
- package/dist/server/better-auth/assignRole.d.ts +2 -1
- package/dist/server/better-auth/assignRole.d.ts.map +1 -1
- package/dist/server/better-auth/assignRole.js +7 -5
- package/dist/server/better-auth/assignRole.js.map +1 -1
- package/dist/server/better-auth/mountRoutes.d.ts +9 -3
- package/dist/server/better-auth/mountRoutes.d.ts.map +1 -1
- package/dist/server/better-auth/mountRoutes.js +7 -17
- package/dist/server/better-auth/mountRoutes.js.map +1 -1
- package/dist/server/better-auth/signInGate.d.ts.map +1 -1
- package/dist/server/better-auth/signInGate.js +2 -1
- package/dist/server/better-auth/signInGate.js.map +1 -1
- package/dist/server/better-auth/testDatabase.js +1 -1
- package/dist/server/better-auth/testDatabase.js.map +1 -1
- package/dist/server/currentSessionContext.d.ts +5 -0
- package/dist/server/currentSessionContext.d.ts.map +1 -0
- package/dist/server/currentSessionContext.js +19 -0
- package/dist/server/currentSessionContext.js.map +1 -0
- package/dist/server/oauthGrants.d.ts +21 -0
- package/dist/server/oauthGrants.d.ts.map +1 -0
- package/dist/server/oauthGrants.js +5 -0
- package/dist/server/oauthGrants.js.map +1 -0
- package/dist/server/origin.d.ts +0 -1
- package/dist/server/origin.d.ts.map +1 -1
- package/dist/server/origin.js +0 -8
- package/dist/server/origin.js.map +1 -1
- package/dist/server/revalidateStream.d.ts +3 -3
- package/dist/server/revalidateStream.d.ts.map +1 -1
- package/dist/server/revalidateStream.js +3 -8
- package/dist/server/revalidateStream.js.map +1 -1
- package/dist/server/session.d.ts.map +1 -1
- package/dist/server/session.js +3 -2
- package/dist/server/session.js.map +1 -1
- package/dist/server/tracing.d.ts.map +1 -1
- package/dist/server/tracing.js +3 -2
- package/dist/server/tracing.js.map +1 -1
- package/dist/sessions.d.ts +1 -1
- package/package.json +18 -12
- package/src/server/adapters/authCall.ts +8 -0
- package/src/server/adapters/betterAuthSessions.ts +4 -6
- package/src/server/{local.ts → adapters/local.ts} +7 -9
- package/src/server/adapters/trustedOrigins.ts +13 -0
- package/src/server/{trustedProxy.ts → adapters/trustedProxy.ts} +1 -1
- package/src/server/{trustedProxyRanges.ts → adapters/trustedProxyRanges.ts} +1 -1
- package/src/server/better-auth/accountRoleSeed.ts +8 -5
- package/src/server/better-auth/{assertSchema.ts → adapters/assertSchema.ts} +2 -2
- package/src/server/better-auth/{clientIp.ts → adapters/clientIp.ts} +7 -6
- package/src/server/better-auth/{columnDrift.ts → adapters/columnDrift.ts} +4 -3
- package/src/server/better-auth/adapters/database.ts +21 -4
- package/src/server/better-auth/adapters/hookRuntime.ts +2 -1
- package/src/server/better-auth/{migrate.ts → adapters/migrate.ts} +1 -1
- package/src/server/better-auth/{migrationPlan.ts → adapters/migrationPlan.ts} +7 -5
- package/src/server/better-auth/{migrations → adapters/migrations}/generate.ts +1 -1
- package/src/server/better-auth/{mount.ts → adapters/mount.ts} +40 -25
- package/src/server/better-auth/adapters/oauthGrants.ts +82 -0
- package/src/server/better-auth/adapters/oauthProvider.ts +19 -0
- package/src/server/better-auth/adapters/rateLimitStorage.ts +23 -0
- package/src/server/better-auth/adapters/response.ts +1 -1
- package/src/server/better-auth/adapters/routeHandler.ts +31 -0
- package/src/server/better-auth/adapters/storedRoleOptions.ts +8 -1
- package/src/server/better-auth/adapters/tables.ts +28 -0
- package/src/server/better-auth/admittedSessions.ts +1 -1
- package/src/server/better-auth/assignRole.ts +7 -4
- package/src/server/better-auth/mountRoutes.ts +15 -35
- package/src/server/better-auth/signInGate.ts +2 -1
- package/src/server/better-auth/testDatabase.ts +1 -1
- package/src/server/currentSessionContext.ts +23 -0
- package/src/server/oauthGrants.ts +19 -0
- package/src/server/origin.ts +0 -10
- package/src/server/revalidateStream.ts +4 -8
- package/src/server/session.ts +3 -2
- package/src/server/tracing.ts +5 -2
- package/dist/server/better-auth/assertSchema.d.ts.map +0 -1
- package/dist/server/better-auth/assertSchema.js.map +0 -1
- package/dist/server/better-auth/bearerSessions.d.ts.map +0 -1
- package/dist/server/better-auth/bearerSessions.js.map +0 -1
- package/dist/server/better-auth/clientIp.d.ts.map +0 -1
- package/dist/server/better-auth/clientIp.js.map +0 -1
- package/dist/server/better-auth/closeRoleEndpoints.d.ts.map +0 -1
- package/dist/server/better-auth/closeRoleEndpoints.js.map +0 -1
- package/dist/server/better-auth/columnDrift.d.ts.map +0 -1
- package/dist/server/better-auth/columnDrift.js.map +0 -1
- package/dist/server/better-auth/memoryRateLimit.d.ts +0 -3
- package/dist/server/better-auth/memoryRateLimit.d.ts.map +0 -1
- package/dist/server/better-auth/memoryRateLimit.js +0 -46
- package/dist/server/better-auth/memoryRateLimit.js.map +0 -1
- package/dist/server/better-auth/migrate.d.ts.map +0 -1
- package/dist/server/better-auth/migrate.js.map +0 -1
- package/dist/server/better-auth/migrationPlan.d.ts.map +0 -1
- package/dist/server/better-auth/migrationPlan.js.map +0 -1
- package/dist/server/better-auth/migrations/generate.d.ts.map +0 -1
- package/dist/server/better-auth/migrations/generate.js.map +0 -1
- package/dist/server/better-auth/mount.d.ts.map +0 -1
- package/dist/server/better-auth/mount.js.map +0 -1
- package/dist/server/better-auth/mountedSessions.d.ts.map +0 -1
- package/dist/server/better-auth/mountedSessions.js.map +0 -1
- package/dist/server/local.d.ts.map +0 -1
- package/dist/server/local.js.map +0 -1
- package/dist/server/proxyRanges.d.ts.map +0 -1
- package/dist/server/proxyRanges.js.map +0 -1
- package/dist/server/trustedProxy.d.ts.map +0 -1
- package/dist/server/trustedProxy.js.map +0 -1
- package/dist/server/trustedProxyRanges.d.ts.map +0 -1
- package/dist/server/trustedProxyRanges.js.map +0 -1
- package/src/server/better-auth/memoryRateLimit.ts +0 -56
- /package/dist/server/{proxyRanges.d.ts → adapters/proxyRanges.d.ts} +0 -0
- /package/dist/server/{proxyRanges.js → adapters/proxyRanges.js} +0 -0
- /package/dist/server/{trustedProxy.d.ts → adapters/trustedProxy.d.ts} +0 -0
- /package/dist/server/{trustedProxyRanges.d.ts → adapters/trustedProxyRanges.d.ts} +0 -0
- /package/dist/server/better-auth/{assertSchema.d.ts → adapters/assertSchema.d.ts} +0 -0
- /package/dist/server/better-auth/{bearerSessions.d.ts → adapters/bearerSessions.d.ts} +0 -0
- /package/dist/server/better-auth/{bearerSessions.js → adapters/bearerSessions.js} +0 -0
- /package/dist/server/better-auth/{closeRoleEndpoints.d.ts → adapters/closeRoleEndpoints.d.ts} +0 -0
- /package/dist/server/better-auth/{closeRoleEndpoints.js → adapters/closeRoleEndpoints.js} +0 -0
- /package/dist/server/better-auth/{columnDrift.d.ts → adapters/columnDrift.d.ts} +0 -0
- /package/dist/server/better-auth/{migrate.d.ts → adapters/migrate.d.ts} +0 -0
- /package/dist/server/better-auth/{migrationPlan.d.ts → adapters/migrationPlan.d.ts} +0 -0
- /package/dist/server/better-auth/{migrations → adapters/migrations}/generate.d.ts +0 -0
- /package/dist/server/better-auth/{mountedSessions.d.ts → adapters/mountedSessions.d.ts} +0 -0
- /package/dist/server/better-auth/{mountedSessions.js → adapters/mountedSessions.js} +0 -0
- /package/src/server/{proxyRanges.ts → adapters/proxyRanges.ts} +0 -0
- /package/src/server/better-auth/{bearerSessions.ts → adapters/bearerSessions.ts} +0 -0
- /package/src/server/better-auth/{closeRoleEndpoints.ts → adapters/closeRoleEndpoints.ts} +0 -0
- /package/src/server/better-auth/{mountedSessions.ts → adapters/mountedSessions.ts} +0 -0
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
import { Effect, Layer, Option, Schema } from "effect";
|
|
2
|
+
import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
3
|
+
import { OauthGrant, OauthGrants } from "#server/oauthGrants.ts";
|
|
4
|
+
function unavailable(cause) {
|
|
5
|
+
return Object.assign(new AuthUnavailable({ message: "OAuth grant storage failed" }), { cause });
|
|
6
|
+
}
|
|
7
|
+
export function betterAuthOauthGrants(options) {
|
|
8
|
+
const { auth, admitsUser } = options;
|
|
9
|
+
const revoke = Effect.fn("Identity.revoke")(function* (userId, clientId) {
|
|
10
|
+
yield* Effect.tryPromise({
|
|
11
|
+
catch: unavailable,
|
|
12
|
+
try: async () => {
|
|
13
|
+
const { adapter } = await auth.$context;
|
|
14
|
+
const where = [{ field: "userId", value: userId }, ...(clientId === undefined ? [] : [{ field: "clientId", value: clientId }])];
|
|
15
|
+
await adapter.transaction(async (transaction) => {
|
|
16
|
+
for (const model of ["oauthConsent", "oauthAccessToken", "oauthRefreshToken"]) {
|
|
17
|
+
await transaction.deleteMany({ model, where });
|
|
18
|
+
}
|
|
19
|
+
});
|
|
20
|
+
},
|
|
21
|
+
});
|
|
22
|
+
});
|
|
23
|
+
return Layer.succeed(OauthGrants, {
|
|
24
|
+
list: Effect.fn("OauthGrants.list")(function* (userId, page) {
|
|
25
|
+
const consents = yield* Effect.tryPromise({
|
|
26
|
+
catch: unavailable,
|
|
27
|
+
try: async () => {
|
|
28
|
+
const { adapter } = await auth.$context;
|
|
29
|
+
return adapter.findMany({
|
|
30
|
+
...page,
|
|
31
|
+
model: "oauthConsent",
|
|
32
|
+
sortBy: { direction: "asc", field: "id" },
|
|
33
|
+
where: [{ field: "userId", value: userId }],
|
|
34
|
+
});
|
|
35
|
+
},
|
|
36
|
+
});
|
|
37
|
+
return yield* Schema.decodeUnknownEffect(Schema.Array(OauthGrant))(consents).pipe(Effect.mapError(unavailable));
|
|
38
|
+
}),
|
|
39
|
+
resolveSubject: Effect.fn("OauthGrants.resolveSubject")(function* (userId, clientId) {
|
|
40
|
+
const subject = yield* Effect.tryPromise({
|
|
41
|
+
catch: unavailable,
|
|
42
|
+
try: async () => {
|
|
43
|
+
const { adapter, internalAdapter } = await auth.$context;
|
|
44
|
+
const user = await internalAdapter.findUserById(userId);
|
|
45
|
+
if (user === null || Reflect.get(user, "banned") === true) {
|
|
46
|
+
return null;
|
|
47
|
+
}
|
|
48
|
+
const consent = await adapter.findOne({
|
|
49
|
+
model: "oauthConsent",
|
|
50
|
+
where: [
|
|
51
|
+
{ field: "userId", value: userId },
|
|
52
|
+
{ field: "clientId", value: clientId },
|
|
53
|
+
],
|
|
54
|
+
});
|
|
55
|
+
return consent === null ? null : user;
|
|
56
|
+
},
|
|
57
|
+
});
|
|
58
|
+
if (subject === null || !(yield* admitsUser(subject.id))) {
|
|
59
|
+
return Option.none();
|
|
60
|
+
}
|
|
61
|
+
const role = Reflect.get(subject, "role");
|
|
62
|
+
return Option.some({ email: subject.email, id: subject.id, name: subject.name, ...(typeof role === "string" ? { role } : {}) });
|
|
63
|
+
}),
|
|
64
|
+
revokeAllClients: (userId) => revoke(userId),
|
|
65
|
+
revokeClient: (userId, clientId) => revoke(userId, clientId),
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
//# sourceMappingURL=oauthGrants.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauthGrants.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/oauthGrants.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { type OAuthOptions, oauthProvider, type Scope } from "@better-auth/oauth-provider";
|
|
2
|
+
import { Effect } from "effect";
|
|
3
|
+
import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
4
|
+
export type OauthResourceOptions = Omit<OAuthOptions<Scope[]>, "resources" | "clientRegistrationDefaultResources"> & {
|
|
5
|
+
readonly resource: string;
|
|
6
|
+
};
|
|
7
|
+
export declare function betterAuthOauthProvider({ resource, ...options }: OauthResourceOptions): ReturnType<typeof oauthProvider>;
|
|
8
|
+
export declare const oauthAuthorizationMetadata: (auth: {
|
|
9
|
+
readonly api: {
|
|
10
|
+
readonly "getOAuthServerConfig": (input: {
|
|
11
|
+
readonly request: Request;
|
|
12
|
+
readonly asResponse: false;
|
|
13
|
+
}) => Promise<unknown>;
|
|
14
|
+
};
|
|
15
|
+
}, request: Request) => Effect.Effect<Response, AuthUnavailable & {
|
|
16
|
+
cause: unknown;
|
|
17
|
+
}, never>;
|
|
18
|
+
//# sourceMappingURL=oauthProvider.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauthProvider.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/oauthProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,aAAa,EAAmC,KAAK,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAC5H,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,EAAE,WAAW,GAAG,oCAAoC,CAAC,GAAG;IAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnJ,wBAAgB,uBAAuB,CAAC,EAAE,QAAQ,EAAE,GAAG,OAAO,EAAE,EAAE,oBAAoB,GAAG,UAAU,CAAC,OAAO,aAAa,CAAC,CAExH;AAED,eAAO,MAAM,0BAA0B;kBAChB;QAAE,QAAQ,CAAC,sBAAsB,EAAE,CAAC,KAAK,EAAE;YAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;YAAC,QAAQ,CAAC,UAAU,EAAE,KAAK,CAAA;SAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;KAAE;;;SAOhJ,CAAC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { oauthProvider, oauthProviderAuthServerMetadata } from "@better-auth/oauth-provider";
|
|
2
|
+
import { Effect } from "effect";
|
|
3
|
+
import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
4
|
+
export function betterAuthOauthProvider({ resource, ...options }) {
|
|
5
|
+
return oauthProvider({ ...options, clientRegistrationDefaultResources: [resource], resources: [resource] });
|
|
6
|
+
}
|
|
7
|
+
export const oauthAuthorizationMetadata = Effect.fn("Identity.oauthAuthorizationMetadata")(function* (auth, request) {
|
|
8
|
+
return yield* Effect.tryPromise({
|
|
9
|
+
catch: (cause) => Object.assign(new AuthUnavailable({ message: "OAuth server metadata failed" }), { cause }),
|
|
10
|
+
try: () => oauthProviderAuthServerMetadata(auth)(request),
|
|
11
|
+
});
|
|
12
|
+
});
|
|
13
|
+
//# sourceMappingURL=oauthProvider.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauthProvider.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/oauthProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,aAAa,EAAE,+BAA+B,EAAc,MAAM,6BAA6B,CAAC;AAC5H,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAIhE,MAAM,UAAU,uBAAuB,CAAC,EAAE,QAAQ,EAAE,GAAG,OAAO,EAAwB;IACrF,OAAO,aAAa,CAAC,EAAE,GAAG,OAAO,EAAE,kCAAkC,EAAE,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;AAC7G,CAAC;AAED,MAAM,CAAC,MAAM,0BAA0B,GAAG,MAAM,CAAC,EAAE,CAAC,qCAAqC,CAAC,CAAC,QAAQ,CAAC,EACnG,IAAmJ,EACnJ,OAAgB;IAEhB,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC;QAC/B,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,eAAe,CAAC,EAAE,OAAO,EAAE,8BAA8B,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC;QAC5G,GAAG,EAAE,GAAG,EAAE,CAAC,+BAA+B,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;KACzD,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rateLimitStorage.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/rateLimitStorage.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,MAAM,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AAEvD,eAAO,MAAM,gBAAgB,+EAkB3B,CAAC"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { Clock, Effect } from "effect";
|
|
2
|
+
import { Store } from "@shivaedev/rate-limit/Store.ts";
|
|
3
|
+
export const rateLimitStorage = Effect.gen(function* () {
|
|
4
|
+
const store = yield* Store;
|
|
5
|
+
const run = Effect.runPromiseWith(yield* Effect.context());
|
|
6
|
+
const storage = {
|
|
7
|
+
consume: (key, rule) => run(store.consume({ key: `identity:auth:${key}`, per: rule.max, windowMillis: rule.window * 1000 }).pipe(Effect.as({ allowed: true, retryAfter: null }), Effect.catchTag("TooManyRequests", (error) => Effect.map(Clock.currentTimeMillis, (now) => ({
|
|
8
|
+
allowed: false,
|
|
9
|
+
retryAfter: Math.max(1, Math.ceil(((error.retryAt ?? now + rule.window * 1000) - now) / 1000)),
|
|
10
|
+
}))))),
|
|
11
|
+
};
|
|
12
|
+
return storage;
|
|
13
|
+
});
|
|
14
|
+
//# sourceMappingURL=rateLimitStorage.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rateLimitStorage.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/rateLimitStorage.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AAEvD,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IACnD,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC;IAC3B,MAAM,GAAG,GAAG,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAAS,CAAC,CAAC;IAClE,MAAM,OAAO,GAA6D;QACzE,OAAO,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CACtB,GAAG,CACF,KAAK,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,iBAAiB,GAAG,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,YAAY,EAAE,IAAI,CAAC,MAAM,GAAG,IAAI,EAAE,CAAC,CAAC,IAAI,CACnG,MAAM,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,EAC9C,MAAM,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,KAAK,EAAE,EAAE,CAC5C,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAC7C,OAAO,EAAE,KAAK;YACd,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,GAAG,GAAG,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;SAC9F,CAAC,CAAC,CACH,CACD,CACD;KACF,CAAC;IACF,OAAO,OAAO,CAAC;AAChB,CAAC,CAAC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type Cause, Effect } from "effect";
|
|
2
2
|
import type { RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
3
|
-
import { type BearerSessionsOptions } from "#server/better-auth/bearerSessions.ts";
|
|
3
|
+
import { type BearerSessionsOptions } from "#server/better-auth/adapters/bearerSessions.ts";
|
|
4
4
|
export interface MountedAuth {
|
|
5
5
|
readonly $context: Promise<{
|
|
6
6
|
readonly authCookies: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"response.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,KAAK,qBAAqB,EAA2D,MAAM,
|
|
1
|
+
{"version":3,"file":"response.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,KAAK,qBAAqB,EAA2D,MAAM,gDAAgD,CAAC;AAGrJ,MAAM,WAAW,WAAW;IAC3B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;QAAE,QAAQ,CAAC,WAAW,EAAE;YAAE,QAAQ,CAAC,YAAY,EAAE;gBAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;aAAE,CAAA;SAAE,CAAA;KAAE,CAAC,CAAC;IAC3G,QAAQ,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;CAC1D;AACD,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,cAAc,CAAC,EAAE,qBAAqB,GAAG,SAAS,CAAC;IAC5D,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC,GAAG,SAAS,CAAC;IAC9H,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3C;AA6BD,eAAO,MAAM,QAAQ,+MAUnB,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Effect } from "effect";
|
|
2
|
-
import { cookieSessionResponse, hasSessionCookie, sessionHeaders } from "#server/better-auth/bearerSessions.ts";
|
|
2
|
+
import { cookieSessionResponse, hasSessionCookie, sessionHeaders } from "#server/better-auth/adapters/bearerSessions.ts";
|
|
3
3
|
import { sessionPermissions } from "#server/better-auth/sessionPermissions.ts";
|
|
4
4
|
function replacesSession(request, reply, native) {
|
|
5
5
|
return (native
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"response.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE5C,OAAO,EAA8B,qBAAqB,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"response.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/response.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
2
|
+
import { HttpServerRequest, HttpServerResponse } from "effect/http";
|
|
3
|
+
import { type MountedAuth, type MountRouteOptions } from "#server/better-auth/adapters/response.ts";
|
|
4
|
+
export declare function authRouteHandler(auth: MountedAuth, options: MountRouteOptions): Effect.Effect<HttpServerResponse.HttpServerResponse, import("effect/http/HttpServerError").RequestError, HttpServerRequest.HttpServerRequest>;
|
|
5
|
+
//# sourceMappingURL=routeHandler.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"routeHandler.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/routeHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGpE,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,iBAAiB,EAAY,MAAM,0CAA0C,CAAC;AAG9G,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,iBAAiB,iJAuB7E"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
2
|
+
import { HttpServerRequest, HttpServerResponse } from "effect/http";
|
|
3
|
+
import * as HttpStatus from "effect/http/HttpStatus";
|
|
4
|
+
import { clientIpHeaders } from "#server/better-auth/adapters/clientIp.ts";
|
|
5
|
+
import { response } from "#server/better-auth/adapters/response.ts";
|
|
6
|
+
import { providerFailure } from "#server/providerFailure.ts";
|
|
7
|
+
export function authRouteHandler(auth, options) {
|
|
8
|
+
const setClientIp = clientIpHeaders(options);
|
|
9
|
+
return Effect.gen(function* () {
|
|
10
|
+
const request = yield* HttpServerRequest.HttpServerRequest;
|
|
11
|
+
const web = yield* HttpServerRequest.toWeb(request);
|
|
12
|
+
const clientIp = yield* setClientIp(web);
|
|
13
|
+
yield* Effect.annotateCurrentSpan({
|
|
14
|
+
"auth.rate_limit.address": clientIp.address,
|
|
15
|
+
"auth.rate_limit.address_source": clientIp.source,
|
|
16
|
+
});
|
|
17
|
+
return HttpServerResponse.fromWeb(yield* response(auth, web, options).pipe(Effect.catchTag("Forbidden", (error) => Effect.succeed(Response.json({ message: error.message }, { status: HttpStatus.fromLiteral("Forbidden") }))), Effect.catch(providerFailure)));
|
|
18
|
+
}).pipe(Effect.catchTag("AuthUnavailable", () => Effect.succeed(HttpServerResponse.text("Authentication is temporarily unavailable", { status: HttpStatus.fromLiteral("ServiceUnavailable") }))));
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=routeHandler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"routeHandler.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/routeHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAA4C,QAAQ,EAAE,MAAM,0CAA0C,CAAC;AAC9G,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,MAAM,UAAU,gBAAgB,CAAC,IAAiB,EAAE,OAA0B;IAC7E,MAAM,WAAW,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IAC7C,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAC1B,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,iBAAiB,CAAC,iBAAiB,CAAC;QAC3D,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACpD,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QACzC,KAAK,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC;YACjC,yBAAyB,EAAE,QAAQ,CAAC,OAAO;YAC3C,gCAAgC,EAAE,QAAQ,CAAC,MAAM;SACjD,CAAC,CAAC;QACH,OAAO,kBAAkB,CAAC,OAAO,CAChC,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,IAAI,CACvC,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,EAAE,CACtC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAC1G,EACD,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAC7B,CACD,CAAC;IACH,CAAC,CAAC,CAAC,IAAI,CACN,MAAM,CAAC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE,CACvC,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,2CAA2C,EAAE,EAAE,MAAM,EAAE,UAAU,CAAC,WAAW,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC,CAC9I,CACD,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storedRoleOptions.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/storedRoleOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"storedRoleOptions.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/storedRoleOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC7B;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,SAAS,iBAAiB,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,iBAAiB,GAAG,QAAQ,CAoB3H"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { tables } from "#server/better-auth/adapters/tables.ts";
|
|
1
2
|
export function storedRoleOptions(options, role) {
|
|
2
3
|
if (role === undefined) {
|
|
3
4
|
return options;
|
|
@@ -8,7 +9,13 @@ export function storedRoleOptions(options, role) {
|
|
|
8
9
|
...options.user,
|
|
9
10
|
additionalFields: {
|
|
10
11
|
...options.user?.additionalFields,
|
|
11
|
-
role: {
|
|
12
|
+
role: {
|
|
13
|
+
defaultValue: role.defaultRole,
|
|
14
|
+
fieldName: tables(options).user.role,
|
|
15
|
+
input: false,
|
|
16
|
+
required: true,
|
|
17
|
+
type: "string",
|
|
18
|
+
},
|
|
12
19
|
},
|
|
13
20
|
},
|
|
14
21
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storedRoleOptions.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/storedRoleOptions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"storedRoleOptions.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/storedRoleOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,wCAAwC,CAAC;AAMhE,MAAM,UAAU,iBAAiB,CAAqC,OAAiB,EAAE,IAAwB;IAChH,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO,OAAO,CAAC;IAChB,CAAC;IACD,OAAO;QACN,GAAG,OAAO;QACV,IAAI,EAAE;YACL,GAAG,OAAO,CAAC,IAAI;YACf,gBAAgB,EAAE;gBACjB,GAAG,OAAO,CAAC,IAAI,EAAE,gBAAgB;gBACjC,IAAI,EAAE;oBACL,YAAY,EAAE,IAAI,CAAC,WAAW;oBAC9B,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI;oBACpC,KAAK,EAAE,KAAK;oBACZ,QAAQ,EAAE,IAAI;oBACd,IAAI,EAAE,QAAQ;iBACd;aACD;SACD;KACD,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type { BetterAuthOptions } from "better-auth";
|
|
2
|
+
export type AuthTableOptions = Pick<BetterAuthOptions, "user" | "account" | "plugins">;
|
|
3
|
+
export declare function tables(options?: AuthTableOptions): {
|
|
4
|
+
account: {
|
|
5
|
+
accountId: string;
|
|
6
|
+
providerId: string;
|
|
7
|
+
table: string;
|
|
8
|
+
userId: string;
|
|
9
|
+
};
|
|
10
|
+
user: {
|
|
11
|
+
createdAt: string;
|
|
12
|
+
email: string;
|
|
13
|
+
name: string;
|
|
14
|
+
role: string;
|
|
15
|
+
table: string;
|
|
16
|
+
updatedAt: string;
|
|
17
|
+
};
|
|
18
|
+
};
|
|
19
|
+
//# sourceMappingURL=tables.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tables.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/tables.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,MAAM,MAAM,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAAC,CAAC;AAMvF,wBAAgB,MAAM,CAAC,OAAO,GAAE,gBAAqB;IAGnD,OAAO;QACN,SAAS;QACT,UAAU;QACV,KAAK;QACL,MAAM;;IAEP,IAAI;QACH,SAAS;QACT,KAAK;QACL,IAAI;QACJ,IAAI;QACJ,KAAK;QACL,SAAS;;EAGX"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { getAuthTables } from "better-auth/db";
|
|
2
|
+
function field(table, name) {
|
|
3
|
+
return table?.fields[name]?.fieldName ?? name;
|
|
4
|
+
}
|
|
5
|
+
export function tables(options = {}) {
|
|
6
|
+
const schema = getAuthTables(options);
|
|
7
|
+
return {
|
|
8
|
+
account: {
|
|
9
|
+
accountId: field(schema.account, "accountId"),
|
|
10
|
+
providerId: field(schema.account, "providerId"),
|
|
11
|
+
table: schema.account?.modelName ?? "account",
|
|
12
|
+
userId: field(schema.account, "userId"),
|
|
13
|
+
},
|
|
14
|
+
user: {
|
|
15
|
+
createdAt: field(schema.user, "createdAt"),
|
|
16
|
+
email: field(schema.user, "email"),
|
|
17
|
+
name: field(schema.user, "name"),
|
|
18
|
+
role: field(schema.user, "role"),
|
|
19
|
+
table: schema.user?.modelName ?? "user",
|
|
20
|
+
updatedAt: field(schema.user, "updatedAt"),
|
|
21
|
+
},
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=tables.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tables.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/tables.ts"],"names":[],"mappings":"AACA,OAAO,EAA2B,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAIxE,SAAS,KAAK,CAAC,KAA6C,EAAE,IAAY;IACzE,OAAO,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,SAAS,IAAI,IAAI,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,OAAO,GAAqB,EAAE;IACpD,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IACtC,OAAO;QACN,OAAO,EAAE;YACR,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC;YAC7C,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC;YAC/C,KAAK,EAAE,MAAM,CAAC,OAAO,EAAE,SAAS,IAAI,SAAS;YAC7C,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC;SACvC;QACD,IAAI,EAAE;YACL,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC;YAC1C,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC;YAClC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC;YAChC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC;YAChC,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,SAAS,IAAI,MAAM;YACvC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC;SAC1C;KACD,CAAC;AACH,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type GetProviderAccounts, type GetSession, type SessionWithProviderAccounts } from "#server/adapters/betterAuthSessions.ts";
|
|
2
|
+
import { type BearerSessionsOptions } from "#server/better-auth/adapters/bearerSessions.ts";
|
|
2
3
|
import type { SessionProvider, SessionShape } from "#server/session.ts";
|
|
3
|
-
import { type BearerSessionsOptions } from "./bearerSessions.ts";
|
|
4
4
|
import { type PolicyStorage, type SignInGate } from "./signInGate.ts";
|
|
5
5
|
interface SessionStorage extends PolicyStorage {
|
|
6
6
|
readonly authCookies: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admittedSessions.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/admittedSessions.ts"],"names":[],"mappings":"AAEA,OAAO,EAEN,KAAK,mBAAmB,EACxB,KAAK,UAAU,EACf,KAAK,2BAA2B,EAChC,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"admittedSessions.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/admittedSessions.ts"],"names":[],"mappings":"AAEA,OAAO,EAEN,KAAK,mBAAmB,EACxB,KAAK,UAAU,EACf,KAAK,2BAA2B,EAChC,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,KAAK,qBAAqB,EAAkB,MAAM,gDAAgD,CAAC;AAE5G,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,EAAe,KAAK,aAAa,EAAE,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAEnF,UAAU,cAAe,SAAQ,aAAa;IAC7C,QAAQ,CAAC,WAAW,EAAE;QAAE,QAAQ,CAAC,YAAY,EAAE;YAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC;CAC3E;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC,EAAE,qBAAqB;KACvH,QAAQ,SAAS,YAAY,cAAc,UAAU,CAAC,QAAQ,CAAC,GAAG,eAAe,CAAC,QAAQ,CAAC;KAC3F,QAAQ,SAAS,YAAY,cAC/B,UAAU,CAAC,QAAQ,CAAC,uBACX,mBAAmB,GACtC,eAAe,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC;EA0BzD"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Effect, Option } from "effect";
|
|
2
2
|
import { Headers as HttpHeaders } from "effect/http";
|
|
3
3
|
import { betterAuthSessions, } from "#server/adapters/betterAuthSessions.ts";
|
|
4
|
+
import { sessionHeaders } from "#server/better-auth/adapters/bearerSessions.ts";
|
|
4
5
|
import { providerFailure } from "#server/providerFailure.ts";
|
|
5
|
-
import { sessionHeaders } from "./bearerSessions.js";
|
|
6
6
|
import { fromStorage } from "./signInGate.js";
|
|
7
7
|
export function admittedSessions(gate, storage, bearerSessions) {
|
|
8
8
|
function admit(getSession, getProviderAccounts) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admittedSessions.js","sourceRoot":"","sources":["../../../src/server/better-auth/admittedSessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EACN,kBAAkB,GAIlB,MAAM,wCAAwC,CAAC;AAChD,OAAO,
|
|
1
|
+
{"version":3,"file":"admittedSessions.js","sourceRoot":"","sources":["../../../src/server/better-auth/admittedSessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EACN,kBAAkB,GAIlB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAA8B,cAAc,EAAE,MAAM,gDAAgD,CAAC;AAC5G,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,OAAO,EAAE,WAAW,EAAuC,MAAM,iBAAiB,CAAC;AAMnF,MAAM,UAAU,gBAAgB,CAAI,IAAmB,EAAE,OAAsC,EAAE,cAAsC;IAMtI,SAAS,KAAK,CAAgC,UAAgC,EAAE,mBAAyC;QACxH,MAAM,QAAQ,GAAG,mBAAmB,KAAK,SAAS,CAAC,CAAC,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;QAC1I,OAAO;YACN,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,OAAO;gBACxC,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,IAAI,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBACnG,MAAM,QAAQ,GACb,cAAc,KAAK,SAAS,IAAI,IAAI,KAAK,SAAS;oBACjD,CAAC,CAAC,OAAO;oBACT,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;gBACpG,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBAC9C,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;oBAClE,OAAO,OAAO,CAAC;gBAChB,CAAC;gBACD,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;gBACrC,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC;gBAC1F,IAAI,QAAQ,EAAE,CAAC;oBACd,OAAO,OAAO,CAAC;gBAChB,CAAC;gBACD,KAAK,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC;gBAC1E,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,8CAA8C,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;gBAC5G,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;YACtB,CAAC,CAAC;SACF,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC"}
|
|
@@ -3,5 +3,6 @@ import { SqlClient } from "effect/sql";
|
|
|
3
3
|
import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
|
|
4
4
|
import { LastRoleAssigner } from "@shivaedev/access/roles.ts";
|
|
5
5
|
import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
6
|
-
|
|
6
|
+
import { type AuthTableOptions } from "#server/better-auth/adapters/tables.ts";
|
|
7
|
+
export declare const assignRole: <TRole extends string>(access: Pick<AccessPolicy<TRole>, "Role" | "hasPermission">, userId: string, role: NoInfer<TRole>, options?: AuthTableOptions | undefined) => Effect.Effect<boolean, AuthUnavailable | LastRoleAssigner | NotFound, SqlClient.SqlClient>;
|
|
7
8
|
//# sourceMappingURL=assignRole.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assignRole.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/assignRole.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAkB,MAAM,QAAQ,CAAC;AAEhD,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAe,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"assignRole.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/assignRole.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAkB,MAAM,QAAQ,CAAC;AAEhD,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAe,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAE1E,OAAO,EAAE,KAAK,gBAAgB,EAAU,MAAM,wCAAwC,CAAC;AAMvF,eAAO,MAAM,UAAU,GAA+C,KAAK,SAAS,MAAM,0OAwCxF,CAAC"}
|
|
@@ -4,17 +4,19 @@ import { SqlClient, SqlSchema } from "effect/sql";
|
|
|
4
4
|
import { AssignRoles, LastRoleAssigner } from "@shivaedev/access/roles.ts";
|
|
5
5
|
import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
6
6
|
import { invalidateOnCommit, transact } from "@shivaedev/sql/transact.ts";
|
|
7
|
+
import { tables } from "#server/better-auth/adapters/tables.ts";
|
|
7
8
|
function unavailable() {
|
|
8
9
|
return new AuthUnavailable({ message: "Could not access app users" });
|
|
9
10
|
}
|
|
10
|
-
export const assignRole = Effect.fn("Identity.assignRole")(function* (access, userId, role) {
|
|
11
|
-
const sql = yield* SqlClient.SqlClient;
|
|
11
|
+
export const assignRole = Effect.fn("Identity.assignRole")(function* (access, userId, role, options) {
|
|
12
|
+
const sql = (yield* SqlClient.SqlClient).withoutTransforms();
|
|
13
|
+
const { user } = tables(options);
|
|
12
14
|
const existing = yield* Effect.serviceOption(Reactivity.Reactivity);
|
|
13
15
|
const reactivity = Option.isSome(existing) ? existing.value : yield* Reactivity.make;
|
|
14
16
|
return yield* Effect.gen(function* () {
|
|
15
17
|
yield* sql `select pg_advisory_xact_lock(hashtext('platform.auth.user-roles'))`;
|
|
16
18
|
const readTarget = SqlSchema.findOneOption({
|
|
17
|
-
execute: (id) => sql `select id, role from
|
|
19
|
+
execute: (id) => sql `select id, ${sql(user.role)} as role from ${sql(user.table)} where id = ${id} for update`,
|
|
18
20
|
Request: Schema.String,
|
|
19
21
|
Result: Schema.Struct({ id: Schema.String, role: Schema.NullOr(Schema.String) }),
|
|
20
22
|
});
|
|
@@ -28,7 +30,7 @@ export const assignRole = Effect.fn("Identity.assignRole")(function* (access, us
|
|
|
28
30
|
const assigners = access.Role.literals.filter((candidate) => access.hasPermission(candidate, AssignRoles));
|
|
29
31
|
if (assigners.some((candidate) => candidate === target.value.role) && !access.hasPermission(role, AssignRoles)) {
|
|
30
32
|
const readHolders = SqlSchema.findAll({
|
|
31
|
-
execute: () => sql `select id from
|
|
33
|
+
execute: () => sql `select id from ${sql(user.table)} where ${sql(user.role)} in ${sql.in(assigners)}`,
|
|
32
34
|
Request: Schema.Void,
|
|
33
35
|
Result: Schema.Struct({ id: Schema.String }),
|
|
34
36
|
});
|
|
@@ -37,7 +39,7 @@ export const assignRole = Effect.fn("Identity.assignRole")(function* (access, us
|
|
|
37
39
|
return yield* Effect.fail(new LastRoleAssigner({ userId }));
|
|
38
40
|
}
|
|
39
41
|
}
|
|
40
|
-
yield* sql `update
|
|
42
|
+
yield* sql `update ${sql(user.table)} set ${sql(user.role)} = ${role}, ${sql(user.updatedAt)} = now() where id = ${userId}`;
|
|
41
43
|
yield* invalidateOnCommit(["admin.users"]);
|
|
42
44
|
return true;
|
|
43
45
|
}).pipe(transact({ onSqlError: unavailable }), Effect.provideService(Reactivity.Reactivity, reactivity));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assignRole.js","sourceRoot":"","sources":["../../../src/server/better-auth/assignRole.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,KAAK,UAAU,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAElD,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"assignRole.js","sourceRoot":"","sources":["../../../src/server/better-auth/assignRole.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,10 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { type
|
|
3
|
-
|
|
1
|
+
import { Context, Effect } from "effect";
|
|
2
|
+
import { HttpRouter, type HttpServerError, type HttpServerRequest, type HttpServerResponse } from "effect/http";
|
|
3
|
+
declare const AuthRouteHandler_base: Context.ServiceClass<AuthRouteHandler, "@shivaedev/identity/AuthRouteHandler", {
|
|
4
|
+
readonly handle: Effect.Effect<HttpServerResponse.HttpServerResponse, HttpServerError.RequestError, HttpServerRequest.HttpServerRequest>;
|
|
5
|
+
}>;
|
|
6
|
+
export declare class AuthRouteHandler extends AuthRouteHandler_base {
|
|
7
|
+
}
|
|
8
|
+
export declare const mountRoutes: import("effect/Layer").Layer<never, never, AuthRouteHandler | HttpRouter.HttpRouter | HttpRouter.Request<"Error", HttpServerError.InternalError> | HttpRouter.Request<"Error", HttpServerError.RequestParseError> | HttpRouter.Request<"Error", HttpServerError.RouteNotFound>>;
|
|
9
|
+
export {};
|
|
4
10
|
//# sourceMappingURL=mountRoutes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mountRoutes.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/mountRoutes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mountRoutes.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/mountRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,KAAK,eAAe,EAAE,KAAK,iBAAiB,EAAE,KAAK,kBAAkB,EAAE,MAAM,aAAa,CAAC;;qBAK7F,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,kBAAkB,EAAE,eAAe,CAAC,YAAY,EAAE,iBAAiB,CAAC,iBAAiB,CAAC;;AAH1I,qBAAa,gBAAiB,SAAQ,qBAKK;CAAG;AAE9C,eAAO,MAAM,WAAW,iRAKvB,CAAC"}
|
|
@@ -1,19 +1,9 @@
|
|
|
1
|
-
import { Effect } from "effect";
|
|
2
|
-
import { HttpRouter
|
|
3
|
-
|
|
4
|
-
import { response } from "#server/better-auth/adapters/response.ts";
|
|
5
|
-
import { providerFailure } from "#server/providerFailure.ts";
|
|
6
|
-
import { clientIpHeaders } from "./clientIp.js";
|
|
7
|
-
export function mountRoutes(auth, options) {
|
|
8
|
-
const setClientIp = clientIpHeaders(options);
|
|
9
|
-
return HttpRouter.use((router) => router.add("*", "/api/auth/*", (request) => Effect.gen(function* () {
|
|
10
|
-
const web = yield* HttpServerRequest.toWeb(request);
|
|
11
|
-
const clientIp = setClientIp(request, web);
|
|
12
|
-
yield* Effect.annotateCurrentSpan({
|
|
13
|
-
"auth.rate_limit.address": clientIp.address,
|
|
14
|
-
"auth.rate_limit.address_source": clientIp.source,
|
|
15
|
-
});
|
|
16
|
-
return HttpServerResponse.fromWeb(yield* response(auth, web, options).pipe(Effect.catchTag("Forbidden", (error) => Effect.succeed(Response.json({ message: error.message }, { status: HttpStatus.fromLiteral("Forbidden") }))), Effect.catch(providerFailure)));
|
|
17
|
-
}).pipe(Effect.catch(() => Effect.succeed(HttpServerResponse.text("Authentication is temporarily unavailable", { status: HttpStatus.fromLiteral("ServiceUnavailable") }))))));
|
|
1
|
+
import { Context, Effect } from "effect";
|
|
2
|
+
import { HttpRouter } from "effect/http";
|
|
3
|
+
export class AuthRouteHandler extends Context.Service()("@shivaedev/identity/AuthRouteHandler") {
|
|
18
4
|
}
|
|
5
|
+
export const mountRoutes = HttpRouter.use((router) => Effect.gen(function* () {
|
|
6
|
+
const handler = yield* AuthRouteHandler;
|
|
7
|
+
yield* router.add("*", "/api/auth/*", handler.handle);
|
|
8
|
+
}));
|
|
19
9
|
//# sourceMappingURL=mountRoutes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mountRoutes.js","sourceRoot":"","sources":["../../../src/server/better-auth/mountRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"mountRoutes.js","sourceRoot":"","sources":["../../../src/server/better-auth/mountRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAE,UAAU,EAAyE,MAAM,aAAa,CAAC;AAEhH,MAAM,OAAO,gBAAiB,SAAQ,OAAO,CAAC,OAAO,EAKlD,CAAC,sCAAsC,CAAC;CAAG;AAE9C,MAAM,CAAC,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CACpD,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IACnB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,gBAAgB,CAAC;IACxC,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;AACvD,CAAC,CAAC,CACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signInGate.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/signInGate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAQ,MAAM,QAAQ,CAAC;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAGzD,MAAM,WAAW,YAAY,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK;IACjD,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,oBAAoB,EAAE,CAAC,GAAG,SAAS,CAAC;IAC/E,QAAQ,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAC;IACtD,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,oBAAoB,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;CAC9F;AAED,MAAM,WAAW,aAAa;IAC7B,QAAQ,CAAC,OAAO,EAAE;QACjB,QAAQ,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE;YAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;gBAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;gBAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;aAAE,CAAC,CAAA;SAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;KAClJ,CAAC;IACF,QAAQ,CAAC,eAAe,EAAE;QACzB,QAAQ,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/D,QAAQ,CAAC,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,oBAAoB,EAAE,CAAC,CAAC;QACpF,QAAQ,CAAC,SAAS,EAAE,CACnB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE;YAAE,QAAQ,CAAC,SAAS,EAAE,KAAK,GAAG,MAAM,CAAC;YAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;SAAE,KAClE,OAAO,CAAC,SAAS;YAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC,CAAC;KACjD,CAAC;CACF;AAED,MAAM,WAAW,UAAU,CAAC,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,CAAC,UAAU,EAAE,SAAS,oBAAoB,EAAE,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;IACjH,QAAQ,CAAC,UAAU,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,GAAG,MAAM,CAAC,WAAW,GAAG,eAAe,CAAC,CAAC;CAClI;AAID,wBAAgB,WAAW,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,4CAEpD;AAMD,eAAO,MAAM,UAAU,GAAgC,CAAC,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"signInGate.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/signInGate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAQ,MAAM,QAAQ,CAAC;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAGzD,MAAM,WAAW,YAAY,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK;IACjD,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,oBAAoB,EAAE,CAAC,GAAG,SAAS,CAAC;IAC/E,QAAQ,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAC;IACtD,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,oBAAoB,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;CAC9F;AAED,MAAM,WAAW,aAAa;IAC7B,QAAQ,CAAC,OAAO,EAAE;QACjB,QAAQ,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE;YAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;gBAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;gBAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;aAAE,CAAC,CAAA;SAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;KAClJ,CAAC;IACF,QAAQ,CAAC,eAAe,EAAE;QACzB,QAAQ,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/D,QAAQ,CAAC,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,oBAAoB,EAAE,CAAC,CAAC;QACpF,QAAQ,CAAC,SAAS,EAAE,CACnB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE;YAAE,QAAQ,CAAC,SAAS,EAAE,KAAK,GAAG,MAAM,CAAC;YAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;SAAE,KAClE,OAAO,CAAC,SAAS;YAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC,CAAC;KACjD,CAAC;CACF;AAED,MAAM,WAAW,UAAU,CAAC,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,CAAC,UAAU,EAAE,SAAS,oBAAoB,EAAE,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;IACjH,QAAQ,CAAC,UAAU,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,GAAG,MAAM,CAAC,WAAW,GAAG,eAAe,CAAC,CAAC;CAClI;AAID,wBAAgB,WAAW,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,4CAEpD;AAMD,eAAO,MAAM,UAAU,GAAgC,CAAC,EAAE,CAAC,uEA4BzD,CAAC"}
|
|
@@ -16,6 +16,7 @@ export const signInGate = Effect.fnUntraced(function* (policy) {
|
|
|
16
16
|
capacity: RULE_CACHE_CAPACITY,
|
|
17
17
|
timeToLive: (exit) => (Exit.isSuccess(exit) ? recheckInterval : Duration.zero),
|
|
18
18
|
});
|
|
19
|
+
const checkRule = Duration.isZero(recheckInterval) ? Cache.refresh : Cache.get;
|
|
19
20
|
const admits = Effect.fnUntraced(function* (candidates) {
|
|
20
21
|
const allowed = accounts === undefined ? undefined : yield* accounts;
|
|
21
22
|
const listed = allowed === undefined ? candidates : candidates.filter((candidate) => allowed.some((entry) => sameAccount(entry, candidate)));
|
|
@@ -23,7 +24,7 @@ export const signInGate = Effect.fnUntraced(function* (policy) {
|
|
|
23
24
|
return listed.length > 0;
|
|
24
25
|
}
|
|
25
26
|
for (const { accountId, providerId } of listed) {
|
|
26
|
-
if (yield*
|
|
27
|
+
if (yield* checkRule(verdicts, { accountId, providerId })) {
|
|
27
28
|
return true;
|
|
28
29
|
}
|
|
29
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signInGate.js","sourceRoot":"","sources":["../../../src/server/better-auth/signInGate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAe,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAGpE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AA6B7D,MAAM,mBAAmB,GAAG,MAAM,CAAC;AAEnC,MAAM,UAAU,WAAW,CAAI,IAAsB;IACpD,OAAO,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAC5F,CAAC;AAED,SAAS,WAAW,CAAC,IAA0B,EAAE,KAA2B;IAC3E,OAAO,IAAI,CAAC,UAAU,KAAK,KAAK,CAAC,UAAU,IAAI,IAAI,CAAC,SAAS,KAAK,KAAK,CAAC,SAAS,CAAC;AACnF,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAQ,MAA0B;IACtF,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAClC,MAAM,eAAe,GAAG,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,eAAe,IAAI,WAAW,CAAC,CAAC;IACxF,MAAM,QAAQ,GACb,IAAI,KAAK,SAAS;QACjB,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE;YAC5B,QAAQ,EAAE,mBAAmB;YAC7B,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;SAC9E,CAAC,CAAC;IACN,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,UAA2C;QACtF,MAAM,OAAO,GAAG,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC;QACrE,MAAM,MAAM,GAAG,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;QAC7I,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC5B,OAAO,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;QAC1B,CAAC;QACD,KAAK,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,MAAM,EAAE,CAAC;YAChD,IAAI,KAAK,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"signInGate.js","sourceRoot":"","sources":["../../../src/server/better-auth/signInGate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { DateTime, Effect, Schema } from "effect";
|
|
2
2
|
import { SqlClient, SqlSchema } from "effect/sql";
|
|
3
|
-
import { migrateBetterAuth } from "
|
|
3
|
+
import { migrateBetterAuth } from "#server/better-auth/adapters/migrate.ts";
|
|
4
4
|
const StoredSession = Schema.Struct({ expiresAt: Schema.DateTimeUtcFromDate, id: Schema.String });
|
|
5
5
|
export const authTestDatabase = Effect.gen(function* () {
|
|
6
6
|
const sql = (yield* SqlClient.SqlClient).withoutTransforms();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testDatabase.js","sourceRoot":"","sources":["../../../src/server/better-auth/testDatabase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"testDatabase.js","sourceRoot":"","sources":["../../../src/server/better-auth/testDatabase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAE5E,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,mBAAmB,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;AAElG,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IACnD,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,iBAAiB,EAAE,CAAC;IAC7D,MAAM,YAAY,GAAG,SAAS,CAAC,OAAO,CAAC;QACtC,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,CAAA,0DAA0D,MAAM,cAAc;QACtG,OAAO,EAAE,MAAM,CAAC,MAAM;QACtB,MAAM,EAAE,aAAa;KACrB,CAAC,CAAC;IACH,OAAO;QACN,cAAc,EAAE,CAAC,MAAe,EAAE,EAAE,CACnC,GAAG,CAAA,kEAAkE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA,oBAAoB,MAAM,EAAE,EAAE,CAAC,IAAI,CACnJ,MAAM,CAAC,MAAM,CACb;QACF,OAAO,EAAE,iBAAiB;QAC1B,eAAe,EAAE,GAAG,CAAA,sCAAsC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAC9E,QAAQ,EAAE,CAAC,MAAc,EAAE,EAAE,CAC5B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACnB,KAAK,CAAC,CAAC,GAAG,CAAA,oDAAoD,CAAC;YAC/D,KAAK,CAAC,CAAC,GAAG,CAAA,4CAA4C,MAAM,EAAE,CAAC;QAChE,CAAC,CAAC;QACH,UAAU,EAAE,GAAG,CAA4D;;0HAE6C;QACxH,kBAAkB,EAAE,GAAG,CAA8B,4DAA4D;QACjH,QAAQ,EAAE,GAAG,CAIX,6GAA6G;QAC/G,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,MAAc;YACvD,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YAC7C,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;YAChC,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QACvI,CAAC,CAAC;QACF,SAAS,EAAE,GAAG,CAAwC,+CAA+C;QACrG,KAAK,EAAE,GAAG,CAA+B,6CAA6C;KACtF,CAAC;AACH,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { Context, Effect, Option } from "effect";
|
|
2
|
+
import { type AuthUnavailable, type Forbidden, Unauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
3
|
+
import type { SessionShape } from "./session.ts";
|
|
4
|
+
export declare const currentSessionContext: <TSession extends SessionShape, R>(id: string, lookup: Effect.Effect<Option.Option<TSession>, AuthUnavailable | Forbidden, R>) => Effect.Effect<Context.Context<never>, AuthUnavailable | Forbidden | Unauthorized, R>;
|
|
5
|
+
//# sourceMappingURL=currentSessionContext.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"currentSessionContext.d.ts","sourceRoot":"","sources":["../../src/server/currentSessionContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AACzD,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,SAAS,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAGnG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD,eAAO,MAAM,qBAAqB,GAAgC,QAAQ,SAAS,YAAY,EAAE,CAAC,qLAgBhG,CAAC"}
|