@shivaedev/identity 0.3.2 → 0.5.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.
Files changed (118) hide show
  1. package/README.md +44 -14
  2. package/dist/identity.d.ts +19 -6
  3. package/dist/identity.d.ts.map +1 -1
  4. package/dist/identity.js +9 -1
  5. package/dist/identity.js.map +1 -1
  6. package/dist/middleware.d.ts +2 -0
  7. package/dist/middleware.d.ts.map +1 -1
  8. package/dist/middleware.js +5 -4
  9. package/dist/middleware.js.map +1 -1
  10. package/dist/permission.d.ts +7 -8
  11. package/dist/permission.d.ts.map +1 -1
  12. package/dist/permission.js +4 -12
  13. package/dist/permission.js.map +1 -1
  14. package/dist/server/adapters/betterAuthSessions.d.ts +1 -1
  15. package/dist/server/adapters/betterAuthSessions.d.ts.map +1 -1
  16. package/dist/server/adapters/betterAuthSessions.js +4 -7
  17. package/dist/server/adapters/betterAuthSessions.js.map +1 -1
  18. package/dist/server/better-auth/admittedSessions.d.ts +14 -0
  19. package/dist/server/better-auth/admittedSessions.d.ts.map +1 -0
  20. package/dist/server/better-auth/admittedSessions.js +32 -0
  21. package/dist/server/better-auth/admittedSessions.js.map +1 -0
  22. package/dist/server/better-auth/clientIp.d.ts.map +1 -1
  23. package/dist/server/better-auth/clientIp.js +2 -1
  24. package/dist/server/better-auth/clientIp.js.map +1 -1
  25. package/dist/server/better-auth/mount.d.ts +8 -7
  26. package/dist/server/better-auth/mount.d.ts.map +1 -1
  27. package/dist/server/better-auth/mount.js +6 -24
  28. package/dist/server/better-auth/mount.js.map +1 -1
  29. package/dist/server/better-auth/mountRoutes.d.ts.map +1 -1
  30. package/dist/server/better-auth/mountRoutes.js +6 -6
  31. package/dist/server/better-auth/mountRoutes.js.map +1 -1
  32. package/dist/server/better-auth/mountedSessions.d.ts +9 -5
  33. package/dist/server/better-auth/mountedSessions.d.ts.map +1 -1
  34. package/dist/server/better-auth/mountedSessions.js +5 -5
  35. package/dist/server/better-auth/mountedSessions.js.map +1 -1
  36. package/dist/server/better-auth/sessionPermissions.d.ts +2 -1
  37. package/dist/server/better-auth/sessionPermissions.d.ts.map +1 -1
  38. package/dist/server/better-auth/sessionPermissions.js +6 -5
  39. package/dist/server/better-auth/sessionPermissions.js.map +1 -1
  40. package/dist/server/better-auth/signInGate.d.ts +1 -1
  41. package/dist/server/better-auth/signInGate.d.ts.map +1 -1
  42. package/dist/server/better-auth/signInGate.js +2 -3
  43. package/dist/server/better-auth/signInGate.js.map +1 -1
  44. package/dist/server/better-auth/testing.d.ts +25 -0
  45. package/dist/server/better-auth/testing.d.ts.map +1 -1
  46. package/dist/server/better-auth/testing.js +8 -0
  47. package/dist/server/better-auth/testing.js.map +1 -1
  48. package/dist/server/better-auth/userProfiles.d.ts +1 -1
  49. package/dist/server/better-auth/userProfiles.d.ts.map +1 -1
  50. package/dist/server/better-auth/userProfiles.js +2 -3
  51. package/dist/server/better-auth/userProfiles.js.map +1 -1
  52. package/dist/server/better-auth/userReference.d.ts +5 -0
  53. package/dist/server/better-auth/userReference.d.ts.map +1 -0
  54. package/dist/server/better-auth/userReference.js +2 -0
  55. package/dist/server/better-auth/userReference.js.map +1 -0
  56. package/dist/server/commandChanges.d.ts.map +1 -1
  57. package/dist/server/commandChanges.js +11 -6
  58. package/dist/server/commandChanges.js.map +1 -1
  59. package/dist/server/local.d.ts +4 -3
  60. package/dist/server/local.d.ts.map +1 -1
  61. package/dist/server/local.js +2 -5
  62. package/dist/server/local.js.map +1 -1
  63. package/dist/server/origin.d.ts +7 -2
  64. package/dist/server/origin.d.ts.map +1 -1
  65. package/dist/server/origin.js +14 -5
  66. package/dist/server/origin.js.map +1 -1
  67. package/dist/server/permissions.d.ts +1 -1
  68. package/dist/server/permissions.d.ts.map +1 -1
  69. package/dist/server/permissions.js +7 -8
  70. package/dist/server/permissions.js.map +1 -1
  71. package/dist/server/providerFailure.d.ts +4 -0
  72. package/dist/server/providerFailure.d.ts.map +1 -0
  73. package/dist/server/providerFailure.js +10 -0
  74. package/dist/server/providerFailure.js.map +1 -0
  75. package/dist/server/resolveRole.d.ts +4 -5
  76. package/dist/server/resolveRole.d.ts.map +1 -1
  77. package/dist/server/resolveRole.js +1 -2
  78. package/dist/server/resolveRole.js.map +1 -1
  79. package/dist/server/session.d.ts +1 -1
  80. package/dist/server/session.d.ts.map +1 -1
  81. package/dist/server/session.js +10 -11
  82. package/dist/server/session.js.map +1 -1
  83. package/dist/server/tracing.d.ts.map +1 -1
  84. package/dist/server/tracing.js +6 -2
  85. package/dist/server/tracing.js.map +1 -1
  86. package/dist/server/trustedProxy.d.ts +0 -1
  87. package/dist/server/trustedProxy.d.ts.map +1 -1
  88. package/dist/server/trustedProxy.js +1 -4
  89. package/dist/server/trustedProxy.js.map +1 -1
  90. package/package.json +13 -13
  91. package/src/identity.ts +10 -8
  92. package/src/middleware.ts +7 -4
  93. package/src/permission.ts +5 -17
  94. package/src/server/adapters/betterAuthSessions.ts +4 -10
  95. package/src/server/better-auth/admittedSessions.ts +38 -0
  96. package/src/server/better-auth/clientIp.ts +2 -1
  97. package/src/server/better-auth/mount.ts +8 -38
  98. package/src/server/better-auth/mountRoutes.ts +6 -10
  99. package/src/server/better-auth/mountedSessions.ts +19 -10
  100. package/src/server/better-auth/sessionPermissions.ts +10 -6
  101. package/src/server/better-auth/signInGate.ts +3 -10
  102. package/src/server/better-auth/testing.ts +12 -0
  103. package/src/server/better-auth/userProfiles.ts +3 -10
  104. package/src/server/better-auth/userReference.ts +1 -0
  105. package/src/server/commandChanges.ts +46 -33
  106. package/src/server/local.ts +7 -8
  107. package/src/server/origin.ts +23 -6
  108. package/src/server/permissions.ts +17 -14
  109. package/src/server/providerFailure.ts +13 -0
  110. package/src/server/resolveRole.ts +4 -2
  111. package/src/server/session.ts +10 -10
  112. package/src/server/tracing.ts +8 -2
  113. package/src/server/trustedProxy.ts +1 -5
  114. package/dist/server/sessionProfile.d.ts +0 -3
  115. package/dist/server/sessionProfile.d.ts.map +0 -1
  116. package/dist/server/sessionProfile.js +0 -4
  117. package/dist/server/sessionProfile.js.map +0 -1
  118. package/src/server/sessionProfile.ts +0 -5
@@ -1,4 +1,4 @@
1
- import { Duration, Effect, Exit, Layer, Option } from "effect";
1
+ import { Duration, Effect, Exit, Layer, Option, Schema } from "effect";
2
2
  import type { Headers } from "effect/http";
3
3
  import type { Permission } from "@shivaedev/access/permission.ts";
4
4
  import type { RoleSet } from "@shivaedev/access/roleSet.ts";
@@ -8,17 +8,16 @@ import {
8
8
  Identity,
9
9
  OptionalIdentity,
10
10
  SessionUser,
11
+ SessionUserSchema,
11
12
  type SessionUserValue,
12
13
  SessionUserWithProviderAccounts,
13
14
  type SessionUserWithProviderAccountsValue,
14
15
  } from "#identity.ts";
15
16
  import { Authenticated, AuthenticatedUser, AuthenticatedUserWithProviderAccounts, MaybeAuthenticated } from "#middleware.ts";
16
17
  import { commandChanges } from "#server/commandChanges.ts";
17
- import { type OriginPolicy, originRequest } from "./origin.ts";
18
+ import { type OriginPolicy, transportOriginRequest } from "#server/origin.ts";
18
19
  import { resolveRole } from "./resolveRole.ts";
19
20
  import { revalidateStream } from "./revalidateStream.ts";
20
- import { sessionProfile } from "./sessionProfile.ts";
21
- import { transportHeaders } from "./transportHeaders.ts";
22
21
  export interface SessionShape {
23
22
  readonly user: {
24
23
  readonly id: string;
@@ -43,15 +42,16 @@ export const resolveSession: <TSession extends SessionShape>(
43
42
  headers: Headers.Headers,
44
43
  rpc: string,
45
44
  ) {
46
- const transport = yield* transportHeaders(headers);
47
- if (!policy.origin(originRequest(transport, rpc))) {
45
+ const request = yield* transportOriginRequest(headers, rpc);
46
+ if (!policy.origin(request)) {
48
47
  return yield* new Forbidden({ message: "Origin not allowed" });
49
48
  }
50
- const session = yield* policy.provider.get(transport);
49
+ const session = yield* policy.provider.get(request.headers);
51
50
  if (Option.isNone(session) || policy.roles === undefined) {
52
51
  return session;
53
52
  }
54
- const access = yield* resolveRole(policy.roles, Reflect.get(session.value.user, "role"));
53
+ const role: unknown = Reflect.get(session.value.user, "role");
54
+ const access = yield* resolveRole(policy.roles, role);
55
55
  return Option.some({ ...session.value, user: { ...session.value.user, ...access } });
56
56
  });
57
57
  function identified(id: string) {
@@ -99,7 +99,7 @@ export function withSessionUser<TSession extends UserSessionShape>(policy: Sessi
99
99
  if (Option.isNone(session)) {
100
100
  return yield* new Unauthorized({ message: "Authentication required" });
101
101
  }
102
- const user = sessionProfile(session.value.user);
102
+ const user = Schema.decodeSync(SessionUserSchema)(session.value.user);
103
103
  const id = yield* identified(session.value.user.id);
104
104
  return yield* effect.pipe(
105
105
  Effect.provideService(Identity, { id }),
@@ -135,7 +135,7 @@ export function authenticatedUserWithProviderAccountsLayer<TSession extends Prov
135
135
  Effect.map(providerAccounts, (values) => values.map(({ accountId, providerId }) => ({ accountId, providerId }))),
136
136
  (exit) => (Exit.isSuccess(exit) ? Duration.infinity : Duration.zero),
137
137
  );
138
- const user = sessionProfile(session.value.user);
138
+ const user = Schema.decodeSync(SessionUserSchema)(session.value.user);
139
139
  yield* identified(id);
140
140
  return yield* authorizeReads(commandChanges(effect, rpc, payload), { payload, rpc }, Option.some({ id })).pipe(
141
141
  revalidateStream(policy, rpc, id, resolveSession(policy, headers, rpc._tag)),
@@ -1,8 +1,8 @@
1
- import { Cause, Context, Effect, Exit, Layer, Option, Predicate, Random } from "effect";
1
+ import { Cause, Context, Effect, ErrorReporter, Exit, Layer, Option, Predicate, Random } from "effect";
2
2
  import { Headers } from "effect/http";
3
3
  import { KeyScope } from "@shivaedev/contract/serverMetadata.ts";
4
4
  import { redact } from "@shivaedev/errors/redact.ts";
5
- import { redactCause } from "@shivaedev/errors/redactCause.ts";
5
+ import { redactCause, redactDiagnosticCause } from "@shivaedev/errors/redactCause.ts";
6
6
  import { isSensitiveKey, REDACTED, redactText, type SensitiveKey } from "@shivaedev/errors/sensitive.ts";
7
7
  import { RequestId } from "#identity.ts";
8
8
  import { RequestTracing } from "#middleware.ts";
@@ -44,6 +44,12 @@ function logFailure(cause: Cause.Cause<unknown>, payload: unknown, sensitive: Se
44
44
  );
45
45
  }
46
46
  const annotations = { "rpc.payload": redact(payload, sensitive) };
47
+ const mapped = Option.flatMap(Cause.findErrorOption(cause), (error) =>
48
+ ErrorReporter.isIgnored(error) && Predicate.hasProperty(error, "cause") && Cause.isCause(error.cause) ? Option.some(error.cause) : Option.none(),
49
+ );
50
+ if (Option.isSome(mapped)) {
51
+ return Effect.annotateLogs(Effect.logError("RPC defect", redactDiagnosticCause(mapped.value, sensitive)), annotations);
52
+ }
47
53
  if (!Cause.hasDies(cause)) {
48
54
  return Effect.annotateLogs(Effect.logInfo("RPC failure"), { ...annotations, "rpc.failure": failureTag(cause, sensitive) });
49
55
  }
@@ -1,10 +1,6 @@
1
1
  import { BlockList, isIP } from "node:net";
2
2
  import { Schema } from "effect";
3
- import { addProxyAddress, proxyRanges as normalizedRanges } from "./proxyRanges.ts";
4
-
5
- export function proxyRanges(value: string): string[] | undefined {
6
- return normalizedRanges(value);
7
- }
3
+ import { addProxyAddress, proxyRanges } from "./proxyRanges.ts";
8
4
 
9
5
  export function proxyAddresses(value: string): BlockList | undefined {
10
6
  const addresses = new BlockList();
@@ -1,3 +0,0 @@
1
- import type { SessionUserValue } from "#identity.ts";
2
- export declare function sessionProfile({ id, name, email, role, permissions }: SessionUserValue): SessionUserValue;
3
- //# sourceMappingURL=sessionProfile.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"sessionProfile.d.ts","sourceRoot":"","sources":["../../src/server/sessionProfile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAErD,wBAAgB,cAAc,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,gBAAgB,GAAG,gBAAgB,CAEzG"}
@@ -1,4 +0,0 @@
1
- export function sessionProfile({ id, name, email, role, permissions }) {
2
- return { email, id, name, ...(role === undefined ? {} : { role }), ...(permissions === undefined ? {} : { permissions }) };
3
- }
4
- //# sourceMappingURL=sessionProfile.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"sessionProfile.js","sourceRoot":"","sources":["../../src/server/sessionProfile.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,cAAc,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAoB;IACtF,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC;AAC5H,CAAC"}
@@ -1,5 +0,0 @@
1
- import type { SessionUserValue } from "#identity.ts";
2
-
3
- export function sessionProfile({ id, name, email, role, permissions }: SessionUserValue): SessionUserValue {
4
- return { email, id, name, ...(role === undefined ? {} : { role }), ...(permissions === undefined ? {} : { permissions }) };
5
- }