@shivaedev/identity 0.23.1 → 0.25.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 +28 -0
- package/README.md +102 -2
- package/dist/accountPreferences.d.ts +112 -0
- package/dist/accountPreferences.d.ts.map +1 -0
- package/dist/accountPreferences.js +37 -0
- package/dist/accountPreferences.js.map +1 -0
- package/dist/server/AccountClock.d.ts +11 -0
- package/dist/server/AccountClock.d.ts.map +1 -0
- package/dist/server/AccountClock.js +14 -0
- package/dist/server/AccountClock.js.map +1 -0
- package/dist/server/AccountPreferencesStore.d.ts +25 -0
- package/dist/server/AccountPreferencesStore.d.ts.map +1 -0
- package/dist/server/AccountPreferencesStore.js +13 -0
- package/dist/server/AccountPreferencesStore.js.map +1 -0
- package/dist/server/UserProvisioning.d.ts +15 -0
- package/dist/server/UserProvisioning.d.ts.map +1 -0
- package/dist/server/UserProvisioning.js +4 -0
- package/dist/server/UserProvisioning.js.map +1 -0
- package/dist/server/account-clock/dayRange.d.ts +7 -0
- package/dist/server/account-clock/dayRange.d.ts.map +1 -0
- package/dist/server/account-clock/dayRange.js +11 -0
- package/dist/server/account-clock/dayRange.js.map +1 -0
- package/dist/server/account-clock/initialize.d.ts +7 -0
- package/dist/server/account-clock/initialize.d.ts.map +1 -0
- package/dist/server/account-clock/initialize.js +18 -0
- package/dist/server/account-clock/initialize.js.map +1 -0
- package/dist/server/account-clock/logicalDay.d.ts +4 -0
- package/dist/server/account-clock/logicalDay.d.ts.map +1 -0
- package/dist/server/account-clock/logicalDay.js +10 -0
- package/dist/server/account-clock/logicalDay.js.map +1 -0
- package/dist/server/account-clock/settings.d.ts +5 -0
- package/dist/server/account-clock/settings.d.ts.map +1 -0
- package/dist/server/account-clock/settings.js +8 -0
- package/dist/server/account-clock/settings.js.map +1 -0
- package/dist/server/account-export/check.d.ts +15 -0
- package/dist/server/account-export/check.d.ts.map +1 -0
- package/dist/server/account-export/check.js +33 -0
- package/dist/server/account-export/check.js.map +1 -0
- package/dist/server/account-preferences/capture.d.ts +8 -0
- package/dist/server/account-preferences/capture.d.ts.map +1 -0
- package/dist/server/account-preferences/capture.js +8 -0
- package/dist/server/account-preferences/capture.js.map +1 -0
- package/dist/server/account-preferences/get.d.ts +12 -0
- package/dist/server/account-preferences/get.d.ts.map +1 -0
- package/dist/server/account-preferences/get.js +8 -0
- package/dist/server/account-preferences/get.js.map +1 -0
- package/dist/server/account-preferences/initialize.d.ts +59 -0
- package/dist/server/account-preferences/initialize.d.ts.map +1 -0
- package/dist/server/account-preferences/initialize.js +16 -0
- package/dist/server/account-preferences/initialize.js.map +1 -0
- package/dist/server/account-preferences/set.d.ts +8 -0
- package/dist/server/account-preferences/set.d.ts.map +1 -0
- package/dist/server/account-preferences/set.js +10 -0
- package/dist/server/account-preferences/set.js.map +1 -0
- package/dist/server/accountExport.d.ts +14 -0
- package/dist/server/accountExport.d.ts.map +1 -0
- package/dist/server/accountExport.js +15 -0
- package/dist/server/accountExport.js.map +1 -0
- package/dist/server/accountPreferencesHandlers.d.ts +2 -0
- package/dist/server/accountPreferencesHandlers.d.ts.map +1 -0
- package/dist/server/accountPreferencesHandlers.js +19 -0
- package/dist/server/accountPreferencesHandlers.js.map +1 -0
- package/dist/server/adapters/accountPreferencesMigration.d.ts +4 -0
- package/dist/server/adapters/accountPreferencesMigration.d.ts.map +1 -0
- package/dist/server/adapters/accountPreferencesMigration.js +12 -0
- package/dist/server/adapters/accountPreferencesMigration.js.map +1 -0
- package/dist/server/better-auth/adapters/SeedOptions.d.ts +14 -0
- package/dist/server/better-auth/adapters/SeedOptions.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/SeedOptions.js +2 -0
- package/dist/server/better-auth/adapters/SeedOptions.js.map +1 -0
- package/dist/server/better-auth/adapters/accountPreferenceOptions.d.ts +14 -0
- package/dist/server/better-auth/adapters/accountPreferenceOptions.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/accountPreferenceOptions.js +32 -0
- package/dist/server/better-auth/adapters/accountPreferenceOptions.js.map +1 -0
- package/dist/server/better-auth/adapters/acquire.d.ts +37 -1
- package/dist/server/better-auth/adapters/acquire.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/acquire.js +4 -1
- package/dist/server/better-auth/adapters/acquire.js.map +1 -1
- package/dist/server/better-auth/adapters/assertSeedDatabase.d.ts +10 -0
- package/dist/server/better-auth/adapters/assertSeedDatabase.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/assertSeedDatabase.js +12 -0
- package/dist/server/better-auth/adapters/assertSeedDatabase.js.map +1 -0
- package/dist/server/better-auth/adapters/defineSeed.d.ts +4 -0
- package/dist/server/better-auth/adapters/defineSeed.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/defineSeed.js +19 -0
- package/dist/server/better-auth/adapters/defineSeed.js.map +1 -0
- package/dist/server/better-auth/adapters/emailOptions.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/emailOptions.js +19 -8
- package/dist/server/better-auth/adapters/emailOptions.js.map +1 -1
- package/dist/server/better-auth/adapters/mount.d.ts +82 -41
- package/dist/server/better-auth/adapters/mount.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/mount.js +8 -25
- package/dist/server/better-auth/adapters/mount.js.map +1 -1
- package/dist/server/better-auth/adapters/mountSettings.d.ts +51 -0
- package/dist/server/better-auth/adapters/mountSettings.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/mountSettings.js +26 -0
- package/dist/server/better-auth/adapters/mountSettings.js.map +1 -0
- package/dist/server/better-auth/adapters/preferencesClient.d.ts +3 -0
- package/dist/server/better-auth/adapters/preferencesClient.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/preferencesClient.js +24 -0
- package/dist/server/better-auth/adapters/preferencesClient.js.map +1 -0
- package/dist/server/better-auth/adapters/userDataExport.d.ts +38 -0
- package/dist/server/better-auth/adapters/userDataExport.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/userDataExport.js +55 -0
- package/dist/server/better-auth/adapters/userDataExport.js.map +1 -0
- package/dist/server/better-auth/adapters/userProvisioning.d.ts +9 -0
- package/dist/server/better-auth/adapters/userProvisioning.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/userProvisioning.js +22 -0
- package/dist/server/better-auth/adapters/userProvisioning.js.map +1 -0
- package/dist/server/better-auth/emails.d.ts +1 -0
- package/dist/server/better-auth/emails.d.ts.map +1 -1
- package/dist/server/better-auth/seedUsers.d.ts +6 -0
- package/dist/server/better-auth/seedUsers.d.ts.map +1 -0
- package/dist/server/better-auth/seedUsers.js +15 -0
- package/dist/server/better-auth/seedUsers.js.map +1 -0
- package/dist/server/better-auth/testDatabase.d.ts.map +1 -1
- package/dist/server/better-auth/testDatabase.js +4 -1
- package/dist/server/better-auth/testDatabase.js.map +1 -1
- package/dist/server/userDataExport.d.ts +13 -0
- package/dist/server/userDataExport.d.ts.map +1 -0
- package/dist/server/userDataExport.js +2 -0
- package/dist/server/userDataExport.js.map +1 -0
- package/package.json +16 -15
- package/src/accountPreferences.ts +42 -0
- package/src/server/AccountClock.ts +14 -0
- package/src/server/AccountPreferencesStore.ts +13 -0
- package/src/server/UserProvisioning.ts +16 -0
- package/src/server/account-clock/dayRange.ts +12 -0
- package/src/server/account-clock/initialize.ts +20 -0
- package/src/server/account-clock/logicalDay.ts +11 -0
- package/src/server/account-clock/settings.ts +15 -0
- package/src/server/account-export/check.ts +38 -0
- package/src/server/account-preferences/capture.ts +10 -0
- package/src/server/account-preferences/get.ts +13 -0
- package/src/server/account-preferences/initialize.ts +18 -0
- package/src/server/account-preferences/set.ts +12 -0
- package/src/server/accountExport.ts +40 -0
- package/src/server/accountPreferencesHandlers.ts +22 -0
- package/src/server/adapters/accountPreferencesMigration.ts +12 -0
- package/src/server/better-auth/adapters/SeedOptions.ts +12 -0
- package/src/server/better-auth/adapters/accountPreferenceOptions.ts +33 -0
- package/src/server/better-auth/adapters/acquire.ts +4 -1
- package/src/server/better-auth/adapters/assertSeedDatabase.ts +15 -0
- package/src/server/better-auth/adapters/defineSeed.ts +23 -0
- package/src/server/better-auth/adapters/emailOptions.ts +27 -8
- package/src/server/better-auth/adapters/mount.ts +11 -27
- package/src/server/better-auth/adapters/mountSettings.ts +29 -0
- package/src/server/better-auth/adapters/preferencesClient.ts +25 -0
- package/src/server/better-auth/adapters/userDataExport.ts +57 -0
- package/src/server/better-auth/adapters/userProvisioning.ts +25 -0
- package/src/server/better-auth/emails.ts +1 -0
- package/src/server/better-auth/seedUsers.ts +21 -0
- package/src/server/better-auth/testDatabase.ts +4 -3
- package/src/server/userDataExport.ts +15 -0
|
@@ -3,35 +3,46 @@ import { postgresStore } from "@shivaedev/rate-limit/adapters/postgresStore.ts";
|
|
|
3
3
|
import { rateLimit } from "@shivaedev/rate-limit/rateLimit.ts";
|
|
4
4
|
import { Store } from "@shivaedev/rate-limit/Store.ts";
|
|
5
5
|
const Verification = Schema.Struct({ updateTo: Schema.optionalKey(Schema.String) });
|
|
6
|
+
const SignUp = Schema.Struct({ "callbackURL": Schema.optionalKey(Schema.String) });
|
|
7
|
+
function continuation(url) {
|
|
8
|
+
return new URL(url).searchParams.get("callbackURL");
|
|
9
|
+
}
|
|
6
10
|
export const emailOptions = Effect.fnUntraced(function* (options, emails, runtime) {
|
|
7
11
|
if (emails === undefined) {
|
|
8
12
|
return options;
|
|
9
13
|
}
|
|
10
|
-
const { routes, deliver, window = "1 minute" } = emails;
|
|
14
|
+
const { routes, deliver, window = "1 minute", windows } = emails;
|
|
11
15
|
const store = yield* Store.pipe(Effect.provide(postgresStore));
|
|
12
|
-
function send(message, request) {
|
|
16
|
+
function send(message, request, callback) {
|
|
13
17
|
const url = new URL(routes[message._tag]);
|
|
18
|
+
if (callback && URL.parse(callback, url.origin)?.origin === url.origin) {
|
|
19
|
+
url.searchParams.set("callbackURL", callback);
|
|
20
|
+
}
|
|
14
21
|
if ("token" in message) {
|
|
15
22
|
url.searchParams.set("token", Redacted.value(message.token));
|
|
16
23
|
}
|
|
17
|
-
return runtime.runHook(() => rateLimit({
|
|
24
|
+
return runtime.runHook(() => rateLimit({
|
|
25
|
+
key: `identity:email:${JSON.stringify([message.user.id, message._tag])}`,
|
|
26
|
+
per: 1,
|
|
27
|
+
window: windows?.[message._tag] ?? window,
|
|
28
|
+
}).pipe(Effect.provideService(Store, store), Effect.as(true), Effect.catchTag("TooManyRequests", () => Effect.succeed(false)), Effect.orDie, Effect.flatMap((allowed) => (allowed ? deliver({ ...message, url: Redacted.make(url.href) }) : Effect.void))), request?.signal);
|
|
18
29
|
}
|
|
19
30
|
return {
|
|
20
31
|
...options,
|
|
21
32
|
emailAndPassword: {
|
|
22
33
|
...options.emailAndPassword,
|
|
23
34
|
enabled: options.emailAndPassword?.enabled ?? false,
|
|
24
|
-
onExistingUserSignUp: ({ user }, request) => send({ _tag: "AccountAlreadyExists", user }, request),
|
|
25
|
-
sendResetPassword: ({ user, token }, request) => send({ _tag: "ResetPassword", token: Redacted.make(token), user }, request),
|
|
35
|
+
onExistingUserSignUp: async ({ user }, request) => send({ _tag: "AccountAlreadyExists", user }, request, request === undefined ? undefined : Schema.decodeUnknownSync(SignUp)(await request.json()).callbackURL),
|
|
36
|
+
sendResetPassword: ({ user, token, url }, request) => send({ _tag: "ResetPassword", token: Redacted.make(token), user }, request, continuation(url)),
|
|
26
37
|
},
|
|
27
38
|
emailVerification: {
|
|
28
39
|
...options.emailVerification,
|
|
29
|
-
sendVerificationEmail: ({ user, token }, request) => {
|
|
40
|
+
sendVerificationEmail: ({ user, token, url }, request) => {
|
|
30
41
|
const payload = token.split(".")[1] ?? "";
|
|
31
42
|
const { updateTo } = Schema.decodeUnknownSync(Schema.fromJsonString(Verification))(Buffer.from(payload, "base64url").toString("utf8"));
|
|
32
43
|
return send(updateTo === undefined
|
|
33
44
|
? { _tag: "ConfirmAccount", token: Redacted.make(token), user }
|
|
34
|
-
: { _tag: "ConfirmNewAddress", newEmail: updateTo, token: Redacted.make(token), user }, request);
|
|
45
|
+
: { _tag: "ConfirmNewAddress", newEmail: updateTo, token: Redacted.make(token), user }, request, continuation(url));
|
|
35
46
|
},
|
|
36
47
|
},
|
|
37
48
|
user: {
|
|
@@ -39,7 +50,7 @@ export const emailOptions = Effect.fnUntraced(function* (options, emails, runtim
|
|
|
39
50
|
changeEmail: {
|
|
40
51
|
...options.user?.changeEmail,
|
|
41
52
|
enabled: options.user?.changeEmail?.enabled ?? false,
|
|
42
|
-
sendChangeEmailConfirmation: ({ user, newEmail, token }, request) => send({ _tag: "ApproveEmailChange", newEmail, token: Redacted.make(token), user }, request),
|
|
53
|
+
sendChangeEmailConfirmation: ({ user, newEmail, token, url }, request) => send({ _tag: "ApproveEmailChange", newEmail, token: Redacted.make(token), user }, request, continuation(url)),
|
|
43
54
|
},
|
|
44
55
|
},
|
|
45
56
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emailOptions.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/emailOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,iDAAiD,CAAC;AAChF,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AAMvD,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"emailOptions.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/emailOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,iDAAiD,CAAC;AAChF,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AAMvD,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AACpF,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,aAAa,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAEnF,SAAS,YAAY,CAAC,GAAW;IAChC,OAAO,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AACrD,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EACtD,OAAiB,EACjB,MAAuC,EACvC,OAA0D;IAE1D,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QAC1B,OAAO,OAAO,CAAC;IAChB,CAAC;IACD,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,UAAU,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IACjE,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;IAC/D,SAAS,IAAI,CAAC,OAAiB,EAAE,OAAiB,EAAE,QAAwB;QAC3E,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1C,IAAI,QAAQ,IAAI,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,MAAM,KAAK,GAAG,CAAC,MAAM,EAAE,CAAC;YACxE,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAC/C,CAAC;QACD,IAAI,OAAO,IAAI,OAAO,EAAE,CAAC;YACxB,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QAC9D,CAAC;QACD,OAAO,OAAO,CAAC,OAAO,CACrB,GAAG,EAAE,CACJ,SAAS,CAAC;YACT,GAAG,EAAE,kBAAkB,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE;YACxE,GAAG,EAAE,CAAC;YACN,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,MAAM;SACzC,CAAC,CAAC,IAAI,CACN,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,EACnC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,EACf,MAAM,CAAC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAC/D,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,GAAG,OAAO,EAAE,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAC5G,EACF,OAAO,EAAE,MAAM,CACf,CAAC;IACH,CAAC;IACD,OAAO;QACN,GAAG,OAAO;QACV,gBAAgB,EAAE;YACjB,GAAG,OAAO,CAAC,gBAAgB;YAC3B,OAAO,EAAE,OAAO,CAAC,gBAAgB,EAAE,OAAO,IAAI,KAAK;YACnD,oBAAoB,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,EAAE,CACjD,IAAI,CACH,EAAE,IAAI,EAAE,sBAAsB,EAAE,IAAI,EAAE,EACtC,OAAO,EACP,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,WAAW,CACtG;YACF,iBAAiB,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,EAAE,CACpD,IAAI,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC;SAC/F;QACD,iBAAiB,EAAE;YAClB,GAAG,OAAO,CAAC,iBAAiB;YAC5B,qBAAqB,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,EAAE;gBACxD,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBAC1C,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;gBACvI,OAAO,IAAI,CACV,QAAQ,KAAK,SAAS;oBACrB,CAAC,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE;oBAC/D,CAAC,CAAC,EAAE,IAAI,EAAE,mBAAmB,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,EACvF,OAAO,EACP,YAAY,CAAC,GAAG,CAAC,CACjB,CAAC;YACH,CAAC;SACD;QACD,IAAI,EAAE;YACL,GAAG,OAAO,CAAC,IAAI;YACf,WAAW,EAAE;gBACZ,GAAG,OAAO,CAAC,IAAI,EAAE,WAAW;gBAC5B,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,IAAI,KAAK;gBACpD,2BAA2B,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,EAAE,CACxE,IAAI,CAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC;aAC9G;SACD;KAC2B,CAAC;AAC/B,CAAC,CAAC,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { BetterAuthOptions } from "better-auth";
|
|
2
|
-
import {
|
|
2
|
+
import { Effect, Layer, type Scope } from "effect";
|
|
3
3
|
import type { RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
4
4
|
import type { Store } from "@shivaedev/rate-limit/Store.ts";
|
|
5
5
|
import type { AccountRoleSeed } from "#server/better-auth/accountRoleSeed.ts";
|
|
@@ -12,7 +12,9 @@ import type { BetterAuthPasswordReset } from "#server/better-auth/PasswordReset.
|
|
|
12
12
|
import { type SignInPolicy } from "#server/better-auth/signInGate.ts";
|
|
13
13
|
import { UndeclaredDefaultRole } from "#server/better-auth/UndeclaredDefaultRole.ts";
|
|
14
14
|
export type BetterAuthMountOptions<E = never, R = never> = {
|
|
15
|
+
readonly accountPreferences?: boolean;
|
|
15
16
|
readonly bearerSessions?: BearerSessionsOptions | undefined;
|
|
17
|
+
readonly clientIp?: "railway";
|
|
16
18
|
readonly databaseHooks?: BetterAuthDatabaseHooks<R> | undefined;
|
|
17
19
|
readonly emails?: BetterAuthEmails<R> | undefined;
|
|
18
20
|
readonly enabledPaths?: readonly string[];
|
|
@@ -34,6 +36,47 @@ declare const mountAuth: <const TOptions extends BetterAuthOptions, E = never, R
|
|
|
34
36
|
<TSession extends import("../../session.ts").SessionShape>(getSession: import("../../adapters/betterAuthSessions.ts").GetSession<TSession>, getProviderAccounts: import("../../adapters/betterAuthSessions.ts").GetProviderAccounts): import("../../session.ts").SessionProvider<import("../../adapters/betterAuthSessions.ts").SessionWithProviderAccounts<TSession>>;
|
|
35
37
|
};
|
|
36
38
|
auth: import("better-auth").Auth<TOptions & {
|
|
39
|
+
advanced: {
|
|
40
|
+
disableCSRFCheck?: boolean | undefined;
|
|
41
|
+
disableOriginCheck?: boolean | undefined;
|
|
42
|
+
crossSubDomainCookies?: {
|
|
43
|
+
enabled: boolean;
|
|
44
|
+
additionalCookies?: string[];
|
|
45
|
+
domain?: string;
|
|
46
|
+
} | undefined;
|
|
47
|
+
cookies?: {
|
|
48
|
+
[key: string]: {
|
|
49
|
+
name?: string;
|
|
50
|
+
attributes?: import("better-auth").CookieOptions;
|
|
51
|
+
};
|
|
52
|
+
} | undefined;
|
|
53
|
+
defaultCookieAttributes?: import("better-auth").CookieOptions | undefined;
|
|
54
|
+
cookiePrefix?: string | undefined;
|
|
55
|
+
database?: {
|
|
56
|
+
defaultFindManyLimit?: number;
|
|
57
|
+
generateId?: import("better-auth").GenerateIdFn | false | "serial" | "uuid";
|
|
58
|
+
joins?: boolean;
|
|
59
|
+
validateSchema?: boolean;
|
|
60
|
+
} | undefined;
|
|
61
|
+
trustedProxyHeaders?: boolean | undefined;
|
|
62
|
+
backgroundTasks?: {
|
|
63
|
+
handler: (promise: Promise<unknown>) => void;
|
|
64
|
+
};
|
|
65
|
+
skipTrailingSlashes?: boolean;
|
|
66
|
+
useSecureCookies: boolean | undefined;
|
|
67
|
+
ipAddress: {
|
|
68
|
+
disableIpTracking?: boolean;
|
|
69
|
+
ipv6Subnet?: number;
|
|
70
|
+
ipAddressHeaders: string[];
|
|
71
|
+
trustedProxies: never[];
|
|
72
|
+
};
|
|
73
|
+
};
|
|
74
|
+
baseURL: {
|
|
75
|
+
allowedHosts: string[];
|
|
76
|
+
protocol: "http";
|
|
77
|
+
} | import("better-auth").BaseURLConfig;
|
|
78
|
+
secret: string;
|
|
79
|
+
trustedOrigins: string[] | ((request?: Request | undefined) => import("better-auth").Awaitable<(string | undefined | null)[]>);
|
|
37
80
|
databaseHooks: {
|
|
38
81
|
user?: {
|
|
39
82
|
create?: {
|
|
@@ -188,42 +231,6 @@ declare const mountAuth: <const TOptions extends BetterAuthOptions, E = never, R
|
|
|
188
231
|
};
|
|
189
232
|
};
|
|
190
233
|
} | undefined;
|
|
191
|
-
advanced: {
|
|
192
|
-
disableCSRFCheck?: boolean | undefined;
|
|
193
|
-
disableOriginCheck?: boolean | undefined;
|
|
194
|
-
crossSubDomainCookies?: {
|
|
195
|
-
enabled: boolean;
|
|
196
|
-
additionalCookies?: string[];
|
|
197
|
-
domain?: string;
|
|
198
|
-
} | undefined;
|
|
199
|
-
cookies?: {
|
|
200
|
-
[key: string]: {
|
|
201
|
-
name?: string;
|
|
202
|
-
attributes?: import("better-auth").CookieOptions;
|
|
203
|
-
};
|
|
204
|
-
} | undefined;
|
|
205
|
-
defaultCookieAttributes?: import("better-auth").CookieOptions | undefined;
|
|
206
|
-
cookiePrefix?: string | undefined;
|
|
207
|
-
database?: {
|
|
208
|
-
defaultFindManyLimit?: number;
|
|
209
|
-
generateId?: import("better-auth").GenerateIdFn | false | "serial" | "uuid";
|
|
210
|
-
joins?: boolean;
|
|
211
|
-
validateSchema?: boolean;
|
|
212
|
-
} | undefined;
|
|
213
|
-
trustedProxyHeaders?: boolean | undefined;
|
|
214
|
-
backgroundTasks?: {
|
|
215
|
-
handler: (promise: Promise<unknown>) => void;
|
|
216
|
-
};
|
|
217
|
-
skipTrailingSlashes?: boolean;
|
|
218
|
-
useSecureCookies: boolean | undefined;
|
|
219
|
-
ipAddress: {
|
|
220
|
-
disableIpTracking?: boolean;
|
|
221
|
-
ipv6Subnet?: number;
|
|
222
|
-
ipAddressHeaders: string[];
|
|
223
|
-
trustedProxies: never[];
|
|
224
|
-
};
|
|
225
|
-
};
|
|
226
|
-
baseURL: import("better-auth").BaseURLConfig;
|
|
227
234
|
rateLimit: {
|
|
228
235
|
window?: number | undefined;
|
|
229
236
|
max?: number | undefined;
|
|
@@ -236,8 +243,6 @@ declare const mountAuth: <const TOptions extends BetterAuthOptions, E = never, R
|
|
|
236
243
|
customStorage: import("better-auth").BetterAuthRateLimitStorage;
|
|
237
244
|
enabled: boolean;
|
|
238
245
|
};
|
|
239
|
-
secret: string;
|
|
240
|
-
trustedOrigins: string[] | ((request?: Request | undefined) => import("better-auth").Awaitable<(string | undefined | null)[]>);
|
|
241
246
|
user: (import("better-auth").BetterAuthDBOptions<"user", "createdAt" | "email" | "emailVerified" | "id" | "image" | "name" | "updatedAt"> & {
|
|
242
247
|
validateUserInfo?: (data: {
|
|
243
248
|
user: Partial<import("better-auth").User> & Record<string, unknown>;
|
|
@@ -265,15 +270,51 @@ declare const mountAuth: <const TOptions extends BetterAuthOptions, E = never, R
|
|
|
265
270
|
deleteTokenExpiresIn?: number;
|
|
266
271
|
};
|
|
267
272
|
}) | undefined;
|
|
273
|
+
} & {
|
|
274
|
+
advanced: {
|
|
275
|
+
ipAddress?: {
|
|
276
|
+
ipAddressHeaders?: string[];
|
|
277
|
+
disableIpTracking?: boolean;
|
|
278
|
+
ipv6Subnet?: number;
|
|
279
|
+
trustedProxies?: string[];
|
|
280
|
+
} | undefined;
|
|
281
|
+
useSecureCookies?: boolean | undefined;
|
|
282
|
+
disableCSRFCheck?: boolean | undefined;
|
|
283
|
+
disableOriginCheck?: boolean | undefined;
|
|
284
|
+
crossSubDomainCookies?: {
|
|
285
|
+
enabled: boolean;
|
|
286
|
+
additionalCookies?: string[];
|
|
287
|
+
domain?: string;
|
|
288
|
+
} | undefined;
|
|
289
|
+
cookies?: {
|
|
290
|
+
[key: string]: {
|
|
291
|
+
name?: string;
|
|
292
|
+
attributes?: import("better-auth").CookieOptions;
|
|
293
|
+
};
|
|
294
|
+
} | undefined;
|
|
295
|
+
defaultCookieAttributes?: import("better-auth").CookieOptions | undefined;
|
|
296
|
+
cookiePrefix?: string | undefined;
|
|
297
|
+
trustedProxyHeaders?: boolean | undefined;
|
|
298
|
+
backgroundTasks?: {
|
|
299
|
+
handler: (promise: Promise<unknown>) => void;
|
|
300
|
+
};
|
|
301
|
+
skipTrailingSlashes?: boolean;
|
|
302
|
+
database: {
|
|
303
|
+
defaultFindManyLimit?: number;
|
|
304
|
+
generateId?: import("better-auth").GenerateIdFn | false | "serial" | "uuid";
|
|
305
|
+
validateSchema?: boolean;
|
|
306
|
+
joins: boolean;
|
|
307
|
+
};
|
|
308
|
+
};
|
|
268
309
|
}>;
|
|
269
310
|
profiles: import("../userProfiles.ts").UserProfileStorage;
|
|
270
|
-
revokeUnadmitted: Effect.Effect<import("#server/better-auth/revokeUnadmitted.ts").RevokedSessions, E | import("@shivaedev/errors/taxonomy.ts").AuthUnavailable | Config.ConfigError, never>;
|
|
311
|
+
revokeUnadmitted: Effect.Effect<import("#server/better-auth/revokeUnadmitted.ts").RevokedSessions, E | import("@shivaedev/errors/taxonomy.ts").AuthUnavailable | import("effect/Config").ConfigError, never>;
|
|
271
312
|
routes: Layer.Layer<never, never, import("effect/http/HttpRouter").HttpRouter | import("effect/http/HttpRouter").Request<"Error", import("effect/http/HttpServerError").InternalError> | import("effect/http/HttpRouter").Request<"Error", import("effect/http/HttpServerError").RequestParseError> | import("effect/http/HttpRouter").Request<"Error", import("effect/http/HttpServerError").RouteNotFound>>;
|
|
272
313
|
sessions: {
|
|
273
314
|
readonly roles?: RoleSet;
|
|
274
315
|
readonly provider: import("../../session.ts").SessionProvider<import("../../session.ts").UserSessionShape>;
|
|
275
316
|
};
|
|
276
|
-
}, E | import("@shivaedev/errors/taxonomy.ts").AuthUnavailable | Config.ConfigError | UndeclaredDefaultRole, R | import("effect/reactivity/Reactivity").Reactivity | import("effect/sql/SqlClient").SqlClient | Store>;
|
|
317
|
+
}, E | import("@shivaedev/errors/taxonomy.ts").AuthUnavailable | import("@shivaedev/sql/repositoryCollection.ts").BucketRegistrationError | import("effect/Config").ConfigError | UndeclaredDefaultRole, R | import("effect/reactivity/Reactivity").Reactivity | import("effect/sql/SqlClient").SqlClient | Store>;
|
|
277
318
|
type Mounted<TOptions extends BetterAuthOptions, E, R> = ReturnType<typeof mountAuth<TOptions, E, R>>;
|
|
278
319
|
export declare function betterAuthMount<const TOptions extends BetterAuthOptions, E = never, R = never>(options: TOptions, mount?: BetterAuthMountOptions<E, R> & {
|
|
279
320
|
readonly emails?: undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mount.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/mount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"mount.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/mount.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Effect, Layer } from "effect";
|
|
2
|
+
import { AccountPreferencesStore } from "#server/AccountPreferencesStore.ts";
|
|
2
3
|
import { withBearerSessions } from "#server/better-auth/adapters/bearerSessions.ts";
|
|
3
|
-
import { PEER_IP_HEADER } from "#server/better-auth/adapters/clientIp.ts";
|
|
4
4
|
import { closeRoleEndpoints } from "#server/better-auth/adapters/closeRoleEndpoints.ts";
|
|
5
5
|
import { effectHookOptions } from "#server/better-auth/adapters/effectHookOptions.ts";
|
|
6
6
|
import { emailOptions } from "#server/better-auth/adapters/emailOptions.ts";
|
|
7
7
|
import { withHardening } from "#server/better-auth/adapters/hardening.ts";
|
|
8
8
|
import { hookRuntime } from "#server/better-auth/adapters/hookRuntime.ts";
|
|
9
9
|
import { mountedSessions } from "#server/better-auth/adapters/mountedSessions.ts";
|
|
10
|
+
import { mountSettings } from "#server/better-auth/adapters/mountSettings.ts";
|
|
10
11
|
import { passwordResetOptions } from "#server/better-auth/adapters/passwordResetOptions.ts";
|
|
11
12
|
import { providerOnlyOptions } from "#server/better-auth/adapters/providerOnlyOptions.ts";
|
|
12
13
|
import { rateLimitStorage } from "#server/better-auth/adapters/rateLimitStorage.ts";
|
|
@@ -19,25 +20,22 @@ import { revokeUnadmitted } from "#server/better-auth/revokeUnadmitted.ts";
|
|
|
19
20
|
import { fromStorage, signInGate } from "#server/better-auth/signInGate.ts";
|
|
20
21
|
import { UndeclaredDefaultRole } from "#server/better-auth/UndeclaredDefaultRole.ts";
|
|
21
22
|
import { providerFailure } from "#server/providerFailure.ts";
|
|
23
|
+
import { accountPreferenceOptions } from "./accountPreferenceOptions.js";
|
|
22
24
|
import { acquireAuth } from "./acquire.js";
|
|
23
25
|
import { authRouteHandler } from "./routeHandler.js";
|
|
24
26
|
const mountAuth = Effect.fn("Identity.mountAuth")(function* (options, mount = {}) {
|
|
25
27
|
if (mount.roles !== undefined) {
|
|
26
28
|
yield* mount.roles.resolve(mount.defaultRole).pipe(Effect.mapError(() => new UndeclaredDefaultRole({ role: mount.defaultRole })));
|
|
27
29
|
}
|
|
28
|
-
const
|
|
29
|
-
const publicUrl = yield* Config.URL("PUBLIC_URL").pipe(Config.option);
|
|
30
|
-
const origin = Option.map(publicUrl, (url) => url.origin);
|
|
31
|
-
const trustedProxy = Option.getOrUndefined(yield* Config.String("TRUSTED_PROXY").pipe(Config.option));
|
|
32
|
-
const clientIpHeader = yield* Config.String("AUTH_CLIENT_IP_HEADER").pipe(Config.withDefault("x-forwarded-for"));
|
|
33
|
-
const rateLimitEnabled = yield* Config.Boolean("AUTH_RATE_LIMIT_ENABLED").pipe(Config.withDefault(true));
|
|
30
|
+
const { authOptions, clientIpHeader, rateLimitEnabled, trustedProxy } = yield* mountSettings(options, mount.clientIp);
|
|
34
31
|
const policy = mount.signIn ?? {};
|
|
35
32
|
if (policy.accounts !== undefined) {
|
|
36
33
|
yield* policy.accounts;
|
|
37
34
|
}
|
|
38
35
|
const gate = yield* signInGate(policy);
|
|
39
36
|
const runtime = yield* hookRuntime();
|
|
40
|
-
const
|
|
37
|
+
const preferences = mount.accountPreferences === true ? yield* accountPreferenceOptions(options).pipe(Effect.provide(AccountPreferencesStore.layer)) : options;
|
|
38
|
+
const reset = passwordResetOptions(preferences, mount.onPasswordReset, runtime);
|
|
41
39
|
const hooked = effectHookOptions(yield* emailOptions(reset, mount.emails, runtime), mount.databaseHooks, runtime);
|
|
42
40
|
const configured = mount.roles === undefined ? hooked : storedRoleOptions(closeRoleEndpoints(hooked), mount);
|
|
43
41
|
const gated = yield* signInPolicyOptions(configured, gate, () => auth.$context);
|
|
@@ -51,27 +49,12 @@ const mountAuth = Effect.fn("Identity.mountAuth")(function* (options, mount = {}
|
|
|
51
49
|
const customStorage = yield* rateLimitStorage;
|
|
52
50
|
const { auth, profiles } = yield* acquireAuth({
|
|
53
51
|
...withHardening(withBearerSessions(preset, mount.bearerSessions !== undefined), mount.hardening),
|
|
54
|
-
|
|
55
|
-
useSecureCookies: Option.isSome(publicUrl) && publicUrl.value.protocol === "https:",
|
|
56
|
-
...options.advanced,
|
|
57
|
-
ipAddress: {
|
|
58
|
-
...options.advanced?.ipAddress,
|
|
59
|
-
ipAddressHeaders: [PEER_IP_HEADER],
|
|
60
|
-
trustedProxies: [],
|
|
61
|
-
},
|
|
62
|
-
},
|
|
63
|
-
"baseURL": options.baseURL
|
|
64
|
-
?? Option.getOrElse(origin, () => ({
|
|
65
|
-
allowedHosts: ["127.0.0.1:*", "localhost:*"],
|
|
66
|
-
protocol: "http",
|
|
67
|
-
})),
|
|
52
|
+
...authOptions,
|
|
68
53
|
rateLimit: {
|
|
69
54
|
...rateLimit,
|
|
70
55
|
customStorage,
|
|
71
56
|
enabled: rateLimitEnabled,
|
|
72
57
|
},
|
|
73
|
-
secret,
|
|
74
|
-
trustedOrigins: options.trustedOrigins ?? Option.match(origin, { onNone: () => ["http://127.0.0.1:*", "http://localhost:*"], onSome: (url) => [url] }),
|
|
75
58
|
user: gate.active ? gated.user : configured.user,
|
|
76
59
|
});
|
|
77
60
|
const authRoutes = mountRoutes.pipe(Layer.provide(Layer.succeed(AuthRouteHandler, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mount.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/mount.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"mount.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/mount.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import type { BetterAuthOptions } from "better-auth";
|
|
2
|
+
import { Config, Effect } from "effect";
|
|
3
|
+
export declare const mountSettings: (options: BetterAuthOptions, clientIp?: "railway" | undefined) => Effect.Effect<{
|
|
4
|
+
authOptions: {
|
|
5
|
+
advanced: {
|
|
6
|
+
disableCSRFCheck?: boolean | undefined;
|
|
7
|
+
disableOriginCheck?: boolean | undefined;
|
|
8
|
+
crossSubDomainCookies?: {
|
|
9
|
+
enabled: boolean;
|
|
10
|
+
additionalCookies?: string[];
|
|
11
|
+
domain?: string;
|
|
12
|
+
} | undefined;
|
|
13
|
+
cookies?: {
|
|
14
|
+
[key: string]: {
|
|
15
|
+
name?: string;
|
|
16
|
+
attributes?: import("better-auth").CookieOptions;
|
|
17
|
+
};
|
|
18
|
+
} | undefined;
|
|
19
|
+
defaultCookieAttributes?: import("better-auth").CookieOptions | undefined;
|
|
20
|
+
cookiePrefix?: string | undefined;
|
|
21
|
+
database?: {
|
|
22
|
+
defaultFindManyLimit?: number;
|
|
23
|
+
generateId?: import("better-auth").GenerateIdFn | false | "serial" | "uuid";
|
|
24
|
+
joins?: boolean;
|
|
25
|
+
validateSchema?: boolean;
|
|
26
|
+
} | undefined;
|
|
27
|
+
trustedProxyHeaders?: boolean | undefined;
|
|
28
|
+
backgroundTasks?: {
|
|
29
|
+
handler: (promise: Promise<unknown>) => void;
|
|
30
|
+
};
|
|
31
|
+
skipTrailingSlashes?: boolean;
|
|
32
|
+
useSecureCookies: boolean | undefined;
|
|
33
|
+
ipAddress: {
|
|
34
|
+
disableIpTracking?: boolean;
|
|
35
|
+
ipv6Subnet?: number;
|
|
36
|
+
ipAddressHeaders: string[];
|
|
37
|
+
trustedProxies: never[];
|
|
38
|
+
};
|
|
39
|
+
};
|
|
40
|
+
baseURL: {
|
|
41
|
+
allowedHosts: string[];
|
|
42
|
+
protocol: "http";
|
|
43
|
+
} | import("better-auth").BaseURLConfig;
|
|
44
|
+
secret: string;
|
|
45
|
+
trustedOrigins: string[] | ((request?: Request | undefined) => import("better-auth").Awaitable<(string | undefined | null)[]>);
|
|
46
|
+
};
|
|
47
|
+
clientIpHeader: string;
|
|
48
|
+
rateLimitEnabled: boolean;
|
|
49
|
+
trustedProxy: string | undefined;
|
|
50
|
+
}, Config.ConfigError, never>;
|
|
51
|
+
//# sourceMappingURL=mountSettings.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mountSettings.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/mountSettings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAoB,MAAM,QAAQ,CAAC;AAG1D,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBAeiG,MAAM;;;;;;;;6BAS/H,CAAC"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { Config, Effect, Option, Redacted } from "effect";
|
|
2
|
+
import { PEER_IP_HEADER } from "#server/better-auth/adapters/clientIp.ts";
|
|
3
|
+
export const mountSettings = Effect.fnUntraced(function* (options, clientIp) {
|
|
4
|
+
const secret = options.secret ?? Redacted.value(yield* Config.Redacted("BETTER_AUTH_SECRET"));
|
|
5
|
+
const publicUrl = yield* Config.URL("PUBLIC_URL").pipe(Config.option);
|
|
6
|
+
const origin = Option.map(publicUrl, (url) => url.origin);
|
|
7
|
+
const trustedProxy = Option.getOrUndefined(yield* Config.String("TRUSTED_PROXY").pipe(Config.option));
|
|
8
|
+
const clientIpHeader = clientIp === "railway" ? "x-real-ip" : yield* Config.String("AUTH_CLIENT_IP_HEADER").pipe(Config.withDefault("x-forwarded-for"));
|
|
9
|
+
const rateLimitEnabled = yield* Config.Boolean("AUTH_RATE_LIMIT_ENABLED").pipe(Config.withDefault(true));
|
|
10
|
+
return {
|
|
11
|
+
authOptions: {
|
|
12
|
+
advanced: {
|
|
13
|
+
useSecureCookies: Option.isSome(publicUrl) && publicUrl.value.protocol === "https:",
|
|
14
|
+
...options.advanced,
|
|
15
|
+
ipAddress: { ...options.advanced?.ipAddress, ipAddressHeaders: [PEER_IP_HEADER], trustedProxies: [] },
|
|
16
|
+
},
|
|
17
|
+
"baseURL": options.baseURL ?? Option.getOrElse(origin, () => ({ allowedHosts: ["127.0.0.1:*", "localhost:*"], protocol: "http" })),
|
|
18
|
+
secret,
|
|
19
|
+
trustedOrigins: options.trustedOrigins ?? Option.match(origin, { onNone: () => ["http://127.0.0.1:*", "http://localhost:*"], onSome: (url) => [url] }),
|
|
20
|
+
},
|
|
21
|
+
clientIpHeader,
|
|
22
|
+
rateLimitEnabled,
|
|
23
|
+
trustedProxy,
|
|
24
|
+
};
|
|
25
|
+
});
|
|
26
|
+
//# sourceMappingURL=mountSettings.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mountSettings.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/mountSettings.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAE1E,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,OAA0B,EAAE,QAAoB;IACzG,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAC9F,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACtE,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1D,MAAM,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IACtG,MAAM,cAAc,GACnB,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAClI,MAAM,gBAAgB,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;IACzG,OAAO;QACN,WAAW,EAAE;YACZ,QAAQ,EAAE;gBACT,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,KAAK,CAAC,QAAQ,KAAK,QAAQ;gBACnF,GAAG,OAAO,CAAC,QAAQ;gBACnB,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,SAAS,EAAE,gBAAgB,EAAE,CAAC,cAAc,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE;aACrG;YACD,SAAS,EAAE,OAAO,CAAC,OAAO,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,aAAa,EAAE,aAAa,CAAC,EAAE,QAAQ,EAAE,MAAe,EAAE,CAAC,CAAC;YAC3I,MAAM;YACN,cAAc,EACb,OAAO,CAAC,cAAc,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,oBAAoB,EAAE,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;SAC3G;QAC7B,cAAc;QACd,gBAAgB;QAChB,YAAY;KACZ,CAAC;AACH,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"preferencesClient.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/preferencesClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAEjE,wBAAgB,iBAAiB,IAAI,IAAI,CAAC,sBAAsB,EAAE,IAAI,GAAG,cAAc,CAAC,CAsBvF"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
export function preferencesClient() {
|
|
2
|
+
return {
|
|
3
|
+
fetchPlugins: [
|
|
4
|
+
{
|
|
5
|
+
hooks: {
|
|
6
|
+
onRequest(context) {
|
|
7
|
+
if (!("window" in globalThis)) {
|
|
8
|
+
return context;
|
|
9
|
+
}
|
|
10
|
+
const { locale, timeZone } = new Intl.DateTimeFormat().resolvedOptions();
|
|
11
|
+
const headers = new Headers(context.headers);
|
|
12
|
+
headers.set("x-platform-account-timezone", timeZone);
|
|
13
|
+
headers.set("x-platform-account-locale", locale);
|
|
14
|
+
return { ...context, headers };
|
|
15
|
+
},
|
|
16
|
+
},
|
|
17
|
+
id: "identity-account-preferences",
|
|
18
|
+
name: "identity-account-preferences",
|
|
19
|
+
},
|
|
20
|
+
],
|
|
21
|
+
id: "identity-account-preferences",
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=preferencesClient.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"preferencesClient.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/preferencesClient.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,iBAAiB;IAChC,OAAO;QACN,YAAY,EAAE;YACb;gBACC,KAAK,EAAE;oBACN,SAAS,CAAC,OAAO;wBAChB,IAAI,CAAC,CAAC,QAAQ,IAAI,UAAU,CAAC,EAAE,CAAC;4BAC/B,OAAO,OAAO,CAAC;wBAChB,CAAC;wBACD,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC,eAAe,EAAE,CAAC;wBACzE,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;wBAC7C,OAAO,CAAC,GAAG,CAAC,6BAA6B,EAAE,QAAQ,CAAC,CAAC;wBACrD,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,MAAM,CAAC,CAAC;wBACjD,OAAO,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,CAAC;oBAChC,CAAC;iBACD;gBACD,EAAE,EAAE,8BAA8B;gBAClC,IAAI,EAAE,8BAA8B;aACpC;SACD;QACD,EAAE,EAAE,8BAA8B;KAClC,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import type { BetterAuthOptions } from "better-auth";
|
|
2
|
+
import { Effect, Schema } from "effect";
|
|
3
|
+
import { SqlClient } from "effect/sql";
|
|
4
|
+
export declare function betterAuthUserDataExport(options?: BetterAuthOptions, schema?: string): {
|
|
5
|
+
export: (userId: string) => Effect.Effect<{
|
|
6
|
+
accounts: {
|
|
7
|
+
readonly createdAt: import("effect/DateTime").Utc;
|
|
8
|
+
readonly updatedAt: import("effect/DateTime").Utc;
|
|
9
|
+
readonly accountId: string;
|
|
10
|
+
readonly id: string;
|
|
11
|
+
readonly providerId: string;
|
|
12
|
+
readonly userId: string;
|
|
13
|
+
}[];
|
|
14
|
+
sessions: {
|
|
15
|
+
readonly createdAt: import("effect/DateTime").Utc;
|
|
16
|
+
readonly updatedAt: import("effect/DateTime").Utc;
|
|
17
|
+
readonly expiresAt: import("effect/DateTime").Utc;
|
|
18
|
+
readonly id: string;
|
|
19
|
+
readonly ipAddress: string | null;
|
|
20
|
+
readonly userAgent: string | null;
|
|
21
|
+
readonly userId: string;
|
|
22
|
+
}[];
|
|
23
|
+
users: {
|
|
24
|
+
readonly createdAt: import("effect/DateTime").Utc;
|
|
25
|
+
readonly updatedAt: import("effect/DateTime").Utc;
|
|
26
|
+
readonly email: string;
|
|
27
|
+
readonly emailVerified: boolean;
|
|
28
|
+
readonly id: string;
|
|
29
|
+
readonly image: string | null;
|
|
30
|
+
readonly name: string;
|
|
31
|
+
}[];
|
|
32
|
+
}, Schema.SchemaError | import("effect/sql/SqlError").SqlError, SqlClient.SqlClient>;
|
|
33
|
+
tables: {
|
|
34
|
+
schema: string;
|
|
35
|
+
table: string;
|
|
36
|
+
}[];
|
|
37
|
+
};
|
|
38
|
+
//# sourceMappingURL=userDataExport.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"userDataExport.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/userDataExport.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAErD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAqBlD,wBAAgB,wBAAwB,CAAC,OAAO,GAAE,iBAAsB,EAAE,MAAM,SAAW;IAGzF,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA2BN,MAAM;;;;EAEP"}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import { getAuthTables } from "better-auth/db";
|
|
2
|
+
import { Effect, Schema } from "effect";
|
|
3
|
+
import { SqlClient, SqlSchema } from "effect/sql";
|
|
4
|
+
const Timestamps = { createdAt: Schema.DateTimeUtcFromDate, updatedAt: Schema.DateTimeUtcFromDate };
|
|
5
|
+
const User = Schema.Struct({
|
|
6
|
+
...Timestamps,
|
|
7
|
+
email: Schema.String,
|
|
8
|
+
emailVerified: Schema.Boolean,
|
|
9
|
+
id: Schema.String,
|
|
10
|
+
image: Schema.NullOr(Schema.String),
|
|
11
|
+
name: Schema.String,
|
|
12
|
+
});
|
|
13
|
+
const Account = Schema.Struct({ ...Timestamps, accountId: Schema.String, id: Schema.String, providerId: Schema.String, userId: Schema.String });
|
|
14
|
+
const Session = Schema.Struct({
|
|
15
|
+
...Timestamps,
|
|
16
|
+
expiresAt: Schema.DateTimeUtcFromDate,
|
|
17
|
+
id: Schema.String,
|
|
18
|
+
ipAddress: Schema.NullOr(Schema.String),
|
|
19
|
+
userAgent: Schema.NullOr(Schema.String),
|
|
20
|
+
userId: Schema.String,
|
|
21
|
+
});
|
|
22
|
+
export function betterAuthUserDataExport(options = {}, schema = "public") {
|
|
23
|
+
const models = getAuthTables(options);
|
|
24
|
+
return {
|
|
25
|
+
export: Effect.fn("BetterAuth.export")(function* (userId) {
|
|
26
|
+
const sql = (yield* SqlClient.SqlClient).withoutTransforms();
|
|
27
|
+
function select(model, fields, owner, id) {
|
|
28
|
+
const table = models[model];
|
|
29
|
+
function column(name) {
|
|
30
|
+
return table?.fields[name]?.fieldName ?? name;
|
|
31
|
+
}
|
|
32
|
+
const columns = sql.csv(fields.map((name) => sql `${sql(column(name))} as ${sql(name)}`));
|
|
33
|
+
return sql `select ${columns} from ${sql(`${schema}.${table?.modelName ?? model}`)} where ${sql(column(owner))} = ${id} order by id`;
|
|
34
|
+
}
|
|
35
|
+
const users = yield* SqlSchema.findAll({
|
|
36
|
+
execute: (id) => select("user", Object.keys(User.fields), "id", id),
|
|
37
|
+
Request: Schema.String,
|
|
38
|
+
Result: User,
|
|
39
|
+
})(userId);
|
|
40
|
+
const accounts = yield* SqlSchema.findAll({
|
|
41
|
+
execute: (id) => select("account", Object.keys(Account.fields), "userId", id),
|
|
42
|
+
Request: Schema.String,
|
|
43
|
+
Result: Account,
|
|
44
|
+
})(userId);
|
|
45
|
+
const sessions = yield* SqlSchema.findAll({
|
|
46
|
+
execute: (id) => select("session", Object.keys(Session.fields), "userId", id),
|
|
47
|
+
Request: Schema.String,
|
|
48
|
+
Result: Session,
|
|
49
|
+
})(userId);
|
|
50
|
+
return { accounts, sessions, users };
|
|
51
|
+
}),
|
|
52
|
+
tables: ["user", "account", "session"].map((model) => ({ schema, table: models[model]?.modelName ?? model })),
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
//# sourceMappingURL=userDataExport.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"userDataExport.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/userDataExport.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { AuthContext } from "better-auth";
|
|
2
|
+
import { Layer } from "effect";
|
|
3
|
+
import { UserProvisioning } from "#server/UserProvisioning.ts";
|
|
4
|
+
export declare function betterAuthUserProvisioning(auth: {
|
|
5
|
+
readonly $context: Promise<Pick<AuthContext, "internalAdapter"> & {
|
|
6
|
+
readonly password: Pick<AuthContext["password"], "hash">;
|
|
7
|
+
}>;
|
|
8
|
+
}): Layer.Layer<UserProvisioning, never, never>;
|
|
9
|
+
//# sourceMappingURL=userProvisioning.d.ts.map
|