@shivaedev/identity 0.17.0 → 0.18.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 +34 -30
- package/dist/server/adapters/authCall.d.ts +5 -0
- package/dist/server/adapters/authCall.d.ts.map +1 -0
- package/dist/server/adapters/authCall.js +7 -0
- package/dist/server/adapters/authCall.js.map +1 -0
- package/dist/server/adapters/betterAuthSessions.d.ts.map +1 -1
- package/dist/server/adapters/betterAuthSessions.js +3 -5
- package/dist/server/adapters/betterAuthSessions.js.map +1 -1
- package/dist/server/better-auth/accountRoleSeed.d.ts +2 -1
- package/dist/server/better-auth/accountRoleSeed.d.ts.map +1 -1
- package/dist/server/better-auth/accountRoleSeed.js +8 -6
- package/dist/server/better-auth/accountRoleSeed.js.map +1 -1
- package/dist/server/better-auth/adapters/database.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/database.js +18 -3
- package/dist/server/better-auth/adapters/database.js.map +1 -1
- package/dist/server/better-auth/adapters/hookRuntime.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/hookRuntime.js +2 -1
- package/dist/server/better-auth/adapters/hookRuntime.js.map +1 -1
- package/dist/server/better-auth/adapters/storedRoleOptions.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/storedRoleOptions.js +8 -1
- package/dist/server/better-auth/adapters/storedRoleOptions.js.map +1 -1
- package/dist/server/better-auth/assignRole.d.ts +2 -1
- package/dist/server/better-auth/assignRole.d.ts.map +1 -1
- package/dist/server/better-auth/assignRole.js +7 -5
- package/dist/server/better-auth/assignRole.js.map +1 -1
- package/dist/server/better-auth/columnDrift.d.ts.map +1 -1
- package/dist/server/better-auth/columnDrift.js +4 -3
- package/dist/server/better-auth/columnDrift.js.map +1 -1
- package/dist/server/better-auth/migrationPlan.d.ts.map +1 -1
- package/dist/server/better-auth/migrationPlan.js +7 -5
- package/dist/server/better-auth/migrationPlan.js.map +1 -1
- package/dist/server/better-auth/mount.d.ts +1 -0
- package/dist/server/better-auth/mount.d.ts.map +1 -1
- package/dist/server/better-auth/mount.js +11 -2
- package/dist/server/better-auth/mount.js.map +1 -1
- package/dist/server/better-auth/signInGate.d.ts.map +1 -1
- package/dist/server/better-auth/signInGate.js +2 -1
- package/dist/server/better-auth/signInGate.js.map +1 -1
- package/dist/server/better-auth/tables.d.ts +19 -0
- package/dist/server/better-auth/tables.d.ts.map +1 -0
- package/dist/server/better-auth/tables.js +24 -0
- package/dist/server/better-auth/tables.js.map +1 -0
- package/dist/server/session.d.ts.map +1 -1
- package/dist/server/session.js +3 -2
- package/dist/server/session.js.map +1 -1
- package/dist/server/tracing.d.ts.map +1 -1
- package/dist/server/tracing.js +3 -2
- package/dist/server/tracing.js.map +1 -1
- package/package.json +12 -12
- package/src/server/adapters/authCall.ts +8 -0
- package/src/server/adapters/betterAuthSessions.ts +4 -6
- package/src/server/better-auth/accountRoleSeed.ts +8 -5
- package/src/server/better-auth/adapters/database.ts +21 -4
- package/src/server/better-auth/adapters/hookRuntime.ts +2 -1
- package/src/server/better-auth/adapters/storedRoleOptions.ts +8 -1
- package/src/server/better-auth/assignRole.ts +7 -4
- package/src/server/better-auth/columnDrift.ts +4 -3
- package/src/server/better-auth/migrationPlan.ts +7 -5
- package/src/server/better-auth/mount.ts +11 -2
- package/src/server/better-auth/signInGate.ts +2 -1
- package/src/server/better-auth/tables.ts +28 -0
- package/src/server/session.ts +3 -2
- package/src/server/tracing.ts +5 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,24 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.18.0 - 2026-11-02
|
|
4
|
+
|
|
5
|
+
### Added
|
|
6
|
+
|
|
7
|
+
- Accept the application's Better Auth options in role assignment, provider-account role seeds and admin Users handlers to follow custom table and column mappings. Existing calls retain the default mapping.
|
|
8
|
+
- Identity mounts expose `admitsUser(userId)` to check the current sign-in policy for authenticated users on other transports, without caching rule verdicts.
|
|
9
|
+
|
|
10
|
+
### Fixed
|
|
11
|
+
|
|
12
|
+
- Interrupting a session lookup, provider-account lookup or mounted Better Auth request cancels its pending PostgreSQL query. Transaction commit, rollback and connection cleanup still finish after cancellation.
|
|
13
|
+
- Present SQL interruption to Better Auth as a cancelled request so an interrupted session lookup does not log an internal server error.
|
|
14
|
+
- Compute command invalidation once with the resolved viewer and publish declared changes for optional-auth commands, including anonymous callers.
|
|
15
|
+
- Preserve the configured role column when mounting stored roles, generating role-aware migrations and checking the auth schema.
|
|
16
|
+
- Identity checks with a zero recheck interval start an independent rule lookup even while another check for the same account is pending.
|
|
17
|
+
|
|
18
|
+
### Breaking
|
|
19
|
+
|
|
20
|
+
- MCP's `betterAuthMcp` requires `admitsUser`. Pass `admitsUser: mounted.admitsUser` from `betterAuthMount` alongside `auth: mounted.auth`. Each MCP request refuses users denied by the identity sign-in policy; existing tokens follow admission changes on the next request.
|
|
21
|
+
|
|
3
22
|
## 0.17.0 - 2026-11-01
|
|
4
23
|
|
|
5
24
|
### Added
|
package/README.md
CHANGED
|
@@ -199,6 +199,8 @@ yield* assignRole(AppAccess, userId, "owner");
|
|
|
199
199
|
|
|
200
200
|
Supply the application's `SqlClient` Layer. `assignRole` uses the existing Reactivity service when present and supplies its own when absent, so server-only apps need no Users page or Reactivity Layer. This trusted server verb has no caller authorization check; authorize operator access before calling it. It returns whether the role changed, fails with `NotFound` for a missing user, and refuses to remove the final holder of `AssignRoles` (`roles.assign`) with `LastRoleAssigner`. Both declarations live in `@shivaedev/access/roles.ts`. Writes serialize through the same PostgreSQL transaction lock and invalidate the Users list after commit. The Users page adds its caller permission check and audit log.
|
|
201
201
|
|
|
202
|
+
For custom auth tables, pass the same Better Auth options used by `betterAuthMount` as the fourth argument: `assignRole(AppAccess, userId, "owner", authOptions)`. Role administration uses `user.modelName`, `user.fields.updatedAt` and `user.additionalFields.role.fieldName`. Role-aware migrations and schema checks preserve the role field mapping. Omitting the options keeps Better Auth's default table and column names.
|
|
203
|
+
|
|
202
204
|
For named provider accounts, declare the role once and pass a configured `accountRoleSeed` to the mount:
|
|
203
205
|
|
|
204
206
|
```ts
|
|
@@ -224,7 +226,7 @@ const mounted = yield* betterAuthMount(authOptions, {
|
|
|
224
226
|
|
|
225
227
|
Set `AUTH_OPERATOR_ACCOUNTS=github:1001,github:1002` using stable provider account IDs. `ProviderAccounts` shares the parser and account-ID validation of `AllowedAccounts`, while accepting an empty list. `Config.withDefault([])` also accepts an unset variable. Both grant nothing. Invalid entries fail boot with `ConfigError`.
|
|
226
228
|
|
|
227
|
-
The mount runs the seed at boot for existing users and before creating sign-in sessions, including the first provider sign-in. A listed account that has never signed in is ignored until it does. Assignments go through `assignRole`, including its last-role-assigner guard and commit invalidation. The seed uses the application's SQL Layer and
|
|
229
|
+
The mount runs the seed at boot for existing users and before creating sign-in sessions, including the first provider sign-in. A listed account that has never signed in is ignored until it does. Assignments go through `assignRole`, including its last-role-assigner guard and commit invalidation. The seed uses the application's SQL Layer. With custom mappings, pass `authOptions` as the fourth argument to `accountRoleSeed(AppAccess, Operator.name, operators, authOptions)`. It follows the user mapping above and `account.modelName` plus `account.fields.accountId`, `providerId` and `userId` at boot and sign-in.
|
|
228
230
|
|
|
229
231
|
The seed only grants: removing an account from config does not restore its previous role. To demote it, first remove the account from config and restart the server, then assign the desired role through the Users page or a trusted `assignRole` command. Keep another holder of `AssignRoles` before demoting the last administrator. A still-listed account receives the configured role again on sign-in or boot.
|
|
230
232
|
|
|
@@ -311,6 +313,8 @@ A removal takes effect on the user's next request through `admittedSessions`: th
|
|
|
311
313
|
|
|
312
314
|
`revokeUnadmitted` checks every stored user against the current policy, deletes the sessions of each user it no longer admits and succeeds with `{ users, sessions }`, the number of users and sessions it revoked. Run it at startup, as above, or from an administrative command. It fails with the rule's error or with a `ConfigError`.
|
|
313
315
|
|
|
316
|
+
`mounted.admitsUser(userId)` checks the same sign-in policy against the user's stored provider accounts, without caching rule verdicts or deleting browser sessions. Use it to admit an already authenticated user through another transport, such as MCP. It returns an Effect of boolean, fails with `AuthUnavailable` if admission cannot be checked, and admits all users when no sign-in policy is configured.
|
|
317
|
+
|
|
314
318
|
Without `signIn`, the mount installs no sign-in policy hooks and `revokeUnadmitted` revokes nothing. `admittedSessions(lookup)` returns an Effect `SessionProvider`; use it as the `provider` in the `SessionPolicy` Layer. Its policy check runs in the request fiber, preserving request spans, log annotations and interruption. `mounted.sessions` supplies this provider with the mount's roles and the default Better Auth lookup. Supply the application's Config provider to the server Layer so request-time account checks read the same configuration as startup.
|
|
315
319
|
|
|
316
320
|
### Once per feature: identity and typed refusals
|
|
@@ -741,35 +745,35 @@ Register the Effect with a worker schedule, as the starter does at midnight UTC.
|
|
|
741
745
|
|
|
742
746
|
Import the module that defines the name; there is no package-root entry. Paths below follow `@shivaedev/identity/`.
|
|
743
747
|
|
|
744
|
-
| Module | Names and purpose
|
|
745
|
-
| -------------------------------------------- |
|
|
746
|
-
| `identity.ts` | `RequestId`, `Identity`, `OptionalIdentity`, `SessionUser`, `SessionUserWithProviderAccounts`, `SessionUserSchema`: request-local services and the shared user schema.
|
|
747
|
-
| `middleware.ts` | `RequestTracing`, `Authenticated`, `AuthenticatedUser`, `AuthenticatedUserWithProviderAccounts`, `MaybeAuthenticated`, `IdentityFailures`: native RPC middleware declarations and their shared failure schema.
|
|
748
|
-
| `server/providerFailure.ts` | `providerFailure(cause)`: log a redacted provider failure and fail with `AuthUnavailable`.
|
|
749
|
-
| `permission.ts` | `permissionMiddleware`, `hasPermission`: native permission middleware declarations and predicates over resolved grants.
|
|
750
|
-
| `server/permissions.ts` | `permissionLayer`, `permissionRoute`: permission middleware Layers and HTTP route guards.
|
|
751
|
-
| `server/session.ts` | `authenticatedLayer`, `maybeAuthenticatedLayer`, `authenticatedUserLayer`, `authenticatedUserWithProviderAccountsLayer`, `withSessionUser`, `resolveSession`: session middleware implementations and the identity boundary.
|
|
752
|
-
| `server/adapters/betterAuthSessions.ts` | `betterAuthSessions(getSession, getProviderAccounts?)`: a session provider from Better Auth lookups.
|
|
753
|
-
| `server/origin.ts` | `trustedOrigins({ allow, missing })`: an exact Origin allowlist.
|
|
754
|
-
| `server/local.ts` | `localRpcGuard`, `loopbackOnly`, `sameOrigin`, `trustedProxyPeer`: loopback and proxy guards.
|
|
755
|
-
| `server/trustedProxyRanges.ts` | `trustedProxyRanges(trustedProxy?)`: normalized proxy ranges.
|
|
756
|
-
| `server/proxyRanges.ts` | `proxyRanges(value)`: parse configured proxy ranges.
|
|
757
|
-
| `server/transportHeaders.ts` | `transportHeaders(rpcHeaders)`: the headers used for a transport-level decision.
|
|
758
|
-
| `server/tracing.ts` | `requestTracingLayer({ header?, sensitive? })`: the `RequestTracing` implementation.
|
|
759
|
-
| `server/sessionKeys.ts` | `resolveChanges`: session-scoped change subscriptions for custom change handlers.
|
|
760
|
-
| `server/commandChanges.ts` | `commandChanges(effect, rpc, payload)`: scoped command invalidation for custom authentication middleware.
|
|
761
|
-
| `server/better-auth/mount.ts` | `betterAuthMount(options, { emails?, onPasswordReset?, signIn?, bearerSessions?, roles?, defaultRole?, roleSeed? })`, returning `{ auth, routes, sessions, admittedSessions, revokeUnadmitted }`: native auth routes and the sign-in policy. |
|
|
762
|
-
| `server/better-auth/adapters/database.ts` | `betterAuthDatabase()`: Better Auth storage on the application PostgreSQL client.
|
|
763
|
-
| `server/better-auth/emails.ts` | `AuthEmail`, `BetterAuthEmails`: typed delivery messages, app routes and per-account delivery windows for the mount.
|
|
764
|
-
| `server/better-auth/allowedAccounts.ts` | `ProviderAccounts`, `AllowedAccounts`, `allowedAccounts`: provider-account list Schemas and the non-empty `AUTH_ALLOWED_ACCOUNTS` Config.
|
|
765
|
-
| `server/better-auth/accountRoleSeed.ts` | `accountRoleSeed(access, role, accounts)`: grant a configured role at boot and sign-in through `assignRole`.
|
|
766
|
-
| `server/better-auth/signInGate.ts` | `SignInPolicy`: the `accounts`, `rule` and `recheckInterval` of a sign-in policy.
|
|
767
|
-
| `server/better-auth/revokeUnadmitted.ts` | `RevokedSessions`: the `{ users, sessions }` counts of a revocation.
|
|
768
|
-
| `server/better-auth/userProfiles.ts` | Public profile lookups for other users.
|
|
769
|
-
| `server/better-auth/sweepExpiredSessions.ts` | `sweepExpiredSessions`: delete expired sessions through the application's SQL client and return the number removed.
|
|
770
|
-
| `server/better-auth/userReference.ts` | `userReference`: the default auth user table and id column for application foreign keys.
|
|
771
|
-
| `server/better-auth/testDatabase.ts` | `authTestDatabase`: test-only identity/session readouts and faults for the default PostgreSQL auth schema.
|
|
772
|
-
| `server/better-auth/testing.ts` | `signedInUser(auth, fields)`, `passwordUser(auth, fields)`, `storedProviderAccounts(auth, userId)`: test-only users, minted sessions and credential storage observations.
|
|
748
|
+
| Module | Names and purpose |
|
|
749
|
+
| -------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
|
750
|
+
| `identity.ts` | `RequestId`, `Identity`, `OptionalIdentity`, `SessionUser`, `SessionUserWithProviderAccounts`, `SessionUserSchema`: request-local services and the shared user schema. |
|
|
751
|
+
| `middleware.ts` | `RequestTracing`, `Authenticated`, `AuthenticatedUser`, `AuthenticatedUserWithProviderAccounts`, `MaybeAuthenticated`, `IdentityFailures`: native RPC middleware declarations and their shared failure schema. |
|
|
752
|
+
| `server/providerFailure.ts` | `providerFailure(cause)`: log a redacted provider failure and fail with `AuthUnavailable`. |
|
|
753
|
+
| `permission.ts` | `permissionMiddleware`, `hasPermission`: native permission middleware declarations and predicates over resolved grants. |
|
|
754
|
+
| `server/permissions.ts` | `permissionLayer`, `permissionRoute`: permission middleware Layers and HTTP route guards. |
|
|
755
|
+
| `server/session.ts` | `authenticatedLayer`, `maybeAuthenticatedLayer`, `authenticatedUserLayer`, `authenticatedUserWithProviderAccountsLayer`, `withSessionUser`, `resolveSession`: session middleware implementations and the identity boundary. |
|
|
756
|
+
| `server/adapters/betterAuthSessions.ts` | `betterAuthSessions(getSession, getProviderAccounts?)`: a session provider from Better Auth lookups. |
|
|
757
|
+
| `server/origin.ts` | `trustedOrigins({ allow, missing })`: an exact Origin allowlist. |
|
|
758
|
+
| `server/local.ts` | `localRpcGuard`, `loopbackOnly`, `sameOrigin`, `trustedProxyPeer`: loopback and proxy guards. |
|
|
759
|
+
| `server/trustedProxyRanges.ts` | `trustedProxyRanges(trustedProxy?)`: normalized proxy ranges. |
|
|
760
|
+
| `server/proxyRanges.ts` | `proxyRanges(value)`: parse configured proxy ranges. |
|
|
761
|
+
| `server/transportHeaders.ts` | `transportHeaders(rpcHeaders)`: the headers used for a transport-level decision. |
|
|
762
|
+
| `server/tracing.ts` | `requestTracingLayer({ header?, sensitive? })`: the `RequestTracing` implementation. |
|
|
763
|
+
| `server/sessionKeys.ts` | `resolveChanges`: session-scoped change subscriptions for custom change handlers. |
|
|
764
|
+
| `server/commandChanges.ts` | `commandChanges(effect, rpc, payload)`: scoped command invalidation for custom authentication middleware. |
|
|
765
|
+
| `server/better-auth/mount.ts` | `betterAuthMount(options, { emails?, onPasswordReset?, signIn?, bearerSessions?, roles?, defaultRole?, roleSeed? })`, returning `{ auth, routes, sessions, admittedSessions, admitsUser, revokeUnadmitted }`: native auth routes and the sign-in policy. |
|
|
766
|
+
| `server/better-auth/adapters/database.ts` | `betterAuthDatabase()`: Better Auth storage on the application PostgreSQL client. |
|
|
767
|
+
| `server/better-auth/emails.ts` | `AuthEmail`, `BetterAuthEmails`: typed delivery messages, app routes and per-account delivery windows for the mount. |
|
|
768
|
+
| `server/better-auth/allowedAccounts.ts` | `ProviderAccounts`, `AllowedAccounts`, `allowedAccounts`: provider-account list Schemas and the non-empty `AUTH_ALLOWED_ACCOUNTS` Config. |
|
|
769
|
+
| `server/better-auth/accountRoleSeed.ts` | `accountRoleSeed(access, role, accounts)`: grant a configured role at boot and sign-in through `assignRole`. |
|
|
770
|
+
| `server/better-auth/signInGate.ts` | `SignInPolicy`: the `accounts`, `rule` and `recheckInterval` of a sign-in policy. |
|
|
771
|
+
| `server/better-auth/revokeUnadmitted.ts` | `RevokedSessions`: the `{ users, sessions }` counts of a revocation. |
|
|
772
|
+
| `server/better-auth/userProfiles.ts` | Public profile lookups for other users. |
|
|
773
|
+
| `server/better-auth/sweepExpiredSessions.ts` | `sweepExpiredSessions`: delete expired sessions through the application's SQL client and return the number removed. |
|
|
774
|
+
| `server/better-auth/userReference.ts` | `userReference`: the default auth user table and id column for application foreign keys. |
|
|
775
|
+
| `server/better-auth/testDatabase.ts` | `authTestDatabase`: test-only identity/session readouts and faults for the default PostgreSQL auth schema. |
|
|
776
|
+
| `server/better-auth/testing.ts` | `signedInUser(auth, fields)`, `passwordUser(auth, fields)`, `storedProviderAccounts(auth, userId)`: test-only users, minted sessions and credential storage observations. |
|
|
773
777
|
|
|
774
778
|
### Install, setup and limits
|
|
775
779
|
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { AsyncLocalStorage } from "node:async_hooks";
|
|
2
|
+
import { Effect } from "effect";
|
|
3
|
+
export declare const authCallSignal: AsyncLocalStorage<AbortSignal>;
|
|
4
|
+
export declare function authCall<A>(call: (signal: AbortSignal) => Promise<A>): Effect.Effect<A, import("effect/Cause").UnknownError, never>;
|
|
5
|
+
//# sourceMappingURL=authCall.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"authCall.d.ts","sourceRoot":"","sources":["../../../src/server/adapters/authCall.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,eAAO,MAAM,cAAc,gCAAuC,CAAC;AAEnE,wBAAgB,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,gEAEpE"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { AsyncLocalStorage } from "node:async_hooks";
|
|
2
|
+
import { Effect } from "effect";
|
|
3
|
+
export const authCallSignal = new AsyncLocalStorage();
|
|
4
|
+
export function authCall(call) {
|
|
5
|
+
return Effect.tryPromise((signal) => authCallSignal.run(signal, () => call(signal)));
|
|
6
|
+
}
|
|
7
|
+
//# sourceMappingURL=authCall.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"authCall.js","sourceRoot":"","sources":["../../../src/server/adapters/authCall.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,iBAAiB,EAAe,CAAC;AAEnE,MAAM,UAAU,QAAQ,CAAI,IAAyC;IACpE,OAAO,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AACtF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"betterAuthSessions.d.ts","sourceRoot":"","sources":["../../../src/server/adapters/betterAuthSessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAA6B,MAAM,QAAQ,CAAC;AAGlE,OAAO,EAAE,KAAK,eAAe,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AACnF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAEzD,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"betterAuthSessions.d.ts","sourceRoot":"","sources":["../../../src/server/adapters/betterAuthSessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAA6B,MAAM,QAAQ,CAAC;AAGlE,OAAO,EAAE,KAAK,eAAe,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AACnF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAEzD,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAKxE,MAAM,MAAM,UAAU,CAAC,QAAQ,SAAS,YAAY,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,KAAK,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC;AAClH,MAAM,MAAM,mBAAmB,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,KAAK,OAAO,CAAC,SAAS,oBAAoB,EAAE,CAAC,CAAC;AAC5G,MAAM,MAAM,2BAA2B,CAAC,QAAQ,SAAS,YAAY,IAAI,QAAQ,GAAG;IACnF,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG;QAAE,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,oBAAoB,EAAE,EAAE,eAAe,GAAG,YAAY,CAAC,CAAA;KAAE,CAAC;CAChJ,CAAC;AACF,wBAAgB,kBAAkB,CAAC,QAAQ,SAAS,YAAY,EAAE,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;AAC/H,wBAAgB,kBAAkB,CAAC,QAAQ,SAAS,YAAY,EAC/D,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC,EAChC,mBAAmB,EAAE,mBAAmB,GACtC,eAAe,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC,CAAC"}
|
|
@@ -2,21 +2,19 @@ import { Clock, Effect, Option, Predicate, Schema } from "effect";
|
|
|
2
2
|
import * as HttpStatus from "effect/http/HttpStatus";
|
|
3
3
|
import { Unauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
4
4
|
import { providerFailure } from "#server/providerFailure.ts";
|
|
5
|
+
import { authCall } from "./authCall.js";
|
|
5
6
|
const ExpiringSession = Schema.Struct({ session: Schema.Struct({ expiresAt: Schema.Date }) });
|
|
6
7
|
export function betterAuthSessions(getSession, getProviderAccounts) {
|
|
7
8
|
const betterAuthSession = Effect.fn("Identity.betterAuthSession")(function* (headers) {
|
|
8
9
|
const transport = new globalThis.Headers(headers);
|
|
9
|
-
const session = yield*
|
|
10
|
+
const session = yield* authCall(() => getSession(transport)).pipe(Effect.catch((error) => providerFailure(error.cause)));
|
|
10
11
|
if (Schema.is(ExpiringSession)(session) && session.session.expiresAt.getTime() <= (yield* Clock.currentTimeMillis)) {
|
|
11
12
|
return Option.none();
|
|
12
13
|
}
|
|
13
14
|
if (session === null || getProviderAccounts === undefined) {
|
|
14
15
|
return Option.fromNullishOr(session);
|
|
15
16
|
}
|
|
16
|
-
const providerAccounts = Effect.
|
|
17
|
-
catch: (cause) => cause,
|
|
18
|
-
try: () => getProviderAccounts(transport),
|
|
19
|
-
}).pipe(Effect.catch((cause) => Predicate.hasProperty(cause, "statusCode") && cause.statusCode === HttpStatus.fromLiteral("Unauthorized")
|
|
17
|
+
const providerAccounts = authCall(() => getProviderAccounts(transport)).pipe(Effect.catch(({ cause }) => Predicate.hasProperty(cause, "statusCode") && cause.statusCode === HttpStatus.fromLiteral("Unauthorized")
|
|
20
18
|
? Effect.fail(new Unauthorized({ message: "Authentication required" }))
|
|
21
19
|
: providerFailure(cause)));
|
|
22
20
|
return Option.some({ ...session, user: { ...session.user, providerAccounts } });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"betterAuthSessions.js","sourceRoot":"","sources":["../../../src/server/adapters/betterAuthSessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAElE,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAwB,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAEnF,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"betterAuthSessions.js","sourceRoot":"","sources":["../../../src/server/adapters/betterAuthSessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAElE,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAwB,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAEnF,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;AAY9F,MAAM,UAAU,kBAAkB,CAAgC,UAAgC,EAAE,mBAAyC;IAC5I,MAAM,iBAAiB,GAAG,MAAM,CAAC,EAAE,CAAC,4BAA4B,CAAC,CAAC,QAAQ,CAAC,EAAE,OAAwB;QACpG,MAAM,SAAS,GAAG,IAAI,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAClD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACzH,IAAI,MAAM,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACpH,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;QACtB,CAAC;QACD,IAAI,OAAO,KAAK,IAAI,IAAI,mBAAmB,KAAK,SAAS,EAAE,CAAC;YAC3D,OAAO,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QACtC,CAAC;QACD,MAAM,gBAAgB,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAC3E,MAAM,CAAC,KAAK,CACX,CAAC,EAAE,KAAK,EAAE,EAAwD,EAAE,CACnE,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,YAAY,CAAC,IAAI,KAAK,CAAC,UAAU,KAAK,UAAU,CAAC,WAAW,CAAC,cAAc,CAAC;YACxG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,YAAY,CAAC,EAAE,OAAO,EAAE,yBAAyB,EAAE,CAAC,CAAC;YACvE,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAC1B,CACD,CAAC;QACF,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,gBAAgB,EAAE,EAAE,CAAC,CAAC;IACjF,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,GAAG,EAAE,iBAAiB,EAAE,CAAC;AACnC,CAAC"}
|
|
@@ -3,10 +3,11 @@ import { SqlClient } 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 } from "./tables.ts";
|
|
6
7
|
export interface AccountRoleSeed<E> {
|
|
7
8
|
readonly onSignIn: (userId: string) => Effect.Effect<void, E>;
|
|
8
9
|
}
|
|
9
|
-
export declare const accountRoleSeed: <TRole extends string>(access: Pick<AccessPolicy<TRole>, "Role" | "hasPermission">, role: NoInfer<TRole>, accounts: Config.Config<readonly ProviderAccountValue[]
|
|
10
|
+
export declare const accountRoleSeed: <TRole extends string>(access: Pick<AccessPolicy<TRole>, "Role" | "hasPermission">, role: NoInfer<TRole>, accounts: Config.Config<readonly ProviderAccountValue[]>, options?: AuthTableOptions | undefined) => Effect.Effect<{
|
|
10
11
|
onSignIn: (userId: string) => Effect.Effect<void, AuthUnavailable | import("@shivaedev/access/roles.ts").LastRoleAssigner | import("@shivaedev/errors/taxonomy.ts").NotFound, never>;
|
|
11
12
|
}, AuthUnavailable | Config.ConfigError | import("@shivaedev/access/roles.ts").LastRoleAssigner | import("@shivaedev/errors/taxonomy.ts").NotFound, SqlClient.SqlClient>;
|
|
12
13
|
//# sourceMappingURL=accountRoleSeed.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accountRoleSeed.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/accountRoleSeed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AACrD,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"accountRoleSeed.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/accountRoleSeed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AACrD,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAEzD,OAAO,EAAE,KAAK,gBAAgB,EAAU,MAAM,aAAa,CAAC;AAE5D,MAAM,WAAW,eAAe,CAAC,CAAC;IACjC,QAAQ,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;CAC9D;AAED,eAAO,MAAM,eAAe,GAAoD,KAAK,SAAS,MAAM;uBA6BvE,MAAM;wKACjC,CAAC"}
|
|
@@ -2,15 +2,17 @@ import { Effect, Schema } from "effect";
|
|
|
2
2
|
import { SqlClient, SqlSchema } from "effect/sql";
|
|
3
3
|
import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
4
4
|
import { assignRole } from "./assignRole.js";
|
|
5
|
-
|
|
5
|
+
import { tables } from "./tables.js";
|
|
6
|
+
export const accountRoleSeed = Effect.fn("Identity.accountRoleSeed")(function* (access, role, accounts, options) {
|
|
6
7
|
const listed = yield* accounts;
|
|
7
8
|
const context = yield* Effect.context();
|
|
8
|
-
const sql = yield* SqlClient.SqlClient;
|
|
9
|
+
const sql = (yield* SqlClient.SqlClient).withoutTransforms();
|
|
10
|
+
const { account: accountTable } = tables(options);
|
|
9
11
|
const findUsers = SqlSchema.findAll({
|
|
10
12
|
execute: ({ accountId, providerId, userId }) => sql `
|
|
11
|
-
select distinct
|
|
12
|
-
where
|
|
13
|
-
${userId === undefined ? sql.literal("") : sql `and
|
|
13
|
+
select distinct ${sql(accountTable.userId)} as id from ${sql(accountTable.table)}
|
|
14
|
+
where ${sql(accountTable.providerId)} = ${providerId} and ${sql(accountTable.accountId)} = ${accountId}
|
|
15
|
+
${userId === undefined ? sql.literal("") : sql `and ${sql(accountTable.userId)} = ${userId}`}`,
|
|
14
16
|
Request: Schema.Struct({ accountId: Schema.String, providerId: Schema.String, userId: Schema.optional(Schema.String) }),
|
|
15
17
|
Result: Schema.Struct({ id: Schema.String }),
|
|
16
18
|
});
|
|
@@ -18,7 +20,7 @@ export const accountRoleSeed = Effect.fn("Identity.accountRoleSeed")(function* (
|
|
|
18
20
|
for (const account of listed) {
|
|
19
21
|
const users = yield* findUsers({ ...account, userId }).pipe(Effect.mapError(() => new AuthUnavailable({ message: "Could not access provider accounts" })));
|
|
20
22
|
for (const user of users) {
|
|
21
|
-
yield* assignRole(access, user.id, role);
|
|
23
|
+
yield* assignRole(access, user.id, role, options);
|
|
22
24
|
}
|
|
23
25
|
}
|
|
24
26
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accountRoleSeed.js","sourceRoot":"","sources":["../../../src/server/better-auth/accountRoleSeed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"accountRoleSeed.js","sourceRoot":"","sources":["../../../src/server/better-auth/accountRoleSeed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAyB,MAAM,EAAE,MAAM,aAAa,CAAC;AAM5D,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,EAAE,CAAC,0BAA0B,CAAC,CAAC,QAAQ,CAAC,EAC7E,MAA2D,EAC3D,IAAoB,EACpB,QAAwD,EACxD,OAA0B;IAE1B,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC;IAC/B,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAAuB,CAAC;IAC7D,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,iBAAiB,EAAE,CAAC;IAC7D,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;IAClD,MAAM,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC;QACnC,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,GAAG,CAAA;qBAChC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,eAAe,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC;WACxE,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,MAAM,UAAU,QAAQ,GAAG,CAAC,YAAY,CAAC,SAAS,CAAC,MAAM,SAAS;KACpG,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA,OAAO,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,MAAM,EAAE,EAAE;QAC9F,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QACvH,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;KAC5C,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,MAAe;QACzD,KAAK,MAAM,OAAO,IAAI,MAAM,EAAE,CAAC;YAC9B,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,CAC1D,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,eAAe,CAAC,EAAE,OAAO,EAAE,oCAAoC,EAAE,CAAC,CAAC,CAC7F,CAAC;YACF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBAC1B,KAAK,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;YACnD,CAAC;QACF,CAAC;IACF,CAAC,CAAC,CAAC;IACH,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC;IACf,OAAO,EAAE,QAAQ,EAAE,CAAC,MAAc,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;AAC7F,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/database.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/database.ts"],"names":[],"mappings":"AAEA,OAAO,EAAS,MAAM,EAAwB,KAAK,EAAE,MAAM,QAAQ,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AA4BvC,eAAO,MAAM,kBAAkB,oEA+C7B,CAAC"}
|
|
@@ -1,24 +1,39 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { APIError } from "better-auth/api";
|
|
2
|
+
import { Cause, Effect, Exit, Option, Schema, Scope } from "effect";
|
|
2
3
|
import { SqlClient } from "effect/sql";
|
|
4
|
+
import { authCallSignal } from "#server/adapters/authCall.ts";
|
|
3
5
|
import { betterAuthTransaction } from "./transaction.js";
|
|
4
6
|
const Result = Schema.Struct({ command: Schema.String, rowCount: Schema.Number, rows: Schema.Array(Schema.Unknown) });
|
|
7
|
+
function databaseResult(exit) {
|
|
8
|
+
if (Exit.isSuccess(exit)) {
|
|
9
|
+
return exit.value;
|
|
10
|
+
}
|
|
11
|
+
if (Cause.hasInterruptsOnly(exit.cause)) {
|
|
12
|
+
throw new APIError("REQUEST_TIMEOUT", { code: "REQUEST_CANCELLED", message: "Authentication request was cancelled" });
|
|
13
|
+
}
|
|
14
|
+
throw Cause.squash(exit.cause);
|
|
15
|
+
}
|
|
5
16
|
export const betterAuthDatabase = Effect.fn("Identity.betterAuthDatabase")(function* () {
|
|
6
17
|
const sql = yield* SqlClient.SqlClient;
|
|
7
18
|
const transaction = yield* Effect.serviceOption(sql.transactionService);
|
|
8
19
|
const parent = yield* Scope.Scope;
|
|
9
20
|
const context = yield* Effect.context();
|
|
10
21
|
const run = Effect.runPromiseWith(context);
|
|
22
|
+
const runQuery = Effect.runPromiseExitWith(context);
|
|
11
23
|
const pool = {
|
|
12
24
|
async connect() {
|
|
13
25
|
const scope = await run(Scope.fork(parent));
|
|
14
|
-
const connection = await
|
|
26
|
+
const connection = await runQuery((Option.isSome(transaction) ? Effect.succeed(transaction.value[0]) : sql.reserve).pipe(Scope.provide(scope), Effect.onError((cause) => Scope.close(scope, Exit.failCause(cause)))), { signal: authCallSignal.getStore() }).then(databaseResult);
|
|
15
27
|
const control = Option.isSome(transaction) ? await run(betterAuthTransaction.pipe(Scope.provide(scope))) : undefined;
|
|
16
28
|
function query(text, parameters = []) {
|
|
17
29
|
if (typeof text !== "string") {
|
|
18
30
|
throw new Error("Better Auth database does not support cursors");
|
|
19
31
|
}
|
|
20
32
|
const nested = control?.(text);
|
|
21
|
-
|
|
33
|
+
const signal = text === "begin" || text === "commit" || text === "rollback" ? undefined : authCallSignal.getStore();
|
|
34
|
+
return (nested === undefined
|
|
35
|
+
? runQuery(connection.executeRaw(text, parameters), { signal }).then(databaseResult)
|
|
36
|
+
: nested.then(() => ({ command: text, rowCount: 0, rows: [] }))).then(Schema.decodeUnknownSync(Result));
|
|
22
37
|
}
|
|
23
38
|
return {
|
|
24
39
|
query,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/database.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"database.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/database.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hookRuntime.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/hookRuntime.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,KAAK,EAAW,MAAM,EAAU,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"hookRuntime.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/hookRuntime.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,KAAK,EAAW,MAAM,EAAU,MAAM,QAAQ,CAAC;AAE7D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAEhF,eAAO,MAAM,WAAW,GAAgC,CAAC;cAIvC,CAAC,QAAQ,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,mBAAmB,EAAE,CAAC,CAAC,UAAU,WAAW,GAAG,SAAS,KAAG,OAAO,CAAC,CAAC,CAAC;iBAiBxG,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC;YAc5D,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { AsyncLocalStorage } from "node:async_hooks";
|
|
2
2
|
import { APIError } from "better-auth/api";
|
|
3
3
|
import { Context, Effect, Result } from "effect";
|
|
4
|
+
import { authCall } from "#server/adapters/authCall.ts";
|
|
4
5
|
export const hookRuntime = Effect.fnUntraced(function* () {
|
|
5
6
|
const context = yield* Effect.context();
|
|
6
7
|
const requests = new AsyncLocalStorage();
|
|
@@ -26,7 +27,7 @@ export const hookRuntime = Effect.fnUntraced(function* () {
|
|
|
26
27
|
const state = {
|
|
27
28
|
context: Context.merge(context, fiber.context),
|
|
28
29
|
};
|
|
29
|
-
const exit = yield* Effect.exit(
|
|
30
|
+
const exit = yield* Effect.exit(authCall((signal) => requests.run(state, () => request(signal))));
|
|
30
31
|
if (state.cause !== undefined) {
|
|
31
32
|
return yield* Effect.failCause(state.cause);
|
|
32
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hookRuntime.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/hookRuntime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAc,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"hookRuntime.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/hookRuntime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAc,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAGxD,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;IACrD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAAK,CAAC;IAC3C,MAAM,QAAQ,GAAG,IAAI,iBAAiB,EAAwE,CAAC;IAC/G,OAAO;QACN,OAAO,EAAE,KAAK,EAAK,IAAoD,EAAE,MAA+B,EAAc,EAAE;YACvH,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC;YACpC,SAAS,QAAQ,CAAC,KAAyB;gBAC1C,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;oBACvB,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;wBAC3B,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;oBACvB,CAAC;gBACF,CAAC,CAAC,CAAC;YACJ,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,IAAI,OAAO,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE;gBAC5I,MAAM;aACN,CAAC,CAAC;YACH,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC9B,MAAM,IAAI,QAAQ,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;YACjG,CAAC;YACD,OAAO,MAAM,CAAC,OAAO,CAAC;QACvB,CAAC;QACD,UAAU,EAAE,CAAI,OAA4C,EAAE,EAAE,CAC/D,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAC1B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACnB,MAAM,KAAK,GAAyE;gBACnF,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;aAC9C,CAAC;YACF,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YAClG,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;gBAC/B,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC7C,CAAC;YACD,OAAO,KAAK,CAAC,CAAC,IAAI,CAAC;QACpB,CAAC,CAAC,CACF;KACF,CAAC;AACH,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storedRoleOptions.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/storedRoleOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"storedRoleOptions.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/storedRoleOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC7B;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,SAAS,iBAAiB,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,iBAAiB,GAAG,QAAQ,CAoB3H"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { tables } from "#server/better-auth/tables.ts";
|
|
1
2
|
export function storedRoleOptions(options, role) {
|
|
2
3
|
if (role === undefined) {
|
|
3
4
|
return options;
|
|
@@ -8,7 +9,13 @@ export function storedRoleOptions(options, role) {
|
|
|
8
9
|
...options.user,
|
|
9
10
|
additionalFields: {
|
|
10
11
|
...options.user?.additionalFields,
|
|
11
|
-
role: {
|
|
12
|
+
role: {
|
|
13
|
+
defaultValue: role.defaultRole,
|
|
14
|
+
fieldName: tables(options).user.role,
|
|
15
|
+
input: false,
|
|
16
|
+
required: true,
|
|
17
|
+
type: "string",
|
|
18
|
+
},
|
|
12
19
|
},
|
|
13
20
|
},
|
|
14
21
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storedRoleOptions.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/storedRoleOptions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"storedRoleOptions.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/storedRoleOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAMvD,MAAM,UAAU,iBAAiB,CAAqC,OAAiB,EAAE,IAAwB;IAChH,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO,OAAO,CAAC;IAChB,CAAC;IACD,OAAO;QACN,GAAG,OAAO;QACV,IAAI,EAAE;YACL,GAAG,OAAO,CAAC,IAAI;YACf,gBAAgB,EAAE;gBACjB,GAAG,OAAO,CAAC,IAAI,EAAE,gBAAgB;gBACjC,IAAI,EAAE;oBACL,YAAY,EAAE,IAAI,CAAC,WAAW;oBAC9B,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI;oBACpC,KAAK,EAAE,KAAK;oBACZ,QAAQ,EAAE,IAAI;oBACd,IAAI,EAAE,QAAQ;iBACd;aACD;SACD;KACD,CAAC;AACH,CAAC"}
|
|
@@ -3,5 +3,6 @@ import { SqlClient } from "effect/sql";
|
|
|
3
3
|
import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
|
|
4
4
|
import { LastRoleAssigner } from "@shivaedev/access/roles.ts";
|
|
5
5
|
import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
6
|
-
|
|
6
|
+
import { type AuthTableOptions } from "./tables.ts";
|
|
7
|
+
export declare const assignRole: <TRole extends string>(access: Pick<AccessPolicy<TRole>, "Role" | "hasPermission">, userId: string, role: NoInfer<TRole>, options?: AuthTableOptions | undefined) => Effect.Effect<boolean, AuthUnavailable | LastRoleAssigner | NotFound, SqlClient.SqlClient>;
|
|
7
8
|
//# sourceMappingURL=assignRole.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assignRole.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/assignRole.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAkB,MAAM,QAAQ,CAAC;AAEhD,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAe,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"assignRole.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/assignRole.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAkB,MAAM,QAAQ,CAAC;AAEhD,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAe,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAE1E,OAAO,EAAE,KAAK,gBAAgB,EAAU,MAAM,aAAa,CAAC;AAM5D,eAAO,MAAM,UAAU,GAA+C,KAAK,SAAS,MAAM,0OAwCxF,CAAC"}
|
|
@@ -4,17 +4,19 @@ import { SqlClient, SqlSchema } from "effect/sql";
|
|
|
4
4
|
import { AssignRoles, LastRoleAssigner } from "@shivaedev/access/roles.ts";
|
|
5
5
|
import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
6
6
|
import { invalidateOnCommit, transact } from "@shivaedev/sql/transact.ts";
|
|
7
|
+
import { tables } from "./tables.js";
|
|
7
8
|
function unavailable() {
|
|
8
9
|
return new AuthUnavailable({ message: "Could not access app users" });
|
|
9
10
|
}
|
|
10
|
-
export const assignRole = Effect.fn("Identity.assignRole")(function* (access, userId, role) {
|
|
11
|
-
const sql = yield* SqlClient.SqlClient;
|
|
11
|
+
export const assignRole = Effect.fn("Identity.assignRole")(function* (access, userId, role, options) {
|
|
12
|
+
const sql = (yield* SqlClient.SqlClient).withoutTransforms();
|
|
13
|
+
const { user } = tables(options);
|
|
12
14
|
const existing = yield* Effect.serviceOption(Reactivity.Reactivity);
|
|
13
15
|
const reactivity = Option.isSome(existing) ? existing.value : yield* Reactivity.make;
|
|
14
16
|
return yield* Effect.gen(function* () {
|
|
15
17
|
yield* sql `select pg_advisory_xact_lock(hashtext('platform.auth.user-roles'))`;
|
|
16
18
|
const readTarget = SqlSchema.findOneOption({
|
|
17
|
-
execute: (id) => sql `select id, role from
|
|
19
|
+
execute: (id) => sql `select id, ${sql(user.role)} as role from ${sql(user.table)} where id = ${id} for update`,
|
|
18
20
|
Request: Schema.String,
|
|
19
21
|
Result: Schema.Struct({ id: Schema.String, role: Schema.NullOr(Schema.String) }),
|
|
20
22
|
});
|
|
@@ -28,7 +30,7 @@ export const assignRole = Effect.fn("Identity.assignRole")(function* (access, us
|
|
|
28
30
|
const assigners = access.Role.literals.filter((candidate) => access.hasPermission(candidate, AssignRoles));
|
|
29
31
|
if (assigners.some((candidate) => candidate === target.value.role) && !access.hasPermission(role, AssignRoles)) {
|
|
30
32
|
const readHolders = SqlSchema.findAll({
|
|
31
|
-
execute: () => sql `select id from
|
|
33
|
+
execute: () => sql `select id from ${sql(user.table)} where ${sql(user.role)} in ${sql.in(assigners)}`,
|
|
32
34
|
Request: Schema.Void,
|
|
33
35
|
Result: Schema.Struct({ id: Schema.String }),
|
|
34
36
|
});
|
|
@@ -37,7 +39,7 @@ export const assignRole = Effect.fn("Identity.assignRole")(function* (access, us
|
|
|
37
39
|
return yield* Effect.fail(new LastRoleAssigner({ userId }));
|
|
38
40
|
}
|
|
39
41
|
}
|
|
40
|
-
yield* sql `update
|
|
42
|
+
yield* sql `update ${sql(user.table)} set ${sql(user.role)} = ${role}, ${sql(user.updatedAt)} = now() where id = ${userId}`;
|
|
41
43
|
yield* invalidateOnCommit(["admin.users"]);
|
|
42
44
|
return true;
|
|
43
45
|
}).pipe(transact({ onSqlError: unavailable }), Effect.provideService(Reactivity.Reactivity, reactivity));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assignRole.js","sourceRoot":"","sources":["../../../src/server/better-auth/assignRole.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,KAAK,UAAU,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAElD,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"assignRole.js","sourceRoot":"","sources":["../../../src/server/better-auth/assignRole.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"columnDrift.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/columnDrift.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mDAAmD,CAAC;
|
|
1
|
+
{"version":3,"file":"columnDrift.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/columnDrift.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mDAAmD,CAAC;AAoC3F,eAAO,MAAM,eAAe,iLA0B1B,CAAC"}
|
|
@@ -2,6 +2,7 @@ import { getSchema } from "better-auth/db";
|
|
|
2
2
|
import { matchType } from "better-auth/db/migration";
|
|
3
3
|
import { Effect, Schema } from "effect";
|
|
4
4
|
import { SqlClient } from "effect/sql";
|
|
5
|
+
import { tables } from "./tables.js";
|
|
5
6
|
const Column = Schema.Struct({
|
|
6
7
|
column: Schema.String,
|
|
7
8
|
default: Schema.NullOr(Schema.String),
|
|
@@ -42,11 +43,11 @@ export const authColumnDrift = Effect.fnUntraced(function* (options, role) {
|
|
|
42
43
|
}
|
|
43
44
|
}
|
|
44
45
|
if (role !== undefined) {
|
|
45
|
-
const
|
|
46
|
-
const column = columns.find((entry) => entry.table === table && entry.column ===
|
|
46
|
+
const { user } = tables(options);
|
|
47
|
+
const column = columns.find((entry) => entry.table === user.table && entry.column === user.role);
|
|
47
48
|
const value = `'${role.defaultRole.replaceAll("'", "''")}'`;
|
|
48
49
|
if (column !== undefined && column.default !== `${value}::text`) {
|
|
49
|
-
missing.push(`column ${table}.role requires DEFAULT ${value}`);
|
|
50
|
+
missing.push(`column ${user.table}.${user.role} requires DEFAULT ${value}`);
|
|
50
51
|
}
|
|
51
52
|
}
|
|
52
53
|
return missing;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"columnDrift.js","sourceRoot":"","sources":["../../../src/server/better-auth/columnDrift.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"columnDrift.js","sourceRoot":"","sources":["../../../src/server/better-auth/columnDrift.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC,MAAM;IACrB,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC,MAAM;IACvB,KAAK,EAAE,MAAM,CAAC,MAAM;IACpB,IAAI,EAAE,MAAM,CAAC,MAAM;CACnB,CAAC,CAAC;AAGH,SAAS,cAAc,CACtB,KAAa,EACb,IAAY,EACZ,KAA6D,EAC7D,MAA0B,EAC1B,SAAkB;IAElB,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QAC1B,OAAO,EAAE,CAAC;IACX,CAAC;IACD,MAAM,IAAI,GAAG,CAAC,IAAI,KAAK,IAAI,IAAI,KAAK,CAAC,UAAU,EAAE,KAAK,KAAK,IAAI,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;IACtG,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,EAAE,CAAC;QAC/C,OAAO,CAAC,IAAI,CAAC,UAAU,KAAK,IAAI,IAAI,kBAAkB,IAAI,WAAW,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC;IACtF,CAAC;IACD,IAAI,KAAK,CAAC,QAAQ,KAAK,KAAK,IAAI,MAAM,CAAC,QAAQ,KAAK,KAAK,EAAE,CAAC;QAC3D,OAAO,CAAC,IAAI,CAAC,UAAU,KAAK,IAAI,IAAI,oBAAoB,CAAC,CAAC;IAC3D,CAAC;IACD,IAAI,KAAK,CAAC,QAAQ,KAAK,KAAK,IAAI,MAAM,CAAC,QAAQ,KAAK,IAAI,IAAI,MAAM,CAAC,OAAO,KAAK,IAAI,IAAI,KAAK,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;QACzH,OAAO,CAAC,IAAI,CAAC,UAAU,KAAK,IAAI,IAAI,yBAAyB,CAAC,CAAC;IAChE,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,OAA0B,EAAE,IAAwB;IAC/G,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC;IACvC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,GAAG,CAAA;;wEAE6C,CAAC,gBAAgB,CAAC,IAAI,CAC5F,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAChE,CAAC;IACF,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;QAClE,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC;YAC9B,SAAS;QACV,CAAC;QACD,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3D,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,KAAK,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC;YACvF,OAAO,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC;QAClH,CAAC;IACF,CAAC;IACD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACxB,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;QACjC,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC;QACjG,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC;QAC5D,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,OAAO,KAAK,GAAG,KAAK,QAAQ,EAAE,CAAC;YACjE,OAAO,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,qBAAqB,KAAK,EAAE,CAAC,CAAC;QAC7E,CAAC;IACF,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrationPlan.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/migrationPlan.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAErD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,KAAK,iBAAiB,EAAqB,MAAM,mDAAmD,CAAC;
|
|
1
|
+
{"version":3,"file":"migrationPlan.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/migrationPlan.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAErD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,KAAK,iBAAiB,EAAqB,MAAM,mDAAmD,CAAC;AAG9G,eAAO,MAAM,uBAAuB;4BAGD,OAAO;;;;2FAwBxC,CAAC;AAEH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,UAO3C"}
|
|
@@ -3,6 +3,7 @@ import { Effect } from "effect";
|
|
|
3
3
|
import { SqlClient } from "effect/sql";
|
|
4
4
|
import { betterAuthDatabase } from "#server/better-auth/adapters/database.ts";
|
|
5
5
|
import { storedRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
|
|
6
|
+
import { tables } from "./tables.js";
|
|
6
7
|
export const betterAuthMigrationPlan = Effect.fn("Identity.betterAuthMigrationPlan")(function* (options, role, safety = { throwOnUnsafe: true }) {
|
|
7
8
|
const database = yield* betterAuthDatabase();
|
|
8
9
|
const plan = yield* Effect.tryPromise(() => getMigrations({ ...storedRoleOptions(options, role), database }, safety));
|
|
@@ -17,12 +18,13 @@ export const betterAuthMigrationPlan = Effect.fn("Identity.betterAuthMigrationPl
|
|
|
17
18
|
let ddl = compiled === ";" ? "" : compiled;
|
|
18
19
|
if (role !== undefined) {
|
|
19
20
|
const sql = (yield* SqlClient.SqlClient).withoutTransforms();
|
|
20
|
-
const
|
|
21
|
+
const { user } = tables(options);
|
|
21
22
|
const value = `'${role.defaultRole.replaceAll("'", "''")}'`;
|
|
22
|
-
const identifier = sql `${sql(table)}`.compile()[0];
|
|
23
|
-
|
|
24
|
-
ddl +=
|
|
25
|
-
ddl += `
|
|
23
|
+
const identifier = sql `${sql(user.table)}`.compile()[0];
|
|
24
|
+
const column = sql `${sql(user.role)}`.compile()[0];
|
|
25
|
+
ddl += `\nalter table ${identifier} alter column ${column} set default ${value};\n`;
|
|
26
|
+
ddl += `update ${identifier} set ${column} = ${value} where ${column} is null;\n`;
|
|
27
|
+
ddl += `alter table ${identifier} alter column ${column} set not null;`;
|
|
26
28
|
}
|
|
27
29
|
return { ddl, missing };
|
|
28
30
|
});
|