@shivaedev/identity 0.18.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 +19 -0
- package/README.md +45 -20
- 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 +1 -1
- package/dist/server/better-auth/accountRoleSeed.d.ts.map +1 -1
- package/dist/server/better-auth/accountRoleSeed.js +1 -1
- 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} +1 -1
- package/dist/server/better-auth/adapters/columnDrift.js.map +1 -0
- 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} +1 -1
- 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} +12 -12
- package/dist/server/better-auth/adapters/mount.d.ts.map +1 -0
- package/dist/server/better-auth/{mount.js → adapters/mount.js} +21 -18
- 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.js +1 -1
- package/dist/server/better-auth/adapters/storedRoleOptions.js.map +1 -1
- package/dist/server/better-auth/adapters/tables.d.ts.map +1 -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 +1 -1
- package/dist/server/better-auth/assignRole.d.ts.map +1 -1
- package/dist/server/better-auth/assignRole.js +1 -1
- 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/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/sessions.d.ts +1 -1
- package/package.json +16 -10
- 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 +1 -1
- 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} +1 -1
- package/src/server/better-auth/{migrate.ts → adapters/migrate.ts} +1 -1
- package/src/server/better-auth/{migrationPlan.ts → adapters/migrationPlan.ts} +1 -1
- package/src/server/better-auth/{migrations → adapters/migrations}/generate.ts +1 -1
- package/src/server/better-auth/{mount.ts → adapters/mount.ts} +29 -23
- 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 +1 -1
- package/src/server/better-auth/admittedSessions.ts +1 -1
- package/src/server/better-auth/assignRole.ts +1 -1
- package/src/server/better-auth/mountRoutes.ts +15 -35
- 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/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/better-auth/tables.d.ts.map +0 -1
- package/dist/server/better-auth/tables.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/dist/server/better-auth/{tables.d.ts → adapters/tables.d.ts} +0 -0
- /package/dist/server/better-auth/{tables.js → adapters/tables.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
- /package/src/server/better-auth/{tables.ts → adapters/tables.ts} +0 -0
|
@@ -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,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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { Context, Effect, Option, Schema } from "effect";
|
|
2
|
+
import { Unauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
3
|
+
import { SessionUser, SessionUserSchema, SessionUserWithProviderAccounts } from "#identity.ts";
|
|
4
|
+
import { providerAccountsUser } from "./providerAccountsUser.js";
|
|
5
|
+
export const currentSessionContext = Effect.fnUntraced(function* (id, lookup) {
|
|
6
|
+
const session = yield* lookup;
|
|
7
|
+
if (Option.isNone(session) || session.value.user.id !== id) {
|
|
8
|
+
return yield* new Unauthorized({ message: "Authentication required" });
|
|
9
|
+
}
|
|
10
|
+
let context = yield* Effect.context();
|
|
11
|
+
if (Option.isSome(Context.getOption(context, SessionUser))) {
|
|
12
|
+
context = Context.add(context, SessionUser, Schema.decodeUnknownSync(SessionUserSchema)(session.value.user));
|
|
13
|
+
}
|
|
14
|
+
if (Option.isSome(Context.getOption(context, SessionUserWithProviderAccounts))) {
|
|
15
|
+
context = Context.add(context, SessionUserWithProviderAccounts, yield* providerAccountsUser(session.value.user));
|
|
16
|
+
}
|
|
17
|
+
return context;
|
|
18
|
+
});
|
|
19
|
+
//# sourceMappingURL=currentSessionContext.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"currentSessionContext.js","sourceRoot":"","sources":["../../src/server/currentSessionContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACzD,OAAO,EAAwC,YAAY,EAAE,MAAM,+BAA+B,CAAC;AACnG,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,+BAA+B,EAAE,MAAM,cAAc,CAAC;AAC/F,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAGjE,MAAM,CAAC,MAAM,qBAAqB,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAC/D,EAAU,EACV,MAA8E;IAE9E,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC;IAC9B,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;QAC5D,OAAO,KAAK,CAAC,CAAC,IAAI,YAAY,CAAC,EAAE,OAAO,EAAE,yBAAyB,EAAE,CAAC,CAAC;IACxE,CAAC;IACD,IAAI,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAAS,CAAC;IAC7C,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC;QAC5D,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9G,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,+BAA+B,CAAC,CAAC,EAAE,CAAC;QAChF,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,+BAA+B,EAAE,KAAK,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IAClH,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { Context, type Effect, type Option, Schema } from "effect";
|
|
2
|
+
import type { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
3
|
+
import type { SessionUserValue } from "#identity.ts";
|
|
4
|
+
export declare const OauthGrant: Schema.Struct<{
|
|
5
|
+
readonly clientId: Schema.String;
|
|
6
|
+
readonly scopes: Schema.$Array<Schema.String>;
|
|
7
|
+
}>;
|
|
8
|
+
export type OauthGrant = typeof OauthGrant.Type;
|
|
9
|
+
declare const OauthGrants_base: Context.ServiceClass<OauthGrants, "@shivaedev/identity/OauthGrants", {
|
|
10
|
+
readonly list: (userId: string, page: {
|
|
11
|
+
readonly limit: number;
|
|
12
|
+
readonly offset?: number;
|
|
13
|
+
}) => Effect.Effect<readonly OauthGrant[], AuthUnavailable>;
|
|
14
|
+
readonly revokeClient: (userId: string, clientId: string) => Effect.Effect<void, AuthUnavailable>;
|
|
15
|
+
readonly revokeAllClients: (userId: string) => Effect.Effect<void, AuthUnavailable>;
|
|
16
|
+
readonly resolveSubject: (userId: string, clientId: string) => Effect.Effect<Option.Option<SessionUserValue>, AuthUnavailable>;
|
|
17
|
+
}>;
|
|
18
|
+
export declare class OauthGrants extends OauthGrants_base {
|
|
19
|
+
}
|
|
20
|
+
export {};
|
|
21
|
+
//# sourceMappingURL=oauthGrants.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauthGrants.d.ts","sourceRoot":"","sources":["../../src/server/oauthGrants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAErD,eAAO,MAAM,UAAU;;;EAAkF,CAAC;AAC1G,MAAM,MAAM,UAAU,GAAG,OAAO,UAAU,CAAC,IAAI,CAAC;;mBAK/B,CACd,MAAM,EAAE,MAAM,EACd,IAAI,EAAE;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,KACtD,MAAM,CAAC,MAAM,CAAC,SAAS,UAAU,EAAE,EAAE,eAAe,CAAC;2BACnC,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,eAAe,CAAC;+BACtE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,eAAe,CAAC;6BAC1D,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,eAAe,CAAC;;AAThI,qBAAa,WAAY,SAAQ,gBAWK;CAAG"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { Context, Schema } from "effect";
|
|
2
|
+
export const OauthGrant = Schema.Struct({ clientId: Schema.String, scopes: Schema.Array(Schema.String) });
|
|
3
|
+
export class OauthGrants extends Context.Service()("@shivaedev/identity/OauthGrants") {
|
|
4
|
+
}
|
|
5
|
+
//# sourceMappingURL=oauthGrants.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauthGrants.js","sourceRoot":"","sources":["../../src/server/oauthGrants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAA4B,MAAM,EAAE,MAAM,QAAQ,CAAC;AAInE,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAG1G,MAAM,OAAO,WAAY,SAAQ,OAAO,CAAC,OAAO,EAW7C,CAAC,iCAAiC,CAAC;CAAG"}
|
package/dist/server/origin.d.ts
CHANGED
|
@@ -14,7 +14,6 @@ export interface TrustedOriginsOptions {
|
|
|
14
14
|
readonly trustedProxy?: string | undefined;
|
|
15
15
|
};
|
|
16
16
|
}
|
|
17
|
-
export declare function trustedOrigins(options: TrustedOriginsOptions): OriginPolicy;
|
|
18
17
|
export declare function originRequest(headers: Headers.Headers, rpc: string, remoteAddress?: Option.Option<string>): OriginRequest;
|
|
19
18
|
export declare const transportOriginRequest: (headers: Headers.Headers, rpc: string) => Effect.Effect<OriginRequest, never, never>;
|
|
20
19
|
//# sourceMappingURL=origin.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"origin.d.ts","sourceRoot":"","sources":["../../src/server/origin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,OAAO,EAAqB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"origin.d.ts","sourceRoot":"","sources":["../../src/server/origin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,OAAO,EAAqB,MAAM,aAAa,CAAC;AAEzD,MAAM,WAAW,aAAa;IAC7B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACvC,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC/C,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;CACrB;AACD,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC;AAC/D,MAAM,WAAW,qBAAqB;IACrC,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,QAAQ,CAAC;IACrC,QAAQ,CAAC,UAAU,CAAC,EAAE;QAAE,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;CACrE;AACD,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,aAAa,GAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAiB,GAAG,aAAa,CAOxI;AAED,eAAO,MAAM,sBAAsB,uFAQjC,CAAC"}
|
package/dist/server/origin.js
CHANGED
|
@@ -1,14 +1,6 @@
|
|
|
1
1
|
import { Effect, Option } from "effect";
|
|
2
2
|
import { Headers, HttpServerRequest } from "effect/http";
|
|
3
|
-
import { localTransport } from "#server/local.ts";
|
|
4
3
|
import { transportHeaders } from "#server/transportHeaders.ts";
|
|
5
|
-
export function trustedOrigins(options) {
|
|
6
|
-
const sameOrigin = options.sameOrigin === undefined ? undefined : localTransport(options.sameOrigin.trustedProxy);
|
|
7
|
-
return (request) => Option.match(request.origin, {
|
|
8
|
-
onNone: () => options.missing === "allow",
|
|
9
|
-
onSome: (value) => options.allow.includes(value) || sameOrigin?.({ headers: request.headers, remoteAddress: request.remoteAddress ?? Option.none() }) === true,
|
|
10
|
-
});
|
|
11
|
-
}
|
|
12
4
|
export function originRequest(headers, rpc, remoteAddress = Option.none()) {
|
|
13
5
|
return {
|
|
14
6
|
headers,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"origin.js","sourceRoot":"","sources":["../../src/server/origin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"origin.js","sourceRoot":"","sources":["../../src/server/origin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAa/D,MAAM,UAAU,aAAa,CAAC,OAAwB,EAAE,GAAW,EAAE,aAAa,GAA0B,MAAM,CAAC,IAAI,EAAE;IACxH,OAAO;QACN,OAAO;QACP,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC;QACtC,aAAa;QACb,GAAG;KACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAG,MAAM,CAAC,EAAE,CAAC,iCAAiC,CAAC,CAAC,QAAQ,CAAC,EAAE,OAAwB,EAAE,GAAW;IAClI,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IACjF,OAAO,aAAa,CACnB,SAAS,EACT,GAAG,EACH,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,CACvD,CAAC;AACH,CAAC,CAAC,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { Effect, Option } from "effect";
|
|
1
|
+
import { Effect, type Option } from "effect";
|
|
2
2
|
import { type Rpc } from "effect/rpc";
|
|
3
|
-
import {
|
|
3
|
+
import type { AuthUnavailable, Forbidden } from "@shivaedev/errors/taxonomy.ts";
|
|
4
4
|
import { SessionPolicy } from "./SessionPolicy.ts";
|
|
5
5
|
import type { SessionShape } from "./session.ts";
|
|
6
|
-
export declare function revalidateStream<TSession extends SessionShape, TLookupRequirements>(rpc: Rpc.AnyWithProps, id: string, lookup: Effect.Effect<Option.Option<TSession>, AuthUnavailable | Forbidden, TLookupRequirements>): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E | AuthUnavailable | Forbidden | Unauthorized, R | TLookupRequirements | SessionPolicy>;
|
|
6
|
+
export declare function revalidateStream<TSession extends SessionShape, TLookupRequirements>(rpc: Rpc.AnyWithProps, id: string, lookup: Effect.Effect<Option.Option<TSession>, AuthUnavailable | Forbidden, TLookupRequirements>): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E | AuthUnavailable | Forbidden | import("@shivaedev/errors/taxonomy.ts").Unauthorized, R | TLookupRequirements | SessionPolicy>;
|
|
7
7
|
//# sourceMappingURL=revalidateStream.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"revalidateStream.d.ts","sourceRoot":"","sources":["../../src/server/revalidateStream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"revalidateStream.d.ts","sourceRoot":"","sources":["../../src/server/revalidateStream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC7C,OAAO,EAAE,KAAK,GAAG,EAAa,MAAM,YAAY,CAAC;AACjD,OAAO,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAEhF,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAGjD,wBAAgB,gBAAgB,CAAC,QAAQ,SAAS,YAAY,EAAE,mBAAmB,EAClF,GAAG,EAAE,GAAG,CAAC,YAAY,EACrB,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,eAAe,GAAG,SAAS,EAAE,mBAAmB,CAAC,IAExF,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,uJAS/C"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Effect
|
|
1
|
+
import { Effect } from "effect";
|
|
2
2
|
import { RpcSchema } from "effect/rpc";
|
|
3
|
-
import {
|
|
3
|
+
import { currentSessionContext } from "./currentSessionContext.js";
|
|
4
4
|
import { SessionPolicy } from "./SessionPolicy.js";
|
|
5
5
|
import { revalidateSession } from "./socketSession.js";
|
|
6
6
|
export function revalidateStream(rpc, id, lookup) {
|
|
@@ -8,12 +8,7 @@ export function revalidateStream(rpc, id, lookup) {
|
|
|
8
8
|
if (!RpcSchema.isStreamSchema(rpc.successSchema)) {
|
|
9
9
|
return effect;
|
|
10
10
|
}
|
|
11
|
-
const check = Effect.
|
|
12
|
-
const session = yield* lookup;
|
|
13
|
-
if (Option.isNone(session) || session.value.user.id !== id) {
|
|
14
|
-
return yield* new Unauthorized({ message: "Authentication required" });
|
|
15
|
-
}
|
|
16
|
-
});
|
|
11
|
+
const check = Effect.asVoid(currentSessionContext(id, lookup));
|
|
17
12
|
return Effect.flatMap(SessionPolicy, (policy) => Effect.raceFirst(effect, revalidateSession(check, policy.streamRevalidationInterval ?? "30 seconds")));
|
|
18
13
|
};
|
|
19
14
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"revalidateStream.js","sourceRoot":"","sources":["../../src/server/revalidateStream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"revalidateStream.js","sourceRoot":"","sources":["../../src/server/revalidateStream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAe,MAAM,QAAQ,CAAC;AAC7C,OAAO,EAAY,SAAS,EAAE,MAAM,YAAY,CAAC;AAEjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,MAAM,UAAU,gBAAgB,CAC/B,GAAqB,EACrB,EAAU,EACV,MAAgG;IAEhG,OAAO,CAAU,MAA8B,EAAE,EAAE;QAClD,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;YAClD,OAAO,MAAM,CAAC;QACf,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;QAC/D,OAAO,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,CAC/C,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,0BAA0B,IAAI,YAAY,CAAC,CAAC,CACrG,CAAC;IACH,CAAC,CAAC;AACH,CAAC"}
|
package/dist/sessions.d.ts
CHANGED
|
@@ -100,7 +100,7 @@ export declare const Sessions: import("@shivaedev/contract/contract.ts").Contrac
|
|
|
100
100
|
readonly queryIndexes: Schema.optional<Schema.$Array<Schema.Number>>;
|
|
101
101
|
}>, Schema.Struct<{
|
|
102
102
|
readonly _tag: Schema.Literal<"Resync">;
|
|
103
|
-
}>]>, ...never[]]>, Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, typeof import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired, ...Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>[]]>>, Schema.Never, typeof SessionsPermission, never> | import("effect/rpc/Rpc").Rpc<"identity.sessions.list", Schema.Struct<{
|
|
103
|
+
}>]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, ...never[]]>, Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, typeof import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired, ...Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>[]]>>, Schema.Never, typeof SessionsPermission, never> | import("effect/rpc/Rpc").Rpc<"identity.sessions.list", Schema.Struct<{
|
|
104
104
|
readonly cursor: Schema.optionalKey<Schema.Struct<{
|
|
105
105
|
readonly id: Schema.String;
|
|
106
106
|
readonly lastActivityAt: Schema.DateTimeUtcFromString;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/identity",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.19.0",
|
|
4
4
|
"description": "Request identity, sessions, transport trust and permission enforcement for Effect RPC servers",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"effect"
|
|
@@ -46,20 +46,22 @@
|
|
|
46
46
|
],
|
|
47
47
|
"dependencies": {
|
|
48
48
|
"@shivaedev/access": "0.3.6",
|
|
49
|
-
"@shivaedev/changes": "0.
|
|
50
|
-
"@shivaedev/contract": "0.
|
|
49
|
+
"@shivaedev/changes": "0.8.0",
|
|
50
|
+
"@shivaedev/contract": "0.31.0",
|
|
51
51
|
"@shivaedev/errors": "0.5.0",
|
|
52
|
-
"@shivaedev/
|
|
52
|
+
"@shivaedev/rate-limit": "0.2.1",
|
|
53
|
+
"@shivaedev/sql": "0.33.0"
|
|
53
54
|
},
|
|
54
55
|
"devDependencies": {
|
|
56
|
+
"@better-auth/oauth-provider": "1.7.12",
|
|
55
57
|
"@effect/platform-node": "4.0.6",
|
|
56
58
|
"@effect/sql-pg": "4.0.6",
|
|
57
|
-
"@shivaedev/admin": "0.18.
|
|
58
|
-
"@shivaedev/quality": "0.
|
|
59
|
-
"@shivaedev/server": "0.
|
|
60
|
-
"@shivaedev/test": "0.
|
|
61
|
-
"@shivaedev/test-sql": "0.16.
|
|
62
|
-
"@shivaedev/test-story": "0.
|
|
59
|
+
"@shivaedev/admin": "0.18.1",
|
|
60
|
+
"@shivaedev/quality": "0.56.0",
|
|
61
|
+
"@shivaedev/server": "0.19.0",
|
|
62
|
+
"@shivaedev/test": "0.13.0",
|
|
63
|
+
"@shivaedev/test-sql": "0.16.2",
|
|
64
|
+
"@shivaedev/test-story": "0.34.0",
|
|
63
65
|
"@types/node": "24.19.2",
|
|
64
66
|
"better-auth": "1.7.12",
|
|
65
67
|
"effect": "4.0.6",
|
|
@@ -67,10 +69,14 @@
|
|
|
67
69
|
"vitest": "5.0.5"
|
|
68
70
|
},
|
|
69
71
|
"peerDependencies": {
|
|
72
|
+
"@better-auth/oauth-provider": "1.7.12",
|
|
70
73
|
"better-auth": "1.7.12",
|
|
71
74
|
"effect": "4.0.6"
|
|
72
75
|
},
|
|
73
76
|
"peerDependenciesMeta": {
|
|
77
|
+
"@better-auth/oauth-provider": {
|
|
78
|
+
"optional": true
|
|
79
|
+
},
|
|
74
80
|
"better-auth": {
|
|
75
81
|
"optional": true
|
|
76
82
|
}
|
|
@@ -2,7 +2,7 @@ import { Effect, Option } from "effect";
|
|
|
2
2
|
import { HttpServerRequest, HttpServerResponse, HttpTraceContext } from "effect/http";
|
|
3
3
|
import * as HttpStatus from "effect/http/HttpStatus";
|
|
4
4
|
import { RpcSerialization } from "effect/rpc";
|
|
5
|
-
import { proxyAddresses, proxyMatches } from "
|
|
5
|
+
import { proxyAddresses, proxyMatches } from "#server/adapters/trustedProxy.ts";
|
|
6
6
|
|
|
7
7
|
type TransportRequest = Pick<HttpServerRequest.HttpServerRequest, "headers" | "remoteAddress">;
|
|
8
8
|
|
|
@@ -36,14 +36,12 @@ export function sameOrigin(request: Pick<TransportRequest, "headers">): boolean
|
|
|
36
36
|
return false;
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
|
-
export function
|
|
40
|
-
|
|
41
|
-
) {
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
: Effect.succeed(HttpServerResponse.text("Only loopback hosts are served", { status: HttpStatus.fromLiteral("Forbidden") }));
|
|
46
|
-
}
|
|
39
|
+
export const loopbackOnly = Effect.fnUntraced(function* <E, R>(handler: Effect.Effect<HttpServerResponse.HttpServerResponse, E, R>) {
|
|
40
|
+
const request = yield* HttpServerRequest.HttpServerRequest;
|
|
41
|
+
return loopbackHost(request.headers.host) && Option.match(request.remoteAddress, { onNone: () => true, onSome: loopbackAddress })
|
|
42
|
+
? yield* handler
|
|
43
|
+
: HttpServerResponse.text("Only loopback hosts are served", { status: HttpStatus.fromLiteral("Forbidden") });
|
|
44
|
+
});
|
|
47
45
|
export function trustedProxyPeer(trustedProxy?: string): (address: string) => boolean {
|
|
48
46
|
const addresses = trustedProxy === undefined ? undefined : proxyAddresses(trustedProxy);
|
|
49
47
|
return (address) => addresses !== undefined && proxyMatches(addresses, address);
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { Option } from "effect";
|
|
2
|
+
import type { OriginPolicy, TrustedOriginsOptions } from "#server/origin.ts";
|
|
3
|
+
import { localTransport } from "./local.ts";
|
|
4
|
+
|
|
5
|
+
export function trustedOrigins(options: TrustedOriginsOptions): OriginPolicy {
|
|
6
|
+
const sameOrigin = options.sameOrigin === undefined ? undefined : localTransport(options.sameOrigin.trustedProxy);
|
|
7
|
+
return (request) =>
|
|
8
|
+
Option.match(request.origin, {
|
|
9
|
+
onNone: () => options.missing === "allow",
|
|
10
|
+
onSome: (value) =>
|
|
11
|
+
options.allow.includes(value) || sameOrigin?.({ headers: request.headers, remoteAddress: request.remoteAddress ?? Option.none() }) === true,
|
|
12
|
+
});
|
|
13
|
+
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { BlockList, isIP } from "node:net";
|
|
2
2
|
import { Schema } from "effect";
|
|
3
|
-
import { addProxyAddress, proxyRanges } from "
|
|
3
|
+
import { addProxyAddress, proxyRanges } from "#server/adapters/proxyRanges.ts";
|
|
4
4
|
|
|
5
5
|
export function proxyAddresses(value: string): BlockList | undefined {
|
|
6
6
|
const addresses = new BlockList();
|
|
@@ -3,8 +3,8 @@ import { SqlClient, SqlSchema } from "effect/sql";
|
|
|
3
3
|
import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
|
|
4
4
|
import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
5
5
|
import type { ProviderAccountValue } from "#identity.ts";
|
|
6
|
+
import { type AuthTableOptions, tables } from "#server/better-auth/adapters/tables.ts";
|
|
6
7
|
import { assignRole } from "./assignRole.ts";
|
|
7
|
-
import { type AuthTableOptions, tables } from "./tables.ts";
|
|
8
8
|
|
|
9
9
|
export interface AccountRoleSeed<E> {
|
|
10
10
|
readonly onSignIn: (userId: string) => Effect.Effect<void, E>;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import type { BetterAuthOptions } from "better-auth";
|
|
2
2
|
import { Effect, Schema } from "effect";
|
|
3
|
+
import { authColumnDrift } from "#server/better-auth/adapters/columnDrift.ts";
|
|
4
|
+
import { betterAuthMigrationPlan } from "#server/better-auth/adapters/migrationPlan.ts";
|
|
3
5
|
import { type StoredRoleOptions, storedRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
|
|
4
|
-
import { authColumnDrift } from "./columnDrift.ts";
|
|
5
|
-
import { betterAuthMigrationPlan } from "./migrationPlan.ts";
|
|
6
6
|
|
|
7
7
|
export class BetterAuthSchemaDrift extends Schema.TaggedError<BetterAuthSchemaDrift>()("BetterAuthSchemaDrift", {
|
|
8
8
|
missing: Schema.Array(Schema.String),
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { getIP } from "better-auth/api";
|
|
2
|
-
import { Option } from "effect";
|
|
3
|
-
import
|
|
4
|
-
import { trustedProxyPeer } from "#server/local.ts";
|
|
5
|
-
import { trustedProxyRanges } from "#server/trustedProxyRanges.ts";
|
|
2
|
+
import { Effect, Option } from "effect";
|
|
3
|
+
import { HttpServerRequest } from "effect/http";
|
|
4
|
+
import { trustedProxyPeer } from "#server/adapters/local.ts";
|
|
5
|
+
import { trustedProxyRanges } from "#server/adapters/trustedProxyRanges.ts";
|
|
6
6
|
|
|
7
7
|
export const PEER_IP_HEADER = "x-platform-client-ip";
|
|
8
8
|
|
|
@@ -22,7 +22,8 @@ export function clientIpHeaders(options: {
|
|
|
22
22
|
const resolved = {
|
|
23
23
|
advanced: { ipAddress: { ...advanced.ipAddress, ipAddressHeaders: [PEER_IP_HEADER], trustedProxies: [] } },
|
|
24
24
|
};
|
|
25
|
-
return (
|
|
25
|
+
return Effect.fnUntraced(function* (web: Request) {
|
|
26
|
+
const request = yield* HttpServerRequest.HttpServerRequest;
|
|
26
27
|
web.headers.delete(PEER_IP_HEADER);
|
|
27
28
|
const trusted = Option.exists(request.remoteAddress, trustedPeer);
|
|
28
29
|
const forwardedIp = trusted && web.headers.has(options.clientIpHeader) ? getIP(web, { advanced }) : null;
|
|
@@ -35,5 +36,5 @@ export function clientIpHeaders(options: {
|
|
|
35
36
|
web.headers.set(PEER_IP_HEADER, address);
|
|
36
37
|
}
|
|
37
38
|
return { address: getIP(web, resolved), source: forwardedIp === null ? "peer" : "forwarded" };
|
|
38
|
-
};
|
|
39
|
+
});
|
|
39
40
|
}
|
|
@@ -4,7 +4,7 @@ import { matchType } from "better-auth/db/migration";
|
|
|
4
4
|
import { Effect, Schema } from "effect";
|
|
5
5
|
import { SqlClient } from "effect/sql";
|
|
6
6
|
import type { StoredRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
|
|
7
|
-
import { tables } from "
|
|
7
|
+
import { tables } from "#server/better-auth/adapters/tables.ts";
|
|
8
8
|
|
|
9
9
|
const Column = Schema.Struct({
|
|
10
10
|
column: Schema.String,
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import type { BetterAuthOptions } from "better-auth";
|
|
2
2
|
import { Effect } from "effect";
|
|
3
3
|
import { SqlClient } from "effect/sql";
|
|
4
|
+
import { authMigrationSql, betterAuthMigrationPlan } from "#server/better-auth/adapters/migrationPlan.ts";
|
|
4
5
|
import type { StoredRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
|
|
5
|
-
import { authMigrationSql, betterAuthMigrationPlan } from "./migrationPlan.ts";
|
|
6
6
|
|
|
7
7
|
export const migrateBetterAuth = Effect.fn("Identity.migrateBetterAuth")(function* (
|
|
8
8
|
options: Omit<BetterAuthOptions, "database">,
|
|
@@ -4,7 +4,7 @@ import { Effect } from "effect";
|
|
|
4
4
|
import { SqlClient } from "effect/sql";
|
|
5
5
|
import { betterAuthDatabase } from "#server/better-auth/adapters/database.ts";
|
|
6
6
|
import { type StoredRoleOptions, storedRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
|
|
7
|
-
import { tables } from "
|
|
7
|
+
import { tables } from "#server/better-auth/adapters/tables.ts";
|
|
8
8
|
|
|
9
9
|
export const betterAuthMigrationPlan = Effect.fn("Identity.betterAuthMigrationPlan")(function* (
|
|
10
10
|
options: Omit<BetterAuthOptions, "database">,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { BetterAuthOptions } from "better-auth";
|
|
2
2
|
import { Effect } from "effect";
|
|
3
|
+
import { authMigrationSql, betterAuthMigrationPlan } from "#server/better-auth/adapters/migrationPlan.ts";
|
|
3
4
|
import type { StoredRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
|
|
4
|
-
import { authMigrationSql, betterAuthMigrationPlan } from "#server/better-auth/migrationPlan.ts";
|
|
5
5
|
|
|
6
6
|
export const generateBetterAuthMigration = Effect.fn("Identity.generateBetterAuthMigration")(function* (
|
|
7
7
|
options: Omit<BetterAuthOptions, "database">,
|
|
@@ -1,28 +1,29 @@
|
|
|
1
1
|
import { type BetterAuthOptions, betterAuth } from "better-auth";
|
|
2
|
-
import { Config, Effect, Option, Redacted } from "effect";
|
|
2
|
+
import { Config, Effect, Layer, Option, Redacted } from "effect";
|
|
3
3
|
import type { RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
4
|
+
import type { AccountRoleSeed } from "#server/better-auth/accountRoleSeed.ts";
|
|
5
|
+
import { type BearerSessionsOptions, withBearerSessions } from "#server/better-auth/adapters/bearerSessions.ts";
|
|
6
|
+
import { PEER_IP_HEADER } from "#server/better-auth/adapters/clientIp.ts";
|
|
7
|
+
import { closeRoleEndpoints } from "#server/better-auth/adapters/closeRoleEndpoints.ts";
|
|
4
8
|
import { effectHookOptions } from "#server/better-auth/adapters/effectHookOptions.ts";
|
|
5
9
|
import { emailOptions } from "#server/better-auth/adapters/emailOptions.ts";
|
|
6
10
|
import { type BetterAuthHardeningOptions, withHardening } from "#server/better-auth/adapters/hardening.ts";
|
|
7
11
|
import { hookRuntime } from "#server/better-auth/adapters/hookRuntime.ts";
|
|
12
|
+
import { mountedSessions } from "#server/better-auth/adapters/mountedSessions.ts";
|
|
8
13
|
import { passwordResetOptions } from "#server/better-auth/adapters/passwordResetOptions.ts";
|
|
14
|
+
import { rateLimitStorage } from "#server/better-auth/adapters/rateLimitStorage.ts";
|
|
9
15
|
import { roleSeedOptions } from "#server/better-auth/adapters/roleSeedOptions.ts";
|
|
10
16
|
import { signInPolicyOptions } from "#server/better-auth/adapters/signInPolicyOptions.ts";
|
|
11
17
|
import { type StoredRoleOptions, storedRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
|
|
12
|
-
import {
|
|
13
|
-
import {
|
|
14
|
-
import {
|
|
15
|
-
import { mountRoutes } from "#server/better-auth/mountRoutes.ts";
|
|
18
|
+
import { admittedSessions } from "#server/better-auth/admittedSessions.ts";
|
|
19
|
+
import type { BetterAuthDatabaseHooks } from "#server/better-auth/databaseHooks.ts";
|
|
20
|
+
import type { BetterAuthEmails } from "#server/better-auth/emails.ts";
|
|
21
|
+
import { AuthRouteHandler, mountRoutes } from "#server/better-auth/mountRoutes.ts";
|
|
22
|
+
import type { BetterAuthPasswordReset } from "#server/better-auth/PasswordReset.ts";
|
|
16
23
|
import { revokeUnadmitted } from "#server/better-auth/revokeUnadmitted.ts";
|
|
17
24
|
import { fromStorage, type PolicyStorage, type SignInPolicy, signInGate } from "#server/better-auth/signInGate.ts";
|
|
18
25
|
import { providerFailure } from "#server/providerFailure.ts";
|
|
19
|
-
import
|
|
20
|
-
import { admittedSessions } from "./admittedSessions.ts";
|
|
21
|
-
import { closeRoleEndpoints } from "./closeRoleEndpoints.ts";
|
|
22
|
-
import type { BetterAuthDatabaseHooks } from "./databaseHooks.ts";
|
|
23
|
-
import type { BetterAuthEmails } from "./emails.ts";
|
|
24
|
-
import { mountedSessions } from "./mountedSessions.ts";
|
|
25
|
-
import type { BetterAuthPasswordReset } from "./PasswordReset.ts";
|
|
26
|
+
import { authRouteHandler } from "./routeHandler.ts";
|
|
26
27
|
|
|
27
28
|
export type BetterAuthMountOptions<E = never, R = never> = {
|
|
28
29
|
readonly bearerSessions?: BearerSessionsOptions | undefined;
|
|
@@ -59,8 +60,7 @@ export const betterAuthMount = Effect.fn("Identity.betterAuthMount")(function* <
|
|
|
59
60
|
const seed = mount.roleSeed === undefined ? undefined : yield* mount.roleSeed;
|
|
60
61
|
const seeded = roleSeedOptions(gate.active ? { ...configured, ...gated } : configured, seed);
|
|
61
62
|
const rateLimit = options.rateLimit;
|
|
62
|
-
const customStorage =
|
|
63
|
-
rateLimit?.customStorage ?? (rateLimit?.storage === undefined || rateLimit.storage === "memory" ? yield* memoryRateLimit : undefined);
|
|
63
|
+
const customStorage = yield* rateLimitStorage;
|
|
64
64
|
const auth = betterAuth({
|
|
65
65
|
...withHardening(withBearerSessions(configured, mount.bearerSessions !== undefined), mount.hardening),
|
|
66
66
|
advanced: {
|
|
@@ -81,7 +81,7 @@ export const betterAuthMount = Effect.fn("Identity.betterAuthMount")(function* <
|
|
|
81
81
|
databaseHooks: seeded.databaseHooks,
|
|
82
82
|
rateLimit: {
|
|
83
83
|
...rateLimit,
|
|
84
|
-
|
|
84
|
+
customStorage,
|
|
85
85
|
enabled: rateLimitEnabled,
|
|
86
86
|
},
|
|
87
87
|
secret,
|
|
@@ -89,14 +89,20 @@ export const betterAuthMount = Effect.fn("Identity.betterAuthMount")(function* <
|
|
|
89
89
|
options.trustedOrigins ?? Option.match(origin, { onNone: () => ["http://127.0.0.1:*", "http://localhost:*"], onSome: (url) => [url] }),
|
|
90
90
|
user: gate.active ? gated.user : configured.user,
|
|
91
91
|
});
|
|
92
|
-
const authRoutes = mountRoutes(
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
92
|
+
const authRoutes = mountRoutes.pipe(
|
|
93
|
+
Layer.provide(
|
|
94
|
+
Layer.succeed(AuthRouteHandler, {
|
|
95
|
+
handle: authRouteHandler(auth, {
|
|
96
|
+
bearerSessions: mount.bearerSessions,
|
|
97
|
+
clientIpHeader,
|
|
98
|
+
ipv6Subnet: options.advanced?.ipAddress?.ipv6Subnet,
|
|
99
|
+
roles: mount.roles,
|
|
100
|
+
runRequest: runtime.runRequest,
|
|
101
|
+
trustedProxy,
|
|
102
|
+
}),
|
|
103
|
+
}),
|
|
104
|
+
),
|
|
105
|
+
);
|
|
100
106
|
const admit = admittedSessions(gate, () => auth.$context, mount.bearerSessions);
|
|
101
107
|
const admission = yield* signInGate({ ...policy, recheckInterval: 0 });
|
|
102
108
|
const admitsUser = Effect.fn("Identity.admitsUser")(function* (userId: string) {
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
import type { AuthContext } from "better-auth";
|
|
2
|
+
import { Effect, Layer, Option, Schema } from "effect";
|
|
3
|
+
import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
4
|
+
import { OauthGrant, OauthGrants } from "#server/oauthGrants.ts";
|
|
5
|
+
|
|
6
|
+
export interface OauthGrantAuth {
|
|
7
|
+
readonly $context: Promise<{
|
|
8
|
+
readonly adapter: Pick<AuthContext["adapter"], "findOne" | "findMany"> & {
|
|
9
|
+
readonly transaction: <A>(run: (adapter: Pick<AuthContext["adapter"], "deleteMany">) => Promise<A>) => Promise<A>;
|
|
10
|
+
};
|
|
11
|
+
readonly internalAdapter: Pick<AuthContext["internalAdapter"], "findUserById">;
|
|
12
|
+
}>;
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
function unavailable(cause: unknown) {
|
|
16
|
+
return Object.assign(new AuthUnavailable({ message: "OAuth grant storage failed" }), { cause });
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
export function betterAuthOauthGrants(options: {
|
|
20
|
+
readonly auth: OauthGrantAuth;
|
|
21
|
+
readonly admitsUser: (userId: string) => Effect.Effect<boolean, AuthUnavailable>;
|
|
22
|
+
}) {
|
|
23
|
+
const { auth, admitsUser } = options;
|
|
24
|
+
const revoke = Effect.fn("Identity.revoke")(function* (userId: string, clientId?: string) {
|
|
25
|
+
yield* Effect.tryPromise({
|
|
26
|
+
catch: unavailable,
|
|
27
|
+
try: async () => {
|
|
28
|
+
const { adapter } = await auth.$context;
|
|
29
|
+
const where = [{ field: "userId", value: userId }, ...(clientId === undefined ? [] : [{ field: "clientId", value: clientId }])];
|
|
30
|
+
await adapter.transaction(async (transaction) => {
|
|
31
|
+
for (const model of ["oauthConsent", "oauthAccessToken", "oauthRefreshToken"]) {
|
|
32
|
+
await transaction.deleteMany({ model, where });
|
|
33
|
+
}
|
|
34
|
+
});
|
|
35
|
+
},
|
|
36
|
+
});
|
|
37
|
+
});
|
|
38
|
+
return Layer.succeed(OauthGrants, {
|
|
39
|
+
list: Effect.fn("OauthGrants.list")(function* (userId: string, page: { readonly limit: number; readonly offset?: number }) {
|
|
40
|
+
const consents = yield* Effect.tryPromise({
|
|
41
|
+
catch: unavailable,
|
|
42
|
+
try: async () => {
|
|
43
|
+
const { adapter } = await auth.$context;
|
|
44
|
+
return adapter.findMany({
|
|
45
|
+
...page,
|
|
46
|
+
model: "oauthConsent",
|
|
47
|
+
sortBy: { direction: "asc", field: "id" },
|
|
48
|
+
where: [{ field: "userId", value: userId }],
|
|
49
|
+
});
|
|
50
|
+
},
|
|
51
|
+
});
|
|
52
|
+
return yield* Schema.decodeUnknownEffect(Schema.Array(OauthGrant))(consents).pipe(Effect.mapError(unavailable));
|
|
53
|
+
}),
|
|
54
|
+
resolveSubject: Effect.fn("OauthGrants.resolveSubject")(function* (userId: string, clientId: string) {
|
|
55
|
+
const subject = yield* Effect.tryPromise({
|
|
56
|
+
catch: unavailable,
|
|
57
|
+
try: async () => {
|
|
58
|
+
const { adapter, internalAdapter } = await auth.$context;
|
|
59
|
+
const user = await internalAdapter.findUserById(userId);
|
|
60
|
+
if (user === null || Reflect.get(user, "banned") === true) {
|
|
61
|
+
return null;
|
|
62
|
+
}
|
|
63
|
+
const consent = await adapter.findOne({
|
|
64
|
+
model: "oauthConsent",
|
|
65
|
+
where: [
|
|
66
|
+
{ field: "userId", value: userId },
|
|
67
|
+
{ field: "clientId", value: clientId },
|
|
68
|
+
],
|
|
69
|
+
});
|
|
70
|
+
return consent === null ? null : user;
|
|
71
|
+
},
|
|
72
|
+
});
|
|
73
|
+
if (subject === null || !(yield* admitsUser(subject.id))) {
|
|
74
|
+
return Option.none();
|
|
75
|
+
}
|
|
76
|
+
const role: unknown = Reflect.get(subject, "role");
|
|
77
|
+
return Option.some({ email: subject.email, id: subject.id, name: subject.name, ...(typeof role === "string" ? { role } : {}) });
|
|
78
|
+
}),
|
|
79
|
+
revokeAllClients: (userId) => revoke(userId),
|
|
80
|
+
revokeClient: (userId, clientId) => revoke(userId, clientId),
|
|
81
|
+
});
|
|
82
|
+
}
|