@shivaedev/identity 0.19.0 → 0.20.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 +40 -0
- package/README.md +169 -77
- package/dist/PermissionSession.d.ts +11 -0
- package/dist/PermissionSession.d.ts.map +1 -0
- package/dist/PermissionSession.js +6 -0
- package/dist/PermissionSession.js.map +1 -0
- package/dist/authRefusal.d.ts +18 -0
- package/dist/authRefusal.d.ts.map +1 -0
- package/dist/authRefusal.js +11 -0
- package/dist/authRefusal.js.map +1 -0
- package/dist/client/AuthFailure.d.ts +18 -0
- package/dist/client/AuthFailure.d.ts.map +1 -0
- package/dist/client/AuthFailure.js +15 -0
- package/dist/client/AuthFailure.js.map +1 -0
- package/dist/client/AuthFailureCode.d.ts +4 -0
- package/dist/client/AuthFailureCode.d.ts.map +1 -0
- package/dist/client/AuthFailureCode.js +57 -0
- package/dist/client/AuthFailureCode.js.map +1 -0
- package/dist/client/adapters/authCall.d.ts +8 -0
- package/dist/client/adapters/authCall.d.ts.map +1 -0
- package/dist/client/adapters/authCall.js +31 -0
- package/dist/client/adapters/authCall.js.map +1 -0
- package/dist/client/adapters/authQuery.d.ts +5 -0
- package/dist/client/adapters/authQuery.d.ts.map +1 -0
- package/dist/client/adapters/authQuery.js +9 -0
- package/dist/client/adapters/authQuery.js.map +1 -0
- package/dist/client/adapters/authSession.d.ts +9 -0
- package/dist/client/adapters/authSession.d.ts.map +1 -0
- package/dist/client/adapters/authSession.js +20 -0
- package/dist/client/adapters/authSession.js.map +1 -0
- package/dist/client/adapters/changeEmail.d.ts +12 -0
- package/dist/client/adapters/changeEmail.d.ts.map +1 -0
- package/dist/client/adapters/changeEmail.js +5 -0
- package/dist/client/adapters/changeEmail.js.map +1 -0
- package/dist/roles.d.ts +16 -0
- package/dist/roles.d.ts.map +1 -0
- package/dist/roles.js +6 -0
- package/dist/roles.js.map +1 -0
- package/dist/server/UserDirectory.d.ts +14 -0
- package/dist/server/UserDirectory.d.ts.map +1 -0
- package/dist/server/UserDirectory.js +4 -0
- package/dist/server/UserDirectory.js.map +1 -0
- package/dist/server/better-auth/UndeclaredDefaultRole.d.ts +9 -0
- package/dist/server/better-auth/UndeclaredDefaultRole.d.ts.map +1 -0
- package/dist/server/better-auth/UndeclaredDefaultRole.js +9 -0
- package/dist/server/better-auth/UndeclaredDefaultRole.js.map +1 -0
- package/dist/server/better-auth/accountRoleSeed.d.ts +2 -2
- package/dist/server/better-auth/accountRoleSeed.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/acquire.d.ts +7 -0
- package/dist/server/better-auth/adapters/acquire.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/acquire.js +14 -0
- package/dist/server/better-auth/adapters/acquire.js.map +1 -0
- package/dist/server/better-auth/adapters/emailOptions.d.ts +2 -2
- package/dist/server/better-auth/adapters/emailOptions.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/emailOptions.js +13 -9
- package/dist/server/better-auth/adapters/emailOptions.js.map +1 -1
- package/dist/server/better-auth/adapters/hookRuntime.d.ts +7 -1
- package/dist/server/better-auth/adapters/hookRuntime.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/hookRuntime.js +9 -1
- package/dist/server/better-auth/adapters/hookRuntime.js.map +1 -1
- package/dist/server/better-auth/adapters/mount.d.ts +51 -40
- package/dist/server/better-auth/adapters/mount.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/mount.js +19 -6
- package/dist/server/better-auth/adapters/mount.js.map +1 -1
- package/dist/server/better-auth/adapters/oauthGrants.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/oauthGrants.js +17 -7
- package/dist/server/better-auth/adapters/oauthGrants.js.map +1 -1
- package/dist/server/better-auth/adapters/oauthProvider.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/oauthProvider.js +25 -2
- package/dist/server/better-auth/adapters/oauthProvider.js.map +1 -1
- package/dist/server/better-auth/adapters/profileStorage.d.ts +6 -0
- package/dist/server/better-auth/adapters/profileStorage.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/profileStorage.js +13 -0
- package/dist/server/better-auth/adapters/profileStorage.js.map +1 -0
- package/dist/server/better-auth/adapters/providerOnlyOptions.d.ts +3 -0
- package/dist/server/better-auth/adapters/providerOnlyOptions.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/providerOnlyOptions.js +56 -0
- package/dist/server/better-auth/adapters/providerOnlyOptions.js.map +1 -0
- package/dist/server/better-auth/adapters/response.d.ts +3 -1
- package/dist/server/better-auth/adapters/response.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/response.js +8 -6
- package/dist/server/better-auth/adapters/response.js.map +1 -1
- package/dist/server/better-auth/adapters/roleSeedOptions.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/roleSeedOptions.js +2 -1
- package/dist/server/better-auth/adapters/roleSeedOptions.js.map +1 -1
- package/dist/server/better-auth/adapters/signInPolicyOptions.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/signInPolicyOptions.js +3 -2
- package/dist/server/better-auth/adapters/signInPolicyOptions.js.map +1 -1
- package/dist/server/better-auth/adapters/testingCredentials.d.ts +4 -0
- package/dist/server/better-auth/adapters/testingCredentials.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/testingCredentials.js +8 -0
- package/dist/server/better-auth/adapters/testingCredentials.js.map +1 -0
- package/dist/server/better-auth/adapters/userDirectory.d.ts +7 -0
- package/dist/server/better-auth/adapters/userDirectory.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/userDirectory.js +20 -0
- package/dist/server/better-auth/adapters/userDirectory.js.map +1 -0
- 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 +4 -2
- package/dist/server/better-auth/assignRole.js.map +1 -1
- package/dist/server/better-auth/emails.d.ts +11 -8
- package/dist/server/better-auth/emails.d.ts.map +1 -1
- package/dist/server/better-auth/mountRoutes.d.ts +1 -0
- package/dist/server/better-auth/mountRoutes.d.ts.map +1 -1
- package/dist/server/better-auth/mountRoutes.js +1 -1
- package/dist/server/better-auth/mountRoutes.js.map +1 -1
- package/dist/server/better-auth/testing.d.ts +13 -39
- package/dist/server/better-auth/testing.d.ts.map +1 -1
- package/dist/server/better-auth/testing.js +44 -12
- package/dist/server/better-auth/testing.js.map +1 -1
- package/dist/server/better-auth/userDirectoryReads.d.ts +26 -0
- package/dist/server/better-auth/userDirectoryReads.d.ts.map +1 -0
- package/dist/server/better-auth/userDirectoryReads.js +42 -0
- package/dist/server/better-auth/userDirectoryReads.js.map +1 -0
- package/dist/server/better-auth/userProfiles.d.ts +4 -6
- package/dist/server/better-auth/userProfiles.d.ts.map +1 -1
- package/dist/server/better-auth/userProfiles.js +2 -11
- package/dist/server/better-auth/userProfiles.js.map +1 -1
- package/dist/server/oauthGrants.d.ts +4 -1
- package/dist/server/oauthGrants.d.ts.map +1 -1
- package/dist/server/oauthGrants.js.map +1 -1
- package/dist/server/permissions.d.ts.map +1 -1
- package/dist/server/permissions.js +2 -4
- package/dist/server/permissions.js.map +1 -1
- package/dist/server/resolveChanges.d.ts +8 -0
- package/dist/server/resolveChanges.d.ts.map +1 -0
- package/dist/server/resolveChanges.js +13 -0
- package/dist/server/resolveChanges.js.map +1 -0
- package/dist/server/session.d.ts +1 -1
- package/dist/server/session.d.ts.map +1 -1
- package/dist/server/session.js +10 -11
- package/dist/server/session.js.map +1 -1
- package/dist/server/tracing.d.ts.map +1 -1
- package/dist/server/tracing.js +3 -7
- package/dist/server/tracing.js.map +1 -1
- package/dist/sessions.d.ts +19 -3
- package/dist/sessions.d.ts.map +1 -1
- package/dist/users.d.ts +29 -0
- package/dist/users.d.ts.map +1 -0
- package/dist/users.js +18 -0
- package/dist/users.js.map +1 -0
- package/package.json +16 -17
- package/src/PermissionSession.ts +7 -0
- package/src/authRefusal.ts +13 -0
- package/src/client/AuthFailure.ts +19 -0
- package/src/client/AuthFailureCode.ts +58 -0
- package/src/client/adapters/authCall.ts +44 -0
- package/src/client/adapters/authQuery.ts +13 -0
- package/src/client/adapters/authSession.ts +30 -0
- package/src/client/adapters/changeEmail.ts +13 -0
- package/src/roles.ts +5 -0
- package/src/server/UserDirectory.ts +14 -0
- package/src/server/better-auth/UndeclaredDefaultRole.ts +9 -0
- package/src/server/better-auth/adapters/acquire.ts +17 -0
- package/src/server/better-auth/adapters/emailOptions.ts +21 -9
- package/src/server/better-auth/adapters/hookRuntime.ts +17 -3
- package/src/server/better-auth/adapters/mount.ts +38 -7
- package/src/server/better-auth/adapters/oauthGrants.ts +17 -7
- package/src/server/better-auth/adapters/oauthProvider.ts +32 -2
- package/src/server/better-auth/adapters/profileStorage.ts +18 -0
- package/src/server/better-auth/adapters/providerOnlyOptions.ts +63 -0
- package/src/server/better-auth/adapters/response.ts +15 -7
- package/src/server/better-auth/adapters/roleSeedOptions.ts +2 -1
- package/src/server/better-auth/adapters/signInPolicyOptions.ts +3 -2
- package/src/server/better-auth/adapters/testingCredentials.ts +9 -0
- package/src/server/better-auth/adapters/userDirectory.ts +33 -0
- package/src/server/better-auth/assignRole.ts +4 -2
- package/src/server/better-auth/emails.ts +11 -8
- package/src/server/better-auth/mountRoutes.ts +2 -1
- package/src/server/better-auth/testing.ts +68 -18
- package/src/server/better-auth/userDirectoryReads.ts +47 -0
- package/src/server/better-auth/userProfiles.ts +6 -12
- package/src/server/oauthGrants.ts +5 -1
- package/src/server/permissions.ts +2 -4
- package/src/server/resolveChanges.ts +24 -0
- package/src/server/session.ts +14 -11
- package/src/server/tracing.ts +4 -9
- package/src/users.ts +19 -0
- package/dist/server/better-auth/emailWindow.d.ts +0 -3
- package/dist/server/better-auth/emailWindow.d.ts.map +0 -1
- package/dist/server/better-auth/emailWindow.js +0 -23
- package/dist/server/better-auth/emailWindow.js.map +0 -1
- package/dist/server/commandChanges.d.ts +0 -4
- package/dist/server/commandChanges.d.ts.map +0 -1
- package/dist/server/commandChanges.js +0 -48
- package/dist/server/commandChanges.js.map +0 -1
- package/dist/server/sessionKeys.d.ts +0 -13
- package/dist/server/sessionKeys.d.ts.map +0 -1
- package/dist/server/sessionKeys.js +0 -27
- package/dist/server/sessionKeys.js.map +0 -1
- package/src/server/better-auth/emailWindow.ts +0 -27
- package/src/server/commandChanges.ts +0 -63
- package/src/server/sessionKeys.ts +0 -42
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { APIError } from "better-auth/api";
|
|
2
2
|
import { Effect, Exit } from "effect";
|
|
3
3
|
import { redact } from "@shivaedev/errors/redact.ts";
|
|
4
|
+
import { authRefusals } from "#authRefusal.ts";
|
|
4
5
|
export function roleSeedOptions(options, seed) {
|
|
5
6
|
if (seed === undefined) {
|
|
6
7
|
return options;
|
|
@@ -22,7 +23,7 @@ export function roleSeedOptions(options, seed) {
|
|
|
22
23
|
const userId = typeof result === "object" && typeof result.data.userId === "string" ? result.data.userId : session.userId;
|
|
23
24
|
const exit = await Effect.runPromise(Effect.exit(seed.onSignIn(userId).pipe(Effect.tapCause((cause) => Effect.logError("Account role seed failed", redact(cause))))), { signal: endpoint?.request?.signal });
|
|
24
25
|
if (Exit.isFailure(exit)) {
|
|
25
|
-
throw new APIError("SERVICE_UNAVAILABLE", { code:
|
|
26
|
+
throw new APIError("SERVICE_UNAVAILABLE", { code: authRefusals.roleSeedFailed.wire, message: "Sign-in is temporarily unavailable" });
|
|
26
27
|
}
|
|
27
28
|
return result;
|
|
28
29
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"roleSeedOptions.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/roleSeedOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"roleSeedOptions.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/roleSeedOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG/C,MAAM,UAAU,eAAe,CAAI,OAA0B,EAAE,IAAoC;IAClG,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO,OAAO,CAAC;IAChB,CAAC;IACD,MAAM,GAAG,GAAG,OAAO,CAAC,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC;IAC3D,OAAO;QACN,GAAG,OAAO;QACV,aAAa,EAAE;YACd,GAAG,OAAO,CAAC,aAAa;YACxB,OAAO,EAAE;gBACR,GAAG,OAAO,CAAC,aAAa,EAAE,OAAO;gBACjC,MAAM,EAAE;oBACP,GAAG,OAAO,CAAC,aAAa,EAAE,OAAO,EAAE,MAAM;oBACzC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE;wBACnC,MAAM,MAAM,GAAG,MAAM,GAAG,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;wBAC9C,IAAI,MAAM,KAAK,KAAK,EAAE,CAAC;4BACtB,OAAO,MAAM,CAAC;wBACf,CAAC;wBACD,MAAM,MAAM,GAAG,OAAO,MAAM,KAAK,QAAQ,IAAI,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;wBAC1H,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,UAAU,CACnC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,0BAA0B,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAC/H,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,CACrC,CAAC;wBACF,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;4BAC1B,MAAM,IAAI,QAAQ,CAAC,qBAAqB,EAAE,EAAE,IAAI,EAAE,YAAY,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,EAAE,oCAAoC,EAAE,CAAC,CAAC;wBACtI,CAAC;wBACD,OAAO,MAAM,CAAC;oBACf,CAAC;iBACD;aACD;SACD;KACD,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signInPolicyOptions.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/signInPolicyOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAErG,OAAO,EAAE,MAAM,EAAQ,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"signInPolicyOptions.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/signInPolicyOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAErG,OAAO,EAAE,MAAM,EAAQ,MAAM,QAAQ,CAAC;AAGtC,OAAO,EAAe,KAAK,aAAa,EAAE,KAAK,UAAU,EAAE,MAAM,mCAAmC,CAAC;AA2BrG,eAAO,MAAM,mBAAmB,GAAgC,CAAC,kEAGjD,OAAO,CAAC,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gBA2CpC,CAAC"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { APIError } from "better-auth/api";
|
|
2
2
|
import { Effect, Exit } from "effect";
|
|
3
3
|
import { redact } from "@shivaedev/errors/redact.ts";
|
|
4
|
+
import { authRefusals } from "#authRefusal.ts";
|
|
4
5
|
import { fromStorage } from "#server/better-auth/signInGate.ts";
|
|
5
6
|
const REFUSED_MESSAGE = "This account may not sign in";
|
|
6
7
|
const UNAVAILABLE_MESSAGE = "Sign-in is temporarily unavailable";
|
|
7
|
-
const refused = { error:
|
|
8
|
-
const unavailable = { error:
|
|
8
|
+
const refused = { error: authRefusals.signInRefused.wire, errorDescription: REFUSED_MESSAGE };
|
|
9
|
+
const unavailable = { error: authRefusals.signInUnavailable.wire, errorDescription: UNAVAILABLE_MESSAGE };
|
|
9
10
|
function logged(effect) {
|
|
10
11
|
return Effect.tapCause(effect, (cause) => Effect.logError("Sign-in policy check failed", redact(cause)));
|
|
11
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signInPolicyOptions.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/signInPolicyOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AACrD,OAAO,EAAE,WAAW,EAAuC,MAAM,mCAAmC,CAAC;AAKrG,MAAM,eAAe,GAAG,8BAA8B,CAAC;AACvD,MAAM,mBAAmB,GAAG,oCAAoC,CAAC;AACjE,MAAM,OAAO,GAA2B,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"signInPolicyOptions.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/signInPolicyOptions.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"testingCredentials.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/testingCredentials.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,eAAO,MAAM,aAAa,qCAAmE,CAAC;AAE9F,eAAO,MAAM,kBAAkB,wEAG7B,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { generateRandomString, makeSignature } from "better-auth/crypto";
|
|
2
|
+
import { Effect } from "effect";
|
|
3
|
+
export const testUserEmail = Effect.sync(() => `test-${generateRandomString(8)}@example.com`);
|
|
4
|
+
export const signedSessionToken = Effect.fnUntraced(function* (token, secret) {
|
|
5
|
+
const signature = yield* Effect.promise(() => makeSignature(token, secret));
|
|
6
|
+
return `${token}.${signature}`;
|
|
7
|
+
});
|
|
8
|
+
//# sourceMappingURL=testingCredentials.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"testingCredentials.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/testingCredentials.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,oBAAoB,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;AAE9F,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,KAAa,EAAE,MAAc;IAC3F,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5E,OAAO,GAAG,KAAK,IAAI,SAAS,EAAE,CAAC;AAChC,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { Layer } from "effect";
|
|
2
|
+
import { SqlClient } from "effect/sql";
|
|
3
|
+
import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
|
|
4
|
+
import { UserDirectory } from "#server/UserDirectory.ts";
|
|
5
|
+
import type { AuthTableOptions } from "./tables.ts";
|
|
6
|
+
export declare function betterAuthUserDirectory<TRole extends string>(access: Pick<AccessPolicy<TRole>, "Role" | "hasPermission">, options?: AuthTableOptions): Layer.Layer<UserDirectory, never, SqlClient.SqlClient>;
|
|
7
|
+
//# sourceMappingURL=userDirectory.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"userDirectory.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/userDirectory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAAkB,MAAM,QAAQ,CAAC;AAEvD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAIjE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,wBAAgB,uBAAuB,CAAC,KAAK,SAAS,MAAM,EAC3D,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,eAAe,CAAC,EAC3D,OAAO,CAAC,EAAE,gBAAgB,0DAoB1B"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { Effect, Layer, Option, Schema } from "effect";
|
|
2
|
+
import * as Reactivity from "effect/reactivity/Reactivity";
|
|
3
|
+
import { SqlClient } from "effect/sql";
|
|
4
|
+
import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
5
|
+
import { assignRole } from "#server/better-auth/assignRole.ts";
|
|
6
|
+
import { userDirectoryReads } from "#server/better-auth/userDirectoryReads.ts";
|
|
7
|
+
import { UserDirectory } from "#server/UserDirectory.ts";
|
|
8
|
+
export function betterAuthUserDirectory(access, options) {
|
|
9
|
+
return Layer.effect(UserDirectory)(Effect.gen(function* () {
|
|
10
|
+
const sql = yield* SqlClient.SqlClient;
|
|
11
|
+
const existing = yield* Effect.serviceOption(Reactivity.Reactivity);
|
|
12
|
+
const reactivity = Option.isSome(existing) ? existing.value : yield* Reactivity.make;
|
|
13
|
+
const reads = yield* userDirectoryReads(access, options);
|
|
14
|
+
return {
|
|
15
|
+
...reads,
|
|
16
|
+
assignRole: (userId, role) => Schema.decodeUnknownEffect(access.Role)(role).pipe(Effect.mapError(() => new AuthUnavailable({ message: "User role is not declared by the application" })), Effect.flatMap((declared) => assignRole(access, userId, declared, options)), Effect.provideService(SqlClient.SqlClient, sql), Effect.provideService(Reactivity.Reactivity, reactivity)),
|
|
17
|
+
};
|
|
18
|
+
}));
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=userDirectory.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"userDirectory.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/userDirectory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACvD,OAAO,KAAK,UAAU,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGzD,MAAM,UAAU,uBAAuB,CACtC,MAA2D,EAC3D,OAA0B;IAE1B,OAAO,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,CACjC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACnB,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC;QACvC,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACpE,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC;QACrF,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACzD,OAAO;YACN,GAAG,KAAK;YACR,UAAU,EAAE,CAAC,MAAc,EAAE,IAAY,EAAE,EAAE,CAC5C,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CACjD,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,eAAe,CAAC,EAAE,OAAO,EAAE,8CAA8C,EAAE,CAAC,CAAC,EACvG,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,EAC3E,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC,EAC/C,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,UAAU,EAAE,UAAU,CAAC,CACxD;SACF,CAAC;IACH,CAAC,CAAC,CACF,CAAC;AACH,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Effect } from "effect";
|
|
2
2
|
import { SqlClient } from "effect/sql";
|
|
3
3
|
import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
|
|
4
|
-
import { LastRoleAssigner } from "@shivaedev/access/roles.ts";
|
|
5
4
|
import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
5
|
+
import { LastRoleAssigner } from "#roles.ts";
|
|
6
6
|
import { type AuthTableOptions } from "#server/better-auth/adapters/tables.ts";
|
|
7
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>;
|
|
8
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;
|
|
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;AAEjE,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAE1E,OAAO,EAAe,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC1D,OAAO,EAAE,KAAK,gBAAgB,EAAU,MAAM,wCAAwC,CAAC;AAOvF,eAAO,MAAM,UAAU,GAA+C,KAAK,SAAS,MAAM,0OAwCxF,CAAC"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { Effect, Option, Schema } from "effect";
|
|
2
2
|
import * as Reactivity from "effect/reactivity/Reactivity";
|
|
3
3
|
import { SqlClient, SqlSchema } from "effect/sql";
|
|
4
|
-
import {
|
|
4
|
+
import { invalidationKeys } from "@shivaedev/changes/keys.ts";
|
|
5
5
|
import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
6
6
|
import { invalidateOnCommit, transact } from "@shivaedev/sql/transact.ts";
|
|
7
|
+
import { AssignRoles, LastRoleAssigner } from "#roles.ts";
|
|
7
8
|
import { tables } from "#server/better-auth/adapters/tables.ts";
|
|
9
|
+
import { roleKeys, userKeys } from "#users.ts";
|
|
8
10
|
function unavailable() {
|
|
9
11
|
return new AuthUnavailable({ message: "Could not access app users" });
|
|
10
12
|
}
|
|
@@ -40,7 +42,7 @@ export const assignRole = Effect.fn("Identity.assignRole")(function* (access, us
|
|
|
40
42
|
}
|
|
41
43
|
}
|
|
42
44
|
yield* sql `update ${sql(user.table)} set ${sql(user.role)} = ${role}, ${sql(user.updatedAt)} = now() where id = ${userId}`;
|
|
43
|
-
yield* invalidateOnCommit([
|
|
45
|
+
yield* invalidateOnCommit(invalidationKeys([userKeys.item(userId), roleKeys.item(userId)]));
|
|
44
46
|
return true;
|
|
45
47
|
}).pipe(transact({ onSqlError: unavailable }), Effect.provideService(Reactivity.Reactivity, reactivity));
|
|
46
48
|
});
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"assignRole.js","sourceRoot":"","sources":["../../../src/server/better-auth/assignRole.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,24 +1,27 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
import type { Duration, Effect } from "effect";
|
|
1
|
+
import type { Duration, Effect, Redacted } from "effect";
|
|
3
2
|
import type { BetterAuthHookError } from "./databaseHooks.ts";
|
|
4
3
|
interface Message {
|
|
5
|
-
readonly url: string
|
|
6
|
-
readonly user:
|
|
4
|
+
readonly url: Redacted.Redacted<string>;
|
|
5
|
+
readonly user: {
|
|
6
|
+
id: string;
|
|
7
|
+
email: string;
|
|
8
|
+
name: string;
|
|
9
|
+
};
|
|
7
10
|
}
|
|
8
11
|
export type AuthEmail = Message & ({
|
|
9
12
|
readonly _tag: "ConfirmAccount";
|
|
10
|
-
readonly token: string
|
|
13
|
+
readonly token: Redacted.Redacted<string>;
|
|
11
14
|
} | {
|
|
12
15
|
readonly _tag: "ApproveEmailChange";
|
|
13
|
-
readonly token: string
|
|
16
|
+
readonly token: Redacted.Redacted<string>;
|
|
14
17
|
readonly newEmail: string;
|
|
15
18
|
} | {
|
|
16
19
|
readonly _tag: "ConfirmNewAddress";
|
|
17
|
-
readonly token: string
|
|
20
|
+
readonly token: Redacted.Redacted<string>;
|
|
18
21
|
readonly newEmail: string;
|
|
19
22
|
} | {
|
|
20
23
|
readonly _tag: "ResetPassword";
|
|
21
|
-
readonly token: string
|
|
24
|
+
readonly token: Redacted.Redacted<string>;
|
|
22
25
|
} | {
|
|
23
26
|
readonly _tag: "AccountAlreadyExists";
|
|
24
27
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emails.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/emails.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"emails.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/emails.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AACzD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,UAAU,OAAO;IAChB,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACxC,QAAQ,CAAC,IAAI,EAAE;QACd,EAAE,EAAE,MAAM,CAAC;QACX,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;KACb,CAAC;CACF;AAED,MAAM,MAAM,SAAS,GAAG,OAAO,GAC9B,CACG;IAAE,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;CAAE,GAC9E;IAAE,QAAQ,CAAC,IAAI,EAAE,oBAAoB,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAC7G;IAAE,QAAQ,CAAC,IAAI,EAAE,mBAAmB,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAC5G;IAAE,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;CAAE,GAC7E;IAAE,QAAQ,CAAC,IAAI,EAAE,sBAAsB,CAAA;CAAE,CAC3C,CAAC;AAEH,MAAM,WAAW,gBAAgB,CAAC,CAAC,GAAG,KAAK;IAC1C,QAAQ,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,SAAS,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC;IACtF,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IAC7D,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC;CACjC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Context, Effect } from "effect";
|
|
2
2
|
import { HttpRouter, type HttpServerError, type HttpServerRequest, type HttpServerResponse } from "effect/http";
|
|
3
3
|
declare const AuthRouteHandler_base: Context.ServiceClass<AuthRouteHandler, "@shivaedev/identity/AuthRouteHandler", {
|
|
4
|
+
readonly basePath?: `/${string}` | "" | undefined;
|
|
4
5
|
readonly handle: Effect.Effect<HttpServerResponse.HttpServerResponse, HttpServerError.RequestError, HttpServerRequest.HttpServerRequest>;
|
|
5
6
|
}>;
|
|
6
7
|
export declare class AuthRouteHandler extends AuthRouteHandler_base {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mountRoutes.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/mountRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,KAAK,eAAe,EAAE,KAAK,iBAAiB,EAAE,KAAK,kBAAkB,EAAE,MAAM,aAAa,CAAC;;
|
|
1
|
+
{"version":3,"file":"mountRoutes.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/mountRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,KAAK,eAAe,EAAE,KAAK,iBAAiB,EAAE,KAAK,kBAAkB,EAAE,MAAM,aAAa,CAAC;;wBAK1F,IAAI,MAAM,EAAE,GAAG,EAAE,GAAG,SAAS;qBAChC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,kBAAkB,EAAE,eAAe,CAAC,YAAY,EAAE,iBAAiB,CAAC,iBAAiB,CAAC;;AAJ1I,qBAAa,gBAAiB,SAAQ,qBAMK;CAAG;AAE9C,eAAO,MAAM,WAAW,iRAKvB,CAAC"}
|
|
@@ -4,6 +4,6 @@ export class AuthRouteHandler extends Context.Service()("@shivaedev/identity/Aut
|
|
|
4
4
|
}
|
|
5
5
|
export const mountRoutes = HttpRouter.use((router) => Effect.gen(function* () {
|
|
6
6
|
const handler = yield* AuthRouteHandler;
|
|
7
|
-
yield* router.add("*", "/api/auth
|
|
7
|
+
yield* router.add("*", `${handler.basePath ?? "/api/auth"}/*`, handler.handle);
|
|
8
8
|
}));
|
|
9
9
|
//# sourceMappingURL=mountRoutes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mountRoutes.js","sourceRoot":"","sources":["../../../src/server/better-auth/mountRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAE,UAAU,EAAyE,MAAM,aAAa,CAAC;AAEhH,MAAM,OAAO,gBAAiB,SAAQ,OAAO,CAAC,OAAO,
|
|
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,EAMlD,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,GAAG,OAAO,CAAC,QAAQ,IAAI,WAAW,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;AAChF,CAAC,CAAC,CACF,CAAC"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
import type { AuthContext } from "better-auth";
|
|
2
|
-
import type { testUtils } from "better-auth/plugins";
|
|
3
2
|
import { Effect } from "effect";
|
|
4
|
-
type TestContext = ReturnType<ReturnType<typeof testUtils>["init"]>["context"];
|
|
5
3
|
type AccountContext = Pick<AuthContext, "internalAdapter">;
|
|
4
|
+
type SessionContext = AccountContext & Pick<AuthContext, "sessionConfig" | "secret" | "authCookies" | "baseURL">;
|
|
6
5
|
export declare const signedInUser: (auth: {
|
|
7
|
-
readonly $context: Promise<
|
|
6
|
+
readonly $context: Promise<SessionContext>;
|
|
8
7
|
}, args_1: Partial<{
|
|
9
8
|
id: string;
|
|
10
9
|
createdAt: Date;
|
|
@@ -18,40 +17,10 @@ export declare const signedInUser: (auth: {
|
|
|
18
17
|
readonly providerId: string;
|
|
19
18
|
readonly accountId: string;
|
|
20
19
|
}[];
|
|
21
|
-
}) => Effect.Effect<
|
|
22
|
-
user: import("better-auth").User;
|
|
23
|
-
headers: Headers;
|
|
24
|
-
cookies: import("better-auth/plugins").TestCookie[];
|
|
25
|
-
token: string;
|
|
26
|
-
session: {
|
|
27
|
-
id: string;
|
|
28
|
-
createdAt: Date;
|
|
29
|
-
updatedAt: Date;
|
|
30
|
-
userId: string;
|
|
31
|
-
token: string;
|
|
32
|
-
ipAddress?: string | null | undefined;
|
|
33
|
-
userAgent?: string | null | undefined;
|
|
34
|
-
expiresAt: Date;
|
|
35
|
-
};
|
|
36
|
-
}, never, never>;
|
|
20
|
+
}) => Effect.Effect<import("better-auth/plugins").LoginResult, never, never>;
|
|
37
21
|
export declare const signInAgain: (auth: {
|
|
38
|
-
readonly $context: Promise<
|
|
39
|
-
}, userId: string) => Effect.Effect<
|
|
40
|
-
user: import("better-auth").User;
|
|
41
|
-
headers: Headers;
|
|
42
|
-
cookies: import("better-auth/plugins").TestCookie[];
|
|
43
|
-
token: string;
|
|
44
|
-
session: {
|
|
45
|
-
id: string;
|
|
46
|
-
createdAt: Date;
|
|
47
|
-
updatedAt: Date;
|
|
48
|
-
userId: string;
|
|
49
|
-
token: string;
|
|
50
|
-
ipAddress?: string | null | undefined;
|
|
51
|
-
userAgent?: string | null | undefined;
|
|
52
|
-
expiresAt: Date;
|
|
53
|
-
};
|
|
54
|
-
}, never, never>;
|
|
22
|
+
readonly $context: Promise<SessionContext>;
|
|
23
|
+
}, userId: string) => Effect.Effect<import("better-auth/plugins").LoginResult, never, never>;
|
|
55
24
|
export declare function storedProviderAccounts(auth: {
|
|
56
25
|
readonly $context: Promise<AccountContext>;
|
|
57
26
|
}, userId: string): Promise<{
|
|
@@ -63,7 +32,7 @@ export declare function storedProviderAccounts(auth: {
|
|
|
63
32
|
providerId: string;
|
|
64
33
|
}[]>;
|
|
65
34
|
export declare const passwordUser: (auth: {
|
|
66
|
-
readonly $context: Promise<
|
|
35
|
+
readonly $context: Promise<AccountContext & {
|
|
67
36
|
readonly password: Pick<AuthContext["password"], "hash">;
|
|
68
37
|
}>;
|
|
69
38
|
}, args_1: Partial<{
|
|
@@ -74,10 +43,15 @@ export declare const passwordUser: (auth: {
|
|
|
74
43
|
emailVerified: boolean;
|
|
75
44
|
name: string;
|
|
76
45
|
image?: string | null | undefined;
|
|
77
|
-
}> & Record<string, unknown> & {
|
|
46
|
+
}> & Record<string, unknown> & ({
|
|
78
47
|
readonly email: string;
|
|
48
|
+
} & ({
|
|
79
49
|
readonly password: string;
|
|
80
|
-
|
|
50
|
+
readonly passwordHash?: never;
|
|
51
|
+
} | {
|
|
52
|
+
readonly passwordHash: string;
|
|
53
|
+
readonly password?: never;
|
|
54
|
+
}))) => Effect.Effect<Record<string, any> & {
|
|
81
55
|
id: string;
|
|
82
56
|
createdAt: Date;
|
|
83
57
|
updatedAt: Date;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/testing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/testing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C,OAAO,EAAS,MAAM,EAAE,MAAM,QAAQ,CAAC;AAMvC,KAAK,cAAc,GAAG,IAAI,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;AAC3D,KAAK,cAAc,GAAG,cAAc,GAAG,IAAI,CAAC,WAAW,EAAE,eAAe,GAAG,QAAQ,GAAG,aAAa,GAAG,SAAS,CAAC,CAAC;AAqBjH,eAAO,MAAM,YAAY;uBACG,OAAO,CAAC,cAAc,CAAC;;;;;;;;;;gCAKrB,SAAS;QAAE,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;KAAE,EAAE;4EASlG,CAAC;AAEH,eAAO,MAAM,WAAW;uBACI,OAAO,CAAC,cAAc,CAAC;4FA2BjD,CAAC;AAEH,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IAAE,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;CAAE,EAAE,MAAM,EAAE,MAAM;;;;;;;KAWhH;AAED,eAAO,MAAM,YAAY;uBACG,OAAO,CAAC,cAAc,GAAG;QAAE,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,CAAA;KAAE,CAAC;;;;;;;;;;oBAK/E,MAAM;;uBACf,MAAM;4BAA0B,KAAK;;2BACjC,MAAM;wBAAsB,KAAK;;;;;;;;;gBAU7D,CAAC"}
|
|
@@ -1,19 +1,51 @@
|
|
|
1
1
|
import { Clock, Effect } from "effect";
|
|
2
|
+
import { signedSessionToken, testUserEmail } from "#server/better-auth/adapters/testingCredentials.ts";
|
|
3
|
+
function saveUser(context, fields) {
|
|
4
|
+
return Effect.flatMap(testUserEmail, (email) => Effect.promise(() => context.internalAdapter.createUser({ email, emailVerified: true, image: null, name: "Test User", ...fields }, { method: "test" })));
|
|
5
|
+
}
|
|
6
|
+
function cookieSameSite(value) {
|
|
7
|
+
switch (value?.toLowerCase()) {
|
|
8
|
+
case "strict":
|
|
9
|
+
return "Strict";
|
|
10
|
+
case "none":
|
|
11
|
+
return "None";
|
|
12
|
+
default:
|
|
13
|
+
return "Lax";
|
|
14
|
+
}
|
|
15
|
+
}
|
|
2
16
|
export const signedInUser = Effect.fnUntraced(function* (auth, { providerAccounts = [], ...fields }) {
|
|
3
|
-
const
|
|
4
|
-
const user = yield*
|
|
17
|
+
const context = yield* Effect.promise(() => auth.$context);
|
|
18
|
+
const user = yield* saveUser(context, fields);
|
|
5
19
|
for (const { providerId, accountId } of providerAccounts) {
|
|
6
|
-
yield* Effect.promise(() => internalAdapter.createAccount({ accountId, providerId, userId: user.id }));
|
|
20
|
+
yield* Effect.promise(() => context.internalAdapter.createAccount({ accountId, providerId, userId: user.id }));
|
|
7
21
|
}
|
|
8
22
|
return yield* signInAgain(auth, user.id);
|
|
9
23
|
});
|
|
10
24
|
export const signInAgain = Effect.fnUntraced(function* (auth, userId) {
|
|
11
|
-
const {
|
|
25
|
+
const { internalAdapter, sessionConfig, authCookies, secret, baseURL } = yield* Effect.promise(() => auth.$context);
|
|
12
26
|
const now = yield* Clock.currentTimeMillis;
|
|
13
|
-
const
|
|
27
|
+
const session = yield* Effect.promise(() => internalAdapter.createSession(userId, false, {}, true));
|
|
14
28
|
const expiresAt = new Date(now + sessionConfig.expiresIn * 1000);
|
|
15
|
-
yield* Effect.promise(() => internalAdapter.updateSession(
|
|
16
|
-
|
|
29
|
+
yield* Effect.promise(() => internalAdapter.updateSession(session.token, { expiresAt }));
|
|
30
|
+
const user = yield* Effect.promise(() => internalAdapter.findUserById(userId));
|
|
31
|
+
if (user === null) {
|
|
32
|
+
return yield* Effect.die(`User not found: ${userId}`);
|
|
33
|
+
}
|
|
34
|
+
const value = yield* signedSessionToken(session.token, secret);
|
|
35
|
+
const { name, attributes } = authCookies.sessionToken;
|
|
36
|
+
const cookies = [
|
|
37
|
+
{
|
|
38
|
+
domain: URL.canParse(baseURL) ? new URL(baseURL).hostname : "localhost",
|
|
39
|
+
httpOnly: attributes.httpOnly ?? true,
|
|
40
|
+
name,
|
|
41
|
+
path: attributes.path || "/",
|
|
42
|
+
sameSite: cookieSameSite(attributes.sameSite),
|
|
43
|
+
secure: attributes.secure ?? false,
|
|
44
|
+
value,
|
|
45
|
+
...(attributes.maxAge ? { expires: Math.floor(now / 1000) + attributes.maxAge } : {}),
|
|
46
|
+
},
|
|
47
|
+
];
|
|
48
|
+
return { cookies, headers: new Headers({ cookie: `${name}=${value}` }), session: { ...session, expiresAt }, token: session.token, user };
|
|
17
49
|
});
|
|
18
50
|
export async function storedProviderAccounts(auth, userId) {
|
|
19
51
|
const { internalAdapter } = await auth.$context;
|
|
@@ -27,11 +59,11 @@ export async function storedProviderAccounts(auth, userId) {
|
|
|
27
59
|
providerId,
|
|
28
60
|
}));
|
|
29
61
|
}
|
|
30
|
-
export const passwordUser = Effect.fnUntraced(function* (auth, { password, ...fields }) {
|
|
31
|
-
const
|
|
32
|
-
const user = yield*
|
|
33
|
-
const hash = yield* Effect.promise(() =>
|
|
34
|
-
yield* Effect.promise(() => internalAdapter.createAccount({ accountId: user.id, password: hash, providerId: "credential", userId: user.id }));
|
|
62
|
+
export const passwordUser = Effect.fnUntraced(function* (auth, { password, passwordHash, ...fields }) {
|
|
63
|
+
const context = yield* Effect.promise(() => auth.$context);
|
|
64
|
+
const user = yield* saveUser(context, fields);
|
|
65
|
+
const hash = passwordHash ?? (yield* Effect.promise(() => context.password.hash(password)));
|
|
66
|
+
yield* Effect.promise(() => context.internalAdapter.createAccount({ accountId: user.id, password: hash, providerId: "credential", userId: user.id }));
|
|
35
67
|
return user;
|
|
36
68
|
});
|
|
37
69
|
//# sourceMappingURL=testing.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../src/server/better-auth/testing.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../src/server/better-auth/testing.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { Effect, Option } from "effect";
|
|
2
|
+
import { SqlClient } from "effect/sql";
|
|
3
|
+
import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
|
|
4
|
+
import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
5
|
+
import { type AuthTableOptions } from "#server/better-auth/adapters/tables.ts";
|
|
6
|
+
export declare const userDirectoryReads: <TRole extends string>(access: Pick<AccessPolicy<TRole>, "Role">, options?: AuthTableOptions | undefined) => Effect.Effect<{
|
|
7
|
+
list: (input: {
|
|
8
|
+
readonly cursor?: string;
|
|
9
|
+
readonly limit: number;
|
|
10
|
+
}) => Effect.Effect<{
|
|
11
|
+
next: Option.Option<string>;
|
|
12
|
+
users: {
|
|
13
|
+
readonly createdAt: import("effect/DateTime").Utc;
|
|
14
|
+
readonly email: string;
|
|
15
|
+
readonly id: string;
|
|
16
|
+
readonly name: string;
|
|
17
|
+
readonly role: TRole;
|
|
18
|
+
}[];
|
|
19
|
+
}, AuthUnavailable, never>;
|
|
20
|
+
names: (ids: readonly string[]) => Effect.Effect<{
|
|
21
|
+
readonly id: string;
|
|
22
|
+
readonly name: string;
|
|
23
|
+
}[], AuthUnavailable, never>;
|
|
24
|
+
role: (id: string) => Effect.Effect<TRole, AuthUnavailable | NotFound, never>;
|
|
25
|
+
}, never, SqlClient.SqlClient>;
|
|
26
|
+
//# sourceMappingURL=userDirectoryReads.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"userDirectoryReads.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/userDirectoryReads.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,KAAK,gBAAgB,EAAU,MAAM,wCAAwC,CAAC;AAOvF,eAAO,MAAM,kBAAkB,GAAgC,KAAK,SAAS,MAAM;;;;;;;;;;;;;;iBA6BpE,SAAS,MAAM,EAAE;;;;;8BAM9B,CAAC"}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import { Effect, Option, Schema } from "effect";
|
|
2
|
+
import { SqlClient, SqlSchema } from "effect/sql";
|
|
3
|
+
import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
4
|
+
import { tables } from "#server/better-auth/adapters/tables.ts";
|
|
5
|
+
import { AccountName, DirectoryUser, UserListInput } from "#users.ts";
|
|
6
|
+
function unavailable() {
|
|
7
|
+
return new AuthUnavailable({ message: "Could not access app users" });
|
|
8
|
+
}
|
|
9
|
+
export const userDirectoryReads = Effect.fnUntraced(function* (access, options) {
|
|
10
|
+
const sql = (yield* SqlClient.SqlClient).withoutTransforms();
|
|
11
|
+
const { user } = tables(options);
|
|
12
|
+
const readPage = SqlSchema.findAll({
|
|
13
|
+
execute: ({ cursor, limit }) => sql `select id, ${sql(user.name)} as name, ${sql(user.email)} as email,
|
|
14
|
+
${sql(user.role)} as role, ${sql(user.createdAt)} as "createdAt" from ${sql(user.table)}
|
|
15
|
+
where id > ${cursor ?? ""} order by id limit ${limit + 1}`,
|
|
16
|
+
Request: UserListInput,
|
|
17
|
+
Result: Schema.Struct({ ...DirectoryUser.fields, role: access.Role }),
|
|
18
|
+
});
|
|
19
|
+
const readRole = SqlSchema.findOneOption({
|
|
20
|
+
execute: (id) => sql `select ${sql(user.role)} as role from ${sql(user.table)} where id = ${id}`,
|
|
21
|
+
Request: Schema.String,
|
|
22
|
+
Result: Schema.Struct({ role: access.Role }),
|
|
23
|
+
});
|
|
24
|
+
const readNames = SqlSchema.findAll({
|
|
25
|
+
execute: (ids) => sql `select id, ${sql(user.name)} as name from ${sql(user.table)} where id in ${sql.in(ids)} order by id`,
|
|
26
|
+
Request: Schema.Array(Schema.String),
|
|
27
|
+
Result: AccountName,
|
|
28
|
+
});
|
|
29
|
+
return {
|
|
30
|
+
list: Effect.fn("UserDirectory.list")(function* (input) {
|
|
31
|
+
const rows = yield* readPage(input).pipe(Effect.mapError(unavailable));
|
|
32
|
+
const users = rows.slice(0, input.limit);
|
|
33
|
+
return { next: rows.length > input.limit ? Option.fromUndefinedOr(users.at(-1)?.id) : Option.none(), users };
|
|
34
|
+
}),
|
|
35
|
+
names: (ids) => (ids.length === 0 ? Effect.succeed([]) : readNames(ids).pipe(Effect.mapError(unavailable))),
|
|
36
|
+
role: Effect.fn("UserDirectory.role")(function* (id) {
|
|
37
|
+
const found = yield* readRole(id).pipe(Effect.mapError(unavailable));
|
|
38
|
+
return Option.isSome(found) ? found.value.role : yield* new NotFound({ message: "User not found" });
|
|
39
|
+
}),
|
|
40
|
+
};
|
|
41
|
+
});
|
|
42
|
+
//# sourceMappingURL=userDirectoryReads.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"userDirectoryReads.js","sourceRoot":"","sources":["../../../src/server/better-auth/userDirectoryReads.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import type { Auth } from "better-auth";
|
|
2
1
|
import { Effect } from "effect";
|
|
3
2
|
import type { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
4
3
|
export interface UserProfile {
|
|
@@ -6,9 +5,8 @@ export interface UserProfile {
|
|
|
6
5
|
readonly image: string | null;
|
|
7
6
|
readonly name: string;
|
|
8
7
|
}
|
|
9
|
-
export
|
|
10
|
-
readonly
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
}, userIds: readonly string[]) => Effect.Effect<readonly UserProfile[], AuthUnavailable, never>;
|
|
8
|
+
export interface UserProfileStorage {
|
|
9
|
+
readonly findByIds: (userIds: readonly string[]) => Effect.Effect<readonly UserProfile[], AuthUnavailable>;
|
|
10
|
+
}
|
|
11
|
+
export declare const userProfiles: (storage: UserProfileStorage, userIds: readonly string[]) => Effect.Effect<readonly UserProfile[], AuthUnavailable, never>;
|
|
14
12
|
//# sourceMappingURL=userProfiles.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userProfiles.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/userProfiles.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"userProfiles.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/userProfiles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAErE,MAAM,WAAW,WAAW;IAC3B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,kBAAkB;IAClC,QAAQ,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,KAAK,MAAM,CAAC,MAAM,CAAC,SAAS,WAAW,EAAE,EAAE,eAAe,CAAC,CAAC;CAC3G;AAED,eAAO,MAAM,YAAY,4HAUvB,CAAC"}
|
|
@@ -1,19 +1,10 @@
|
|
|
1
1
|
import { Effect } from "effect";
|
|
2
|
-
|
|
3
|
-
export const userProfiles = Effect.fn("Identity.userProfiles")(function* (auth, userIds) {
|
|
2
|
+
export const userProfiles = Effect.fn("Identity.userProfiles")(function* (storage, userIds) {
|
|
4
3
|
const ids = [...new Set(userIds)];
|
|
5
4
|
if (ids.length === 0) {
|
|
6
5
|
return [];
|
|
7
6
|
}
|
|
8
|
-
const users = yield*
|
|
9
|
-
const { adapter } = await auth.$context;
|
|
10
|
-
return adapter.findMany({
|
|
11
|
-
limit: ids.length,
|
|
12
|
-
model: "user",
|
|
13
|
-
select: ["id", "name", "image"],
|
|
14
|
-
where: [{ field: "id", operator: "in", value: ids }],
|
|
15
|
-
});
|
|
16
|
-
}).pipe(Effect.catch((error) => providerFailure(error.cause)));
|
|
7
|
+
const users = yield* storage.findByIds(ids);
|
|
17
8
|
return users.map(({ id, name, image }) => ({ id, image: image ?? null, name }));
|
|
18
9
|
});
|
|
19
10
|
//# sourceMappingURL=userProfiles.js.map
|