@shivaedev/identity 0.38.3 → 0.39.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 +14 -0
- package/README.md +62 -43
- package/dist/generated/AccountPreferences.d.ts.map +1 -1
- package/dist/generated/AccountPreferences.js +3 -8
- package/dist/generated/AccountPreferences.js.map +1 -1
- package/dist/generated/Sessions.d.ts.map +1 -1
- package/dist/generated/Sessions.js +3 -7
- package/dist/generated/Sessions.js.map +1 -1
- package/dist/server/NativeOrigins.d.ts +5 -0
- package/dist/server/NativeOrigins.d.ts.map +1 -0
- package/dist/server/NativeOrigins.js +16 -0
- package/dist/server/NativeOrigins.js.map +1 -0
- package/dist/server/SessionPolicy.d.ts +2 -0
- package/dist/server/SessionPolicy.d.ts.map +1 -1
- package/dist/server/SessionPolicy.js.map +1 -1
- package/dist/server/adapters/local.d.ts +1 -1
- package/dist/server/adapters/local.d.ts.map +1 -1
- package/dist/server/adapters/local.js +3 -4
- package/dist/server/adapters/local.js.map +1 -1
- package/dist/server/better-auth/adapters/admittedSessions.d.ts +1 -2
- package/dist/server/better-auth/adapters/admittedSessions.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/admittedSessions.js +3 -3
- package/dist/server/better-auth/adapters/admittedSessions.js.map +1 -1
- package/dist/server/better-auth/adapters/bearerSessions.d.ts +1 -3
- package/dist/server/better-auth/adapters/bearerSessions.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/bearerSessions.js +6 -0
- package/dist/server/better-auth/adapters/bearerSessions.js.map +1 -1
- package/dist/server/better-auth/adapters/response.d.ts +1 -2
- package/dist/server/better-auth/adapters/response.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/response.js +2 -2
- package/dist/server/better-auth/adapters/response.js.map +1 -1
- package/dist/server/better-auth/define.d.ts +4 -0
- package/dist/server/better-auth/define.d.ts.map +1 -1
- package/dist/server/better-auth/define.js.map +1 -1
- package/dist/server/better-auth/mount.d.ts +4 -5
- package/dist/server/better-auth/mount.d.ts.map +1 -1
- package/dist/server/better-auth/mount.js +8 -5
- package/dist/server/better-auth/mount.js.map +1 -1
- package/dist/server/localOwner.d.ts +3 -1
- package/dist/server/localOwner.d.ts.map +1 -1
- package/dist/server/localOwner.js +3 -0
- package/dist/server/localOwner.js.map +1 -1
- package/dist/server/lookupSession.d.ts.map +1 -1
- package/dist/server/lookupSession.js +2 -1
- package/dist/server/lookupSession.js.map +1 -1
- package/package.json +8 -8
- package/src/generated/AccountPreferences.ts +3 -8
- package/src/generated/Sessions.ts +3 -7
- package/src/server/NativeOrigins.ts +23 -0
- package/src/server/SessionPolicy.ts +2 -0
- package/src/server/adapters/local.ts +2 -4
- package/src/server/better-auth/adapters/admittedSessions.ts +4 -4
- package/src/server/better-auth/adapters/bearerSessions.ts +10 -4
- package/src/server/better-auth/adapters/response.ts +4 -4
- package/src/server/better-auth/define.ts +10 -5
- package/src/server/better-auth/mount.ts +8 -6
- package/src/server/localOwner.ts +4 -0
- package/src/server/lookupSession.ts +2 -1
|
@@ -10,13 +10,13 @@ function replacesSession(request, reply, native, basePath) {
|
|
|
10
10
|
&& new URL(request.url).pathname.startsWith(`${basePath}/sign-in/`));
|
|
11
11
|
}
|
|
12
12
|
async function providerResponse(auth, web, options) {
|
|
13
|
-
if (options.
|
|
13
|
+
if (options.nativeOrigins === undefined) {
|
|
14
14
|
return auth.handler(web);
|
|
15
15
|
}
|
|
16
16
|
const { authCookies } = await auth.$context;
|
|
17
17
|
const cookieName = authCookies.sessionToken.name;
|
|
18
18
|
const headers = sessionHeaders(web.headers, cookieName);
|
|
19
|
-
const native = options.
|
|
19
|
+
const native = options.nativeOrigins.includes(web.headers.get("origin") ?? "") && !hasSessionCookie(web.headers, cookieName);
|
|
20
20
|
const request = new Request(web, { headers });
|
|
21
21
|
const reply = await auth.handler(request);
|
|
22
22
|
const basePath = options.basePath ?? "/api/auth";
|
|
@@ -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;AAC5C,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AAErD,OAAO,
|
|
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;AAC5C,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AAErD,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,gDAAgD,CAAC;AAEzH,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAe/E,SAAS,eAAe,CAAC,OAAgB,EAAE,KAAe,EAAE,MAAe,EAAE,QAAgB;IAC5F,OAAO,CACN,MAAM;WACH,KAAK,CAAC,EAAE;WACR,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;WACnC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;WACpC,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,QAAQ,WAAW,CAAC,CACnE,CAAC;AACH,CAAC;AACD,KAAK,UAAU,gBAAgB,CAAC,IAAiB,EAAE,GAAY,EAAE,OAA0B;IAC1F,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;QACzC,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IACD,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC;IAC5C,MAAM,UAAU,GAAG,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC;IACjD,MAAM,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IACxD,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAC7H,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;IAC9C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1C,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,WAAW,CAAC;IACjD,IAAI,eAAe,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC;QACvD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,IAAI,GAAG,CAAC,GAAG,QAAQ,WAAW,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QACnI,MAAM,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;QAC7B,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAC/C,CAAC;IACF,CAAC;IACD,OAAO,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;AACtD,CAAC;AACD,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,IAAiB,EAAE,GAAY,EAAE,OAA0B;IAC/G,MAAM,cAAc,GAAG,OAAO,CAAC,KAAK,KAAK,SAAS,IAAI,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,KAAK,GAAG,OAAO,CAAC,QAAQ,IAAI,WAAW,cAAc,CAAC;IACrI,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC7B,IAAI,cAAc,EAAE,CAAC;QACpB,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;IACpD,CAAC;IACD,MAAM,OAAO,GAAG,cAAc,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAC7D,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU,CAAC;IAC3D,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,gBAAgB,CAAC,IAAI,EAAE,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAClH,MAAM,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CACpD,MAAM,CAAC,OAAO,CAAW,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAC3G,CACD,CAAC;IACF,OAAO,cAAc,IAAI,KAAK,CAAC,EAAE,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,kBAAkB,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AAC5H,CAAC,CAAC,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { BetterAuthOptions } from "better-auth";
|
|
2
2
|
import type { AccessPolicy, RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
3
3
|
export type AuthDeclaration<TOptions extends BetterAuthOptions = BetterAuthOptions> = {
|
|
4
|
+
readonly nativeOrigins?: readonly string[] | undefined;
|
|
4
5
|
readonly options: TOptions;
|
|
5
6
|
} & ({
|
|
6
7
|
readonly defaultRole?: undefined;
|
|
@@ -11,6 +12,7 @@ export type AuthDeclaration<TOptions extends BetterAuthOptions = BetterAuthOptio
|
|
|
11
12
|
});
|
|
12
13
|
export interface RoleAuthDeclaration<TRole extends string, TOptions extends BetterAuthOptions = BetterAuthOptions> {
|
|
13
14
|
readonly defaultRole: TRole;
|
|
15
|
+
readonly nativeOrigins?: readonly string[] | undefined;
|
|
14
16
|
readonly options: TOptions;
|
|
15
17
|
readonly roles: AccessPolicy<TRole>;
|
|
16
18
|
}
|
|
@@ -27,10 +29,12 @@ export interface RoleTables<TRole extends string> {
|
|
|
27
29
|
}
|
|
28
30
|
export declare function defineAuth<const TOptions extends BetterAuthOptions, TRole extends string>(declaration: {
|
|
29
31
|
readonly defaultRole: NoInfer<TRole>;
|
|
32
|
+
readonly nativeOrigins?: readonly string[] | undefined;
|
|
30
33
|
readonly options: TOptions;
|
|
31
34
|
readonly roles: AccessPolicy<TRole>;
|
|
32
35
|
}): RoleAuthDeclaration<TRole, TOptions>;
|
|
33
36
|
export declare function defineAuth<const TOptions extends BetterAuthOptions>(declaration: {
|
|
37
|
+
readonly nativeOrigins?: readonly string[] | undefined;
|
|
34
38
|
readonly options: TOptions;
|
|
35
39
|
}): AuthDeclaration<TOptions>;
|
|
36
40
|
//# sourceMappingURL=define.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"define.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/define.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAE1E,MAAM,MAAM,eAAe,CAAC,QAAQ,SAAS,iBAAiB,GAAG,iBAAiB,IAAI;
|
|
1
|
+
{"version":3,"file":"define.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/define.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAE1E,MAAM,MAAM,eAAe,CAAC,QAAQ,SAAS,iBAAiB,GAAG,iBAAiB,IAAI;IACrF,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IACvD,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC;CAC3B,GAAG,CAAC;IAAE,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,CAAA;CAAE,GAAG;IAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC;AAEnI,MAAM,WAAW,mBAAmB,CAAC,KAAK,SAAS,MAAM,EAAE,QAAQ,SAAS,iBAAiB,GAAG,iBAAiB;IAChH,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC;IAC5B,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IACvD,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,qBAAqB;IACrC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1C,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;CACtD;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,qBAAqB;;cAErD;AAED,MAAM,WAAW,UAAU,CAAC,KAAK,SAAS,MAAM;IAC/C,QAAQ,CAAC,OAAO,CAAC,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACjD,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,eAAe,CAAC,CAAC;CACpE;AAED,wBAAgB,UAAU,CAAC,KAAK,CAAC,QAAQ,SAAS,iBAAiB,EAAE,KAAK,SAAS,MAAM,EAAE,WAAW,EAAE;IACvG,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IACrC,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IACvD,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC;CACpC,GAAG,mBAAmB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;AACzC,wBAAgB,UAAU,CAAC,KAAK,CAAC,QAAQ,SAAS,iBAAiB,EAAE,WAAW,EAAE;IACjF,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IACvD,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC;CAC3B,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"define.js","sourceRoot":"","sources":["../../../src/server/better-auth/define.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"define.js","sourceRoot":"","sources":["../../../src/server/better-auth/define.ts"],"names":[],"mappings":"AAoBA,MAAM,UAAU,UAAU,CAAC,IAA2B;IACrD,OAAO,IAAI,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC;AACvF,CAAC;AAiBD,MAAM,UAAU,UAAU,CAAC,WAA4B;IACtD,OAAO,WAAW,CAAC;AACpB,CAAC"}
|
|
@@ -3,7 +3,6 @@ import { Effect, Layer, type Scope } from "effect";
|
|
|
3
3
|
import type { SqlClient } from "effect/sql";
|
|
4
4
|
import type { Store } from "@shivaedev/rate-limit/Store.ts";
|
|
5
5
|
import type { AccountRoleSeed } from "#server/better-auth/adapters/accountRoleSeed.ts";
|
|
6
|
-
import { type BearerSessionsOptions } from "#server/better-auth/adapters/bearerSessions.ts";
|
|
7
6
|
import { type BetterAuthHardeningOptions } from "#server/better-auth/adapters/hardening.ts";
|
|
8
7
|
import { type SignInPolicy } from "#server/better-auth/adapters/signInGate.ts";
|
|
9
8
|
import type { BetterAuthDatabaseHooks } from "#server/better-auth/databaseHooks.ts";
|
|
@@ -13,7 +12,6 @@ import type { BetterAuthPasswordReset } from "#server/better-auth/PasswordReset.
|
|
|
13
12
|
import { UndeclaredDefaultRole } from "#server/better-auth/UndeclaredDefaultRole.ts";
|
|
14
13
|
export interface BetterAuthMountOptions<E = never, R = never> {
|
|
15
14
|
readonly accountPreferences?: boolean;
|
|
16
|
-
readonly bearerSessions?: BearerSessionsOptions | undefined;
|
|
17
15
|
readonly clientIp?: "railway";
|
|
18
16
|
readonly databaseHooks?: BetterAuthDatabaseHooks<R> | undefined;
|
|
19
17
|
readonly emails?: BetterAuthEmails<R> | undefined;
|
|
@@ -74,7 +72,6 @@ declare const mountAuth: <const TOptions extends BetterAuthOptions, E = never, R
|
|
|
74
72
|
protocol: "http";
|
|
75
73
|
} | import("better-auth").BaseURLConfig;
|
|
76
74
|
secret: string;
|
|
77
|
-
trustedOrigins: string[] | ((request?: Request | undefined) => import("better-auth").Awaitable<(string | undefined | null)[]>);
|
|
78
75
|
databaseHooks: {
|
|
79
76
|
user?: {
|
|
80
77
|
create?: {
|
|
@@ -241,6 +238,7 @@ declare const mountAuth: <const TOptions extends BetterAuthOptions, E = never, R
|
|
|
241
238
|
customStorage: import("better-auth").BetterAuthRateLimitStorage;
|
|
242
239
|
enabled: boolean;
|
|
243
240
|
};
|
|
241
|
+
trustedOrigins: NonNullable<string[] | ((request?: Request | undefined) => import("better-auth").Awaitable<(string | undefined | null)[]>) | undefined>;
|
|
244
242
|
user: (import("better-auth").BetterAuthDBOptions<"user", "createdAt" | "email" | "emailVerified" | "id" | "image" | "name" | "updatedAt"> & {
|
|
245
243
|
validateUserInfo?: (data: {
|
|
246
244
|
user: Partial<import("better-auth").User> & Record<string, unknown>;
|
|
@@ -309,8 +307,9 @@ declare const mountAuth: <const TOptions extends BetterAuthOptions, E = never, R
|
|
|
309
307
|
revokeUnadmitted: Effect.Effect<import("#server/better-auth/adapters/revokeUnadmitted.ts").RevokedSessions, E | import("@shivaedev/errors/taxonomy.ts").AuthUnavailable | import("effect/Config").ConfigError, never>;
|
|
310
308
|
routes: Layer.Layer<never, never, import("effect/http/HttpRouter").HttpRouter | import("effect/http/HttpRouter").Request<"Error", import("effect/http/HttpServerError").InternalError> | import("effect/http/HttpRouter").Request<"Error", import("effect/http/HttpServerError").RequestParseError> | import("effect/http/HttpRouter").Request<"Error", import("effect/http/HttpServerError").RouteNotFound>>;
|
|
311
309
|
sessions: {
|
|
312
|
-
|
|
313
|
-
|
|
310
|
+
roles?: import("@shivaedev/access/roleSet.ts").RoleSet;
|
|
311
|
+
provider: import("../session.ts").SessionProvider<import("../session.ts").UserSessionShape>;
|
|
312
|
+
nativeOrigins: (readonly string[] & import("effect/Brand").Brand<"NativeOrigins">) | undefined;
|
|
314
313
|
};
|
|
315
314
|
}, E | import("@shivaedev/errors/taxonomy.ts").AuthUnavailable | import("effect/Config").ConfigError | UndeclaredDefaultRole | import("@shivaedev/sql/repositoryCollection.ts").RepositoryBuildError, R | import("effect/reactivity/Reactivity").Reactivity | Scope.Scope | SqlClient.SqlClient | Store>;
|
|
316
315
|
type Mounted<TOptions extends BetterAuthOptions, E, R> = ReturnType<typeof mountAuth<TOptions, E, R>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mount.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/mount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,KAAK,EAAE,MAAM,QAAQ,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AAG5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iDAAiD,CAAC;
|
|
1
|
+
{"version":3,"file":"mount.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/mount.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { accountPreferencesStore } from "#server/account-preferences/store.ts";
|
|
|
3
3
|
import { accountPreferenceOptions } from "#server/better-auth/adapters/accountPreferenceOptions.ts";
|
|
4
4
|
import { acquireAuth } from "#server/better-auth/adapters/acquire.ts";
|
|
5
5
|
import { admittedSessions } from "#server/better-auth/adapters/admittedSessions.ts";
|
|
6
|
-
import { withBearerSessions } from "#server/better-auth/adapters/bearerSessions.ts";
|
|
6
|
+
import { nativeTrustedOrigins, withBearerSessions } from "#server/better-auth/adapters/bearerSessions.ts";
|
|
7
7
|
import { betterAuthDatabase } from "#server/better-auth/adapters/database.ts";
|
|
8
8
|
import { effectHookOptions } from "#server/better-auth/adapters/effectHookOptions.ts";
|
|
9
9
|
import { emailOptions } from "#server/better-auth/adapters/emailOptions.ts";
|
|
@@ -24,12 +24,14 @@ import { mountSettings } from "#server/better-auth/mountSettings.ts";
|
|
|
24
24
|
import { authRouteHandler } from "#server/better-auth/routeHandler.ts";
|
|
25
25
|
import { storedRoleOptions } from "#server/better-auth/storedRoleOptions.ts";
|
|
26
26
|
import { UndeclaredDefaultRole } from "#server/better-auth/UndeclaredDefaultRole.ts";
|
|
27
|
+
import { declaredNativeOrigins } from "#server/NativeOrigins.ts";
|
|
27
28
|
import { providerFailure } from "#server/providerFailure.ts";
|
|
28
29
|
const mountAuth = Effect.fn("Identity.mountAuth")(function* (declaration, mount = {}) {
|
|
29
30
|
if (declaration.roles !== undefined) {
|
|
30
31
|
const { defaultRole } = declaration;
|
|
31
32
|
yield* declaration.roles.resolve(defaultRole).pipe(Effect.mapError(() => new UndeclaredDefaultRole({ role: defaultRole })));
|
|
32
33
|
}
|
|
34
|
+
const nativeOrigins = yield* declaredNativeOrigins(declaration.nativeOrigins);
|
|
33
35
|
const options = declaration.options.database === undefined ? { ...declaration.options, database: yield* betterAuthDatabase() } : declaration.options;
|
|
34
36
|
const { authOptions, clientIpHeader, rateLimitEnabled, trustedProxy } = yield* mountSettings(options, mount.clientIp);
|
|
35
37
|
const policy = mount.signIn ?? {};
|
|
@@ -53,28 +55,29 @@ const mountAuth = Effect.fn("Identity.mountAuth")(function* (declaration, mount
|
|
|
53
55
|
const basePath = prefix === "/" ? "" : prefix;
|
|
54
56
|
const customStorage = yield* rateLimitStorage;
|
|
55
57
|
const { auth, profiles } = yield* acquireAuth({
|
|
56
|
-
...withHardening(withBearerSessions(preset,
|
|
58
|
+
...withHardening(withBearerSessions(preset, nativeOrigins !== undefined), mount.hardening),
|
|
57
59
|
...authOptions,
|
|
58
60
|
rateLimit: {
|
|
59
61
|
...rateLimit,
|
|
60
62
|
customStorage,
|
|
61
63
|
enabled: rateLimitEnabled,
|
|
62
64
|
},
|
|
65
|
+
trustedOrigins: nativeTrustedOrigins(authOptions.trustedOrigins, nativeOrigins),
|
|
63
66
|
user: gate.active ? gated.user : configured.user,
|
|
64
67
|
});
|
|
65
68
|
const authRoutes = mountRoutes.pipe(Layer.provide(Layer.succeed(AuthRouteHandler, {
|
|
66
69
|
basePath,
|
|
67
70
|
handle: authRouteHandler(auth, {
|
|
68
71
|
basePath,
|
|
69
|
-
bearerSessions: mount.bearerSessions,
|
|
70
72
|
clientIpHeader,
|
|
71
73
|
ipv6Subnet: options.advanced?.ipAddress?.ipv6Subnet,
|
|
74
|
+
nativeOrigins,
|
|
72
75
|
roles: declaration.roles,
|
|
73
76
|
runRequest: runtime.runRequest,
|
|
74
77
|
trustedProxy,
|
|
75
78
|
}),
|
|
76
79
|
})));
|
|
77
|
-
const admit = admittedSessions(gate, () => auth.$context,
|
|
80
|
+
const admit = admittedSessions(gate, () => auth.$context, nativeOrigins !== undefined);
|
|
78
81
|
const admission = yield* signInGate({ ...policy, recheckInterval: 0 });
|
|
79
82
|
const admitsUser = Effect.fn("Identity.admitsUser")(function* (userId) {
|
|
80
83
|
if (!admission.active) {
|
|
@@ -85,7 +88,7 @@ const mountAuth = Effect.fn("Identity.mountAuth")(function* (declaration, mount
|
|
|
85
88
|
});
|
|
86
89
|
const revoke = revokeUnadmitted(gate, () => auth.$context);
|
|
87
90
|
const lookupSession = Reflect.get(auth.api, "getSession");
|
|
88
|
-
const sessions = mountedSessions(lookupSession, admit, declaration.roles);
|
|
91
|
+
const sessions = { ...mountedSessions(lookupSession, admit, declaration.roles), nativeOrigins };
|
|
89
92
|
return { admitsUser, admittedSessions: admit, auth, profiles, revokeUnadmitted: revoke, routes: authRoutes, sessions };
|
|
90
93
|
});
|
|
91
94
|
export function betterAuthMount(auth, mount = {}) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mount.js","sourceRoot":"","sources":["../../../src/server/better-auth/mount.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAc,MAAM,QAAQ,CAAC;AAGnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,EAAE,wBAAwB,EAAE,MAAM,0DAA0D,CAAC;AAEpG,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kDAAkD,CAAC;AACpF,OAAO,
|
|
1
|
+
{"version":3,"file":"mount.js","sourceRoot":"","sources":["../../../src/server/better-auth/mount.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { SecureRandom } from "effect/crypto";
|
|
|
3
3
|
import type { RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
4
4
|
import type { SessionUserValue } from "#identity.ts";
|
|
5
5
|
export declare const localOwner: (options: {
|
|
6
|
+
readonly nativeOrigins?: readonly string[] | undefined;
|
|
6
7
|
readonly owner: Pick<SessionUserValue, "id" | "name" | "email"> & {
|
|
7
8
|
readonly role: string;
|
|
8
9
|
};
|
|
@@ -55,11 +56,12 @@ export declare const localOwner: (options: {
|
|
|
55
56
|
revoke: (id: string) => Effect.Effect<void, import("effect/Schema").SchemaError | import("effect/sql/SqlError").SqlError, never>;
|
|
56
57
|
};
|
|
57
58
|
sessions: {
|
|
59
|
+
readonly nativeOrigins?: import("#server/NativeOrigins.ts").NativeOrigins | undefined;
|
|
58
60
|
readonly origin: import("./origin.ts").OriginPolicy;
|
|
59
61
|
readonly provider: import("./session.ts").SessionProvider<import("./session.ts").SessionShape>;
|
|
60
62
|
readonly roles?: RoleSet;
|
|
61
63
|
readonly streamRevalidationInterval?: Duration.Input | undefined;
|
|
62
64
|
};
|
|
63
65
|
token: Redacted.Redacted<string>;
|
|
64
|
-
}, import("effect/Schema").SchemaError | import("@shivaedev/sql/repositoryCollection.ts").RepositoryBuildError, import("effect/crypto/Digest").Digest | SecureRandom.SecureRandom | import("effect/sql/SqlClient").SqlClient>;
|
|
66
|
+
}, import("effect/Config").ConfigError | import("effect/Schema").SchemaError | import("@shivaedev/sql/repositoryCollection.ts").RepositoryBuildError, import("effect/crypto/Digest").Digest | SecureRandom.SecureRandom | import("effect/sql/SqlClient").SqlClient>;
|
|
65
67
|
//# sourceMappingURL=localOwner.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localOwner.d.ts","sourceRoot":"","sources":["../../src/server/localOwner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"localOwner.d.ts","sourceRoot":"","sources":["../../src/server/localOwner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAMrD,eAAO,MAAM,UAAU;6BACG,SAAS,MAAM,EAAE,GAAG,SAAS;oBACtC,IAAI,CAAC,gBAAgB,EAAE,IAAI,GAAG,MAAM,GAAG,OAAO,CAAC,GAAG;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE;oBAC3E,OAAO;0CACe,QAAQ,CAAC,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mQAwBnD,CAAC"}
|
|
@@ -3,14 +3,17 @@ import { SecureRandom } from "effect/crypto";
|
|
|
3
3
|
import * as Hex from "effect/encoding/Hex";
|
|
4
4
|
import { localTransport } from "#server/adapters/local.ts";
|
|
5
5
|
import { machineTokens } from "#server/machineTokens.ts";
|
|
6
|
+
import { declaredNativeOrigins } from "#server/NativeOrigins.ts";
|
|
6
7
|
export const localOwner = Effect.fn("Identity.localOwner")(function* (options) {
|
|
7
8
|
const { owner, roles } = options;
|
|
9
|
+
const nativeOrigins = yield* declaredNativeOrigins(options.nativeOrigins);
|
|
8
10
|
const access = yield* roles.resolve(owner.role);
|
|
9
11
|
const random = yield* SecureRandom.SecureRandom;
|
|
10
12
|
const token = Redacted.make(Hex.encode(yield* random.randomBytes(32)));
|
|
11
13
|
const machines = yield* machineTokens({ owner, roles });
|
|
12
14
|
const allowed = localTransport();
|
|
13
15
|
const sessions = {
|
|
16
|
+
nativeOrigins,
|
|
14
17
|
origin: (request) => allowed({ headers: request.headers, remoteAddress: request.remoteAddress ?? Option.none() }),
|
|
15
18
|
provider: {
|
|
16
19
|
get: (headers) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localOwner.js","sourceRoot":"","sources":["../../src/server/localOwner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAG3C,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"localOwner.js","sourceRoot":"","sources":["../../src/server/localOwner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAG3C,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAGjE,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,EAAE,CAAC,qBAAqB,CAAC,CAAC,QAAQ,CAAC,EAAE,OAKrE;IACA,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IACjC,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAC1E,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAChD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,YAAY,CAAC;IAChD,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACvE,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;IACxD,MAAM,OAAO,GAAG,cAAc,EAAE,CAAC;IACjC,MAAM,QAAQ,GAA6B;QAC1C,aAAa;QACb,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,aAAa,IAAI,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;QACjH,QAAQ,EAAE;YACT,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE;gBAChB,MAAM,MAAM,GAAG,0BAA0B,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC;gBAC3F,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;oBAC1B,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;gBACtC,CAAC;gBACD,OAAO,MAAM,KAAK,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,GAAG,KAAK,EAAE,GAAG,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACrI,CAAC;SACD;QACD,0BAA0B,EAAE,OAAO,CAAC,0BAA0B;KAC9D,CAAC;IACF,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;AACtC,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lookupSession.d.ts","sourceRoot":"","sources":["../../src/server/lookupSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAG1D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,eAAO,MAAM,cAAc,+
|
|
1
|
+
{"version":3,"file":"lookupSession.d.ts","sourceRoot":"","sources":["../../src/server/lookupSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAG1D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,eAAO,MAAM,cAAc,+HAYzB,CAAC;AAEH,eAAO,MAAM,aAAa,GAAgC,QAAQ,SAAS,YAAY,6HAQrF,CAAC;AAEH,eAAO,MAAM,aAAa,wLAGxB,CAAC"}
|
|
@@ -6,7 +6,8 @@ import { SessionPolicy } from "#server/SessionPolicy.ts";
|
|
|
6
6
|
export const sessionRequest = Effect.fnUntraced(function* (headers, rpc) {
|
|
7
7
|
const policy = yield* SessionPolicy;
|
|
8
8
|
const request = yield* transportOriginRequest(headers, rpc);
|
|
9
|
-
|
|
9
|
+
const native = Option.exists(request.origin, (origin) => policy.nativeOrigins?.includes(origin) === true);
|
|
10
|
+
if (!(native || policy.origin(request))) {
|
|
10
11
|
const refused = Option.match(request.origin, { onNone: () => "a request without an Origin header", onSome: (origin) => `origin ${origin}` });
|
|
11
12
|
yield* Effect.logWarning(`The session policy refused ${refused} calling ${rpc}. Add the origin to the policy's trusted origins if the application is served from it.`);
|
|
12
13
|
return yield* new Forbidden({ message: "Open this application from its own address to continue." });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lookupSession.js","sourceRoot":"","sources":["../../src/server/lookupSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGzD,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,OAAwB,EAAE,GAAW;IAC/F,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC;IACpC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,sBAAsB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAC5D,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"lookupSession.js","sourceRoot":"","sources":["../../src/server/lookupSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGzD,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,OAAwB,EAAE,GAAW;IAC/F,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC;IACpC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,sBAAsB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAC5D,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,EAAE,QAAQ,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC;IAC1G,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;QACzC,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,oCAAoC,EAAE,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,UAAU,MAAM,EAAE,EAAE,CAAC,CAAC;QAC7I,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CACvB,8BAA8B,OAAO,YAAY,GAAG,wFAAwF,CAC5I,CAAC;QACF,OAAO,KAAK,CAAC,CAAC,IAAI,SAAS,CAAC,EAAE,OAAO,EAAE,yDAAyD,EAAE,CAAC,CAAC;IACrG,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAiC,OAAgC;IACxH,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC;IACpC,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAC1D,OAAO,OAAO,CAAC;IAChB,CAAC;IACD,MAAM,IAAI,GAAY,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC9D,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACtD,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,MAAM,EAAE,EAAE,CAAC,CAAC;AACtF,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,OAAwB;IACjF,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC;IACpC,OAAO,KAAK,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;AAClE,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/identity",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.39.0",
|
|
4
4
|
"description": "Request identity, sessions, transport trust and permission enforcement for Effect RPC servers",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"effect"
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"dependencies": {
|
|
49
49
|
"@shivaedev/access": "0.7.0",
|
|
50
50
|
"@shivaedev/changes": "0.14.1",
|
|
51
|
-
"@shivaedev/contract": "0.
|
|
51
|
+
"@shivaedev/contract": "0.58.0",
|
|
52
52
|
"@shivaedev/errors": "0.14.1",
|
|
53
53
|
"@shivaedev/rate-limit": "0.8.0",
|
|
54
54
|
"@shivaedev/service": "0.9.2",
|
|
@@ -58,13 +58,13 @@
|
|
|
58
58
|
"@better-auth/oauth-provider": "1.7.23",
|
|
59
59
|
"@effect/platform-node": "4.1.4",
|
|
60
60
|
"@effect/sql-pg": "4.1.4",
|
|
61
|
-
"@shivaedev/admin": "0.29.
|
|
62
|
-
"@shivaedev/build": "0.
|
|
63
|
-
"@shivaedev/quality": "0.83.
|
|
64
|
-
"@shivaedev/server": "0.
|
|
65
|
-
"@shivaedev/test-kits": "0.16.
|
|
61
|
+
"@shivaedev/admin": "0.29.1",
|
|
62
|
+
"@shivaedev/build": "0.7.0",
|
|
63
|
+
"@shivaedev/quality": "0.83.3",
|
|
64
|
+
"@shivaedev/server": "0.42.0",
|
|
65
|
+
"@shivaedev/test-kits": "0.16.4",
|
|
66
66
|
"@shivaedev/test-sql": "0.26.0",
|
|
67
|
-
"@shivaedev/test-story": "0.52.
|
|
67
|
+
"@shivaedev/test-story": "0.52.4",
|
|
68
68
|
"@types/node": "24.19.2",
|
|
69
69
|
"better-auth": "1.7.23",
|
|
70
70
|
"effect": "4.1.4",
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Generated by @shivaedev/build from src/AccountPreferences.ts. Do not edit or commit this file; run `pnpm generate` to write it again.
|
|
2
2
|
import type { AccountPreferences as AccountPreferencesModule } from "#AccountPreferences.ts";
|
|
3
|
-
import { AccountPreferenceValues
|
|
3
|
+
import { AccountPreferenceValues } from "#accountPreferenceValues.ts";
|
|
4
4
|
import { selfSubject } from "#subject.ts";
|
|
5
5
|
import { clientContract } from "@shivaedev/contract/clientContract.ts";
|
|
6
6
|
import type { ClientMatchesModule } from "@shivaedev/contract/clientMatchesModule.ts";
|
|
@@ -14,18 +14,13 @@ export const identityAccountPreferencesWire = {
|
|
|
14
14
|
} as const;
|
|
15
15
|
|
|
16
16
|
export const AccountPreferences = clientContract({
|
|
17
|
-
commands:
|
|
18
|
-
capture: { invalidates: () => [accountPreferenceKeys.list] },
|
|
19
|
-
set: { invalidates: () => [accountPreferenceKeys.list] },
|
|
20
|
-
},
|
|
17
|
+
commands: ["capture", "set"],
|
|
21
18
|
name: "identity.accountPreferences",
|
|
22
19
|
payloads: {
|
|
23
20
|
capture: AccountPreferenceValues.fields,
|
|
24
21
|
set: AccountPreferenceValues.fields,
|
|
25
22
|
},
|
|
26
|
-
queries:
|
|
27
|
-
get: { reads: () => [accountPreferenceKeys.list] },
|
|
28
|
-
},
|
|
23
|
+
queries: ["get"],
|
|
29
24
|
subject: selfSubject,
|
|
30
25
|
wire: identityAccountPreferencesWire,
|
|
31
26
|
});
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// Generated by @shivaedev/build from src/Sessions.ts. Do not edit or commit this file; run `pnpm generate` to write it again.
|
|
2
2
|
import type { Sessions as SessionsModule } from "#Sessions.ts";
|
|
3
3
|
import { SessionsPermission } from "#sessionPermissions.ts";
|
|
4
|
-
import { SessionListInput
|
|
4
|
+
import { SessionListInput } from "#signedInSessions.ts";
|
|
5
5
|
import { clientContract } from "@shivaedev/contract/clientContract.ts";
|
|
6
6
|
import type { ClientMatchesModule } from "@shivaedev/contract/clientMatchesModule.ts";
|
|
7
7
|
import { AuthUnavailable, Forbidden, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
@@ -13,18 +13,14 @@ export const identitySessionsWire = {
|
|
|
13
13
|
} as const;
|
|
14
14
|
|
|
15
15
|
export const Sessions = clientContract({
|
|
16
|
-
commands:
|
|
17
|
-
revoke: { invalidates: () => [sessionKeys.list] },
|
|
18
|
-
},
|
|
16
|
+
commands: ["revoke"],
|
|
19
17
|
middleware: SessionsPermission,
|
|
20
18
|
name: "identity.sessions",
|
|
21
19
|
payloads: {
|
|
22
20
|
list: SessionListInput.fields,
|
|
23
21
|
revoke: { id: Schema.String },
|
|
24
22
|
},
|
|
25
|
-
queries:
|
|
26
|
-
list: { reads: () => [sessionKeys.list] },
|
|
27
|
-
},
|
|
23
|
+
queries: ["list"],
|
|
28
24
|
wire: identitySessionsWire,
|
|
29
25
|
});
|
|
30
26
|
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { Config, Effect, Schema } from "effect";
|
|
2
|
+
|
|
3
|
+
export const NativeOrigins = Schema.Array(
|
|
4
|
+
Schema.String.check(
|
|
5
|
+
Schema.makeFilter((origin) => {
|
|
6
|
+
if (!URL.canParse(origin)) {
|
|
7
|
+
return false;
|
|
8
|
+
}
|
|
9
|
+
const url = new URL(origin);
|
|
10
|
+
const authority = url.origin === "null" ? `${url.protocol}//${url.host}` : url.origin;
|
|
11
|
+
return url.host !== "" && !origin.includes("*") && authority === origin;
|
|
12
|
+
}),
|
|
13
|
+
),
|
|
14
|
+
).pipe(Schema.brand("NativeOrigins"));
|
|
15
|
+
|
|
16
|
+
export type NativeOrigins = typeof NativeOrigins.Type;
|
|
17
|
+
|
|
18
|
+
export const declaredNativeOrigins = Effect.fnUntraced(function* (origins: readonly string[] | undefined) {
|
|
19
|
+
if (origins === undefined) {
|
|
20
|
+
return undefined;
|
|
21
|
+
}
|
|
22
|
+
return yield* Schema.decodeUnknownEffect(NativeOrigins)(origins).pipe(Effect.mapError((cause) => new Config.ConfigError(cause)));
|
|
23
|
+
});
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import { Context, type Duration } from "effect";
|
|
2
2
|
import type { RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
3
|
+
import type { NativeOrigins } from "#server/NativeOrigins.ts";
|
|
3
4
|
import type { OriginPolicy } from "#server/origin.ts";
|
|
4
5
|
import type { SessionProvider, SessionShape } from "#server/session.ts";
|
|
5
6
|
|
|
6
7
|
export class SessionPolicy extends Context.Service<
|
|
7
8
|
SessionPolicy,
|
|
8
9
|
{
|
|
10
|
+
readonly nativeOrigins?: NativeOrigins | undefined;
|
|
9
11
|
readonly origin: OriginPolicy;
|
|
10
12
|
readonly provider: SessionProvider<SessionShape>;
|
|
11
13
|
readonly roles?: RoleSet;
|
|
@@ -75,12 +75,10 @@ export function localTransport(trustedProxy?: string, nativeOrigins: readonly st
|
|
|
75
75
|
export const localRpcGuard = Effect.fnUntraced(function* <E, R>(
|
|
76
76
|
effect: Effect.Effect<HttpServerResponse.HttpServerResponse, E, R>,
|
|
77
77
|
trustedProxy?: string,
|
|
78
|
-
nativeOrigins: readonly string[] = [],
|
|
79
78
|
) {
|
|
80
79
|
const request = yield* HttpServerRequest.HttpServerRequest;
|
|
81
|
-
const policy = yield* Effect.serviceOption(SessionPolicy);
|
|
82
|
-
const
|
|
83
|
-
const allowed = localTransport(trustedProxy, [...nativeOrigins, ...origins]);
|
|
80
|
+
const policy = Option.getOrUndefined(yield* Effect.serviceOption(SessionPolicy));
|
|
81
|
+
const allowed = localTransport(trustedProxy, [...(policy?.nativeOrigins ?? []), ...(policy?.origin.trustedOrigins ?? [])]);
|
|
84
82
|
const serialization = yield* RpcSerialization.RpcSerialization;
|
|
85
83
|
const contentType = request.headers["content-type"]?.split(";")[0]?.trim().toLowerCase();
|
|
86
84
|
const legacyNdjson = serialization.contentType === RpcSerialization.ndjson.contentType && contentType === "application/ndjson";
|
|
@@ -6,7 +6,7 @@ import {
|
|
|
6
6
|
type GetSession,
|
|
7
7
|
type SessionWithProviderAccounts,
|
|
8
8
|
} from "#server/adapters/betterAuthSessions.ts";
|
|
9
|
-
import {
|
|
9
|
+
import { sessionHeaders } from "#server/better-auth/adapters/bearerSessions.ts";
|
|
10
10
|
import { fromStorage, type PolicyStorage, type SignInGate } from "#server/better-auth/adapters/signInGate.ts";
|
|
11
11
|
import { providerFailure } from "#server/providerFailure.ts";
|
|
12
12
|
import type { SessionProvider, SessionShape } from "#server/session.ts";
|
|
@@ -15,7 +15,7 @@ interface SessionStorage extends PolicyStorage {
|
|
|
15
15
|
readonly authCookies: { readonly sessionToken: { readonly name: string } };
|
|
16
16
|
}
|
|
17
17
|
|
|
18
|
-
export function admittedSessions<E>(gate: SignInGate<E>, storage: () => Promise<SessionStorage>, bearerSessions
|
|
18
|
+
export function admittedSessions<E>(gate: SignInGate<E>, storage: () => Promise<SessionStorage>, bearerSessions = false) {
|
|
19
19
|
function admit<TSession extends SessionShape>(getSession: GetSession<TSession>): SessionProvider<TSession>;
|
|
20
20
|
function admit<TSession extends SessionShape>(
|
|
21
21
|
getSession: GetSession<TSession>,
|
|
@@ -25,9 +25,9 @@ export function admittedSessions<E>(gate: SignInGate<E>, storage: () => Promise<
|
|
|
25
25
|
const provider = getProviderAccounts === undefined ? betterAuthSessions(getSession) : betterAuthSessions(getSession, getProviderAccounts);
|
|
26
26
|
return {
|
|
27
27
|
get: Effect.fnUntraced(function* (headers) {
|
|
28
|
-
const auth = gate.active || bearerSessions
|
|
28
|
+
const auth = gate.active || bearerSessions ? yield* fromStorage(storage) : undefined;
|
|
29
29
|
const selected =
|
|
30
|
-
bearerSessions
|
|
30
|
+
!bearerSessions || auth === undefined
|
|
31
31
|
? headers
|
|
32
32
|
: HttpHeaders.fromInput(sessionHeaders(new Headers(headers), auth.authCookies.sessionToken.name));
|
|
33
33
|
const session = yield* provider.get(selected);
|
|
@@ -2,14 +2,20 @@ import type { BetterAuthOptions } from "better-auth";
|
|
|
2
2
|
import { bearer } from "better-auth/plugins/bearer";
|
|
3
3
|
import { Result } from "effect";
|
|
4
4
|
|
|
5
|
-
export interface BearerSessionsOptions {
|
|
6
|
-
readonly origins: readonly string[];
|
|
7
|
-
}
|
|
8
|
-
|
|
9
5
|
export function withBearerSessions<TOptions extends BetterAuthOptions>(options: TOptions, enabled: boolean): TOptions {
|
|
10
6
|
return enabled ? { ...options, plugins: [...(options.plugins ?? []), bearer({ requireSignature: true })] } : options;
|
|
11
7
|
}
|
|
12
8
|
|
|
9
|
+
export function nativeTrustedOrigins(
|
|
10
|
+
trusted: NonNullable<BetterAuthOptions["trustedOrigins"]>,
|
|
11
|
+
nativeOrigins: readonly string[] = [],
|
|
12
|
+
): NonNullable<BetterAuthOptions["trustedOrigins"]> {
|
|
13
|
+
if (nativeOrigins.length === 0) {
|
|
14
|
+
return trusted;
|
|
15
|
+
}
|
|
16
|
+
return typeof trusted === "function" ? async (request) => [...(await trusted(request)), ...nativeOrigins] : [...trusted, ...nativeOrigins];
|
|
17
|
+
}
|
|
18
|
+
|
|
13
19
|
export function hasSessionCookie(headers: Headers, cookieName: string): boolean {
|
|
14
20
|
return (
|
|
15
21
|
headers
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { type Cause, Effect } from "effect";
|
|
2
2
|
import * as HttpStatus from "effect/http/HttpStatus";
|
|
3
3
|
import type { RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
4
|
-
import {
|
|
4
|
+
import { cookieSessionResponse, hasSessionCookie, sessionHeaders } from "#server/better-auth/adapters/bearerSessions.ts";
|
|
5
5
|
import type { HookRefusal } from "#server/better-auth/adapters/hookRuntime.ts";
|
|
6
6
|
import { sessionPermissions } from "#server/better-auth/sessionPermissions.ts";
|
|
7
7
|
|
|
@@ -11,9 +11,9 @@ export interface MountedAuth {
|
|
|
11
11
|
}
|
|
12
12
|
export interface MountRouteOptions {
|
|
13
13
|
readonly basePath?: string | undefined;
|
|
14
|
-
readonly bearerSessions?: BearerSessionsOptions | undefined;
|
|
15
14
|
readonly clientIpHeader: string;
|
|
16
15
|
readonly ipv6Subnet?: number | undefined;
|
|
16
|
+
readonly nativeOrigins?: readonly string[] | undefined;
|
|
17
17
|
readonly roles?: RoleSet | undefined;
|
|
18
18
|
readonly runRequest?: (<A>(request: (signal: AbortSignal) => Promise<A>) => Effect.Effect<A, Cause.UnknownError | HookRefusal>) | undefined;
|
|
19
19
|
readonly trustedProxy?: string | undefined;
|
|
@@ -28,13 +28,13 @@ function replacesSession(request: Request, reply: Response, native: boolean, bas
|
|
|
28
28
|
);
|
|
29
29
|
}
|
|
30
30
|
async function providerResponse(auth: MountedAuth, web: Request, options: MountRouteOptions) {
|
|
31
|
-
if (options.
|
|
31
|
+
if (options.nativeOrigins === undefined) {
|
|
32
32
|
return auth.handler(web);
|
|
33
33
|
}
|
|
34
34
|
const { authCookies } = await auth.$context;
|
|
35
35
|
const cookieName = authCookies.sessionToken.name;
|
|
36
36
|
const headers = sessionHeaders(web.headers, cookieName);
|
|
37
|
-
const native = options.
|
|
37
|
+
const native = options.nativeOrigins.includes(web.headers.get("origin") ?? "") && !hasSessionCookie(web.headers, cookieName);
|
|
38
38
|
const request = new Request(web, { headers });
|
|
39
39
|
const reply = await auth.handler(request);
|
|
40
40
|
const basePath = options.basePath ?? "/api/auth";
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import type { BetterAuthOptions } from "better-auth";
|
|
2
2
|
import type { AccessPolicy, RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
3
3
|
|
|
4
|
-
export type AuthDeclaration<TOptions extends BetterAuthOptions = BetterAuthOptions> = {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
);
|
|
4
|
+
export type AuthDeclaration<TOptions extends BetterAuthOptions = BetterAuthOptions> = {
|
|
5
|
+
readonly nativeOrigins?: readonly string[] | undefined;
|
|
6
|
+
readonly options: TOptions;
|
|
7
|
+
} & ({ readonly defaultRole?: undefined; readonly roles?: undefined } | { readonly defaultRole: string; readonly roles: RoleSet });
|
|
8
8
|
|
|
9
9
|
export interface RoleAuthDeclaration<TRole extends string, TOptions extends BetterAuthOptions = BetterAuthOptions> {
|
|
10
10
|
readonly defaultRole: TRole;
|
|
11
|
+
readonly nativeOrigins?: readonly string[] | undefined;
|
|
11
12
|
readonly options: TOptions;
|
|
12
13
|
readonly roles: AccessPolicy<TRole>;
|
|
13
14
|
}
|
|
@@ -28,10 +29,14 @@ export interface RoleTables<TRole extends string> {
|
|
|
28
29
|
|
|
29
30
|
export function defineAuth<const TOptions extends BetterAuthOptions, TRole extends string>(declaration: {
|
|
30
31
|
readonly defaultRole: NoInfer<TRole>;
|
|
32
|
+
readonly nativeOrigins?: readonly string[] | undefined;
|
|
31
33
|
readonly options: TOptions;
|
|
32
34
|
readonly roles: AccessPolicy<TRole>;
|
|
33
35
|
}): RoleAuthDeclaration<TRole, TOptions>;
|
|
34
|
-
export function defineAuth<const TOptions extends BetterAuthOptions>(declaration: {
|
|
36
|
+
export function defineAuth<const TOptions extends BetterAuthOptions>(declaration: {
|
|
37
|
+
readonly nativeOrigins?: readonly string[] | undefined;
|
|
38
|
+
readonly options: TOptions;
|
|
39
|
+
}): AuthDeclaration<TOptions>;
|
|
35
40
|
export function defineAuth(declaration: AuthDeclaration) {
|
|
36
41
|
return declaration;
|
|
37
42
|
}
|