hazo_auth 10.26.2 → 10.31.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 (97) hide show
  1. package/cli-src/lib/auth/auth_cache.ts +11 -1
  2. package/cli-src/lib/auth/auth_types.ts +6 -0
  3. package/cli-src/lib/auth/hazo_get_auth.server.ts +66 -8
  4. package/cli-src/lib/auth/hazo_get_tenant_auth.server.ts +9 -45
  5. package/cli-src/lib/auth/scope_header.ts +58 -0
  6. package/cli-src/lib/email_verification_config.server.ts +3 -0
  7. package/cli-src/lib/forgot_password_config.server.ts +3 -0
  8. package/cli-src/lib/register_config.server.ts +3 -0
  9. package/cli-src/lib/reset_password_config.server.ts +3 -0
  10. package/cli-src/lib/schema/sqlite_schema.ts +150 -38
  11. package/cli-src/lib/services/index.ts +1 -0
  12. package/cli-src/lib/services/registration_service.ts +29 -4
  13. package/cli-src/lib/services/scope_membership_service.ts +68 -0
  14. package/cli-src/lib/services/scope_service.ts +21 -0
  15. package/cli-src/lib/services/user_scope_service.ts +4 -32
  16. package/dist/components/layouts/email_verification/index.d.ts +3 -1
  17. package/dist/components/layouts/email_verification/index.d.ts.map +1 -1
  18. package/dist/components/layouts/email_verification/index.js +4 -4
  19. package/dist/components/layouts/forgot_password/index.d.ts +3 -1
  20. package/dist/components/layouts/forgot_password/index.d.ts.map +1 -1
  21. package/dist/components/layouts/forgot_password/index.js +2 -2
  22. package/dist/components/layouts/register/hooks/use_register_form.d.ts +6 -1
  23. package/dist/components/layouts/register/hooks/use_register_form.d.ts.map +1 -1
  24. package/dist/components/layouts/register/hooks/use_register_form.js +4 -3
  25. package/dist/components/layouts/register/index.d.ts +7 -1
  26. package/dist/components/layouts/register/index.d.ts.map +1 -1
  27. package/dist/components/layouts/register/index.js +3 -2
  28. package/dist/components/layouts/reset_password/index.d.ts +3 -1
  29. package/dist/components/layouts/reset_password/index.d.ts.map +1 -1
  30. package/dist/components/layouts/reset_password/index.js +5 -5
  31. package/dist/lib/auth/auth_cache.d.ts +6 -2
  32. package/dist/lib/auth/auth_cache.d.ts.map +1 -1
  33. package/dist/lib/auth/auth_cache.js +6 -2
  34. package/dist/lib/auth/auth_types.d.ts +1 -0
  35. package/dist/lib/auth/auth_types.d.ts.map +1 -1
  36. package/dist/lib/auth/hazo_get_auth.server.d.ts.map +1 -1
  37. package/dist/lib/auth/hazo_get_auth.server.js +61 -8
  38. package/dist/lib/auth/hazo_get_tenant_auth.server.d.ts +2 -18
  39. package/dist/lib/auth/hazo_get_tenant_auth.server.d.ts.map +1 -1
  40. package/dist/lib/auth/hazo_get_tenant_auth.server.js +5 -38
  41. package/dist/lib/auth/scope_header.d.ts +28 -0
  42. package/dist/lib/auth/scope_header.d.ts.map +1 -0
  43. package/dist/lib/auth/scope_header.js +34 -0
  44. package/dist/lib/email_verification_config.server.d.ts +2 -0
  45. package/dist/lib/email_verification_config.server.d.ts.map +1 -1
  46. package/dist/lib/email_verification_config.server.js +1 -0
  47. package/dist/lib/forgot_password_config.server.d.ts +2 -0
  48. package/dist/lib/forgot_password_config.server.d.ts.map +1 -1
  49. package/dist/lib/forgot_password_config.server.js +1 -0
  50. package/dist/lib/register_config.server.d.ts +2 -0
  51. package/dist/lib/register_config.server.d.ts.map +1 -1
  52. package/dist/lib/register_config.server.js +1 -0
  53. package/dist/lib/reset_password_config.server.d.ts +2 -0
  54. package/dist/lib/reset_password_config.server.d.ts.map +1 -1
  55. package/dist/lib/reset_password_config.server.js +1 -0
  56. package/dist/lib/schema/sqlite_schema.d.ts +1 -1
  57. package/dist/lib/schema/sqlite_schema.d.ts.map +1 -1
  58. package/dist/lib/schema/sqlite_schema.js +150 -38
  59. package/dist/lib/services/index.d.ts +1 -0
  60. package/dist/lib/services/index.d.ts.map +1 -1
  61. package/dist/lib/services/index.js +1 -0
  62. package/dist/lib/services/registration_service.d.ts +11 -0
  63. package/dist/lib/services/registration_service.d.ts.map +1 -1
  64. package/dist/lib/services/registration_service.js +19 -5
  65. package/dist/lib/services/scope_membership_service.d.ts +20 -0
  66. package/dist/lib/services/scope_membership_service.d.ts.map +1 -0
  67. package/dist/lib/services/scope_membership_service.js +49 -0
  68. package/dist/lib/services/scope_service.d.ts +6 -0
  69. package/dist/lib/services/scope_service.d.ts.map +1 -1
  70. package/dist/lib/services/scope_service.js +12 -0
  71. package/dist/lib/services/user_scope_service.d.ts.map +1 -1
  72. package/dist/lib/services/user_scope_service.js +4 -30
  73. package/dist/server/routes/register.d.ts.map +1 -1
  74. package/dist/server/routes/register.js +7 -2
  75. package/dist/server/routes/user_management_users.d.ts +1 -1
  76. package/dist/server_pages/forgot_password.d.ts.map +1 -1
  77. package/dist/server_pages/forgot_password.js +1 -1
  78. package/dist/server_pages/forgot_password_client_wrapper.d.ts +1 -1
  79. package/dist/server_pages/forgot_password_client_wrapper.d.ts.map +1 -1
  80. package/dist/server_pages/forgot_password_client_wrapper.js +2 -2
  81. package/dist/server_pages/register.d.ts +19 -1
  82. package/dist/server_pages/register.d.ts.map +1 -1
  83. package/dist/server_pages/register.js +4 -4
  84. package/dist/server_pages/register_client_wrapper.d.ts +3 -1
  85. package/dist/server_pages/register_client_wrapper.d.ts.map +1 -1
  86. package/dist/server_pages/register_client_wrapper.js +2 -2
  87. package/dist/server_pages/reset_password.d.ts.map +1 -1
  88. package/dist/server_pages/reset_password.js +1 -1
  89. package/dist/server_pages/reset_password_client_wrapper.d.ts +1 -1
  90. package/dist/server_pages/reset_password_client_wrapper.d.ts.map +1 -1
  91. package/dist/server_pages/reset_password_client_wrapper.js +2 -2
  92. package/dist/server_pages/verify_email.d.ts.map +1 -1
  93. package/dist/server_pages/verify_email.js +1 -1
  94. package/dist/server_pages/verify_email_client_wrapper.d.ts +1 -1
  95. package/dist/server_pages/verify_email_client_wrapper.d.ts.map +1 -1
  96. package/dist/server_pages/verify_email_client_wrapper.js +2 -2
  97. package/package.json +13 -12
@@ -0,0 +1,34 @@
1
+ import { get_cookie_name } from "../cookies_config.server.js";
2
+ // section: constants
3
+ /** Default header name for the active scope ID. */
4
+ export const DEFAULT_SCOPE_HEADER = "X-Hazo-Scope-Id";
5
+ /**
6
+ * Base cookie name for scope ID (will have the configured prefix applied).
7
+ *
8
+ * Exported so a consuming app can SET the same cookie this module READS — without it,
9
+ * an app implementing a scope switcher has to duplicate the configured prefix and drift
10
+ * the moment it changes.
11
+ */
12
+ export const SCOPE_COOKIE_BASE_NAME = "hazo_auth_scope_id";
13
+ /** The live, prefixed scope cookie name for this deployment. */
14
+ export function get_scope_cookie_name() {
15
+ return get_cookie_name(SCOPE_COOKIE_BASE_NAME);
16
+ }
17
+ // section: helpers
18
+ /**
19
+ * Extracts the active scope ID from request headers or cookies.
20
+ * Priority: header > cookie.
21
+ * @param request - NextRequest object
22
+ * @param overrides - optional header/cookie name overrides
23
+ * @returns Scope ID if found, undefined otherwise
24
+ */
25
+ export function extract_scope_id_from_request(request, overrides = {}) {
26
+ var _a;
27
+ const header_name = overrides.scope_header_name || DEFAULT_SCOPE_HEADER;
28
+ const header_value = request.headers.get(header_name);
29
+ if (header_value) {
30
+ return header_value;
31
+ }
32
+ const cookie_name = overrides.scope_cookie_name || get_scope_cookie_name();
33
+ return (_a = request.cookies.get(cookie_name)) === null || _a === void 0 ? void 0 : _a.value;
34
+ }
@@ -5,6 +5,8 @@ export type EmailVerificationConfig = {
5
5
  showReturnHomeButton: boolean;
6
6
  returnHomeButtonLabel: string | undefined;
7
7
  returnHomePath: string;
8
+ /** See `AlreadyLoggedInConfig.redirectPath` — undefined unless `[hazo_auth__already_logged_in] redirect_path` is set. */
9
+ alreadyLoggedInRedirectPath: string | undefined;
8
10
  imageSrc: string;
9
11
  imageAlt: string;
10
12
  imageBackgroundColor: string;
@@ -1 +1 @@
1
- {"version":3,"file":"email_verification_config.server.d.ts","sourceRoot":"","sources":["../../src/lib/email_verification_config.server.ts"],"names":[],"mappings":"AAEA,OAAO,aAAa,CAAC;AAYrB,MAAM,MAAM,uBAAuB,GAAG;IACpC,sBAAsB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3C,gBAAgB,EAAE,OAAO,CAAC;IAC1B,oBAAoB,EAAE,OAAO,CAAC;IAC9B,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1C,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,EAAE,MAAM,CAAC;CAC9B,CAAC;AAGF;;;;GAIG;AACH,wBAAgB,6BAA6B,IAAI,uBAAuB,CAoCvE"}
1
+ {"version":3,"file":"email_verification_config.server.d.ts","sourceRoot":"","sources":["../../src/lib/email_verification_config.server.ts"],"names":[],"mappings":"AAEA,OAAO,aAAa,CAAC;AAYrB,MAAM,MAAM,uBAAuB,GAAG;IACpC,sBAAsB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3C,gBAAgB,EAAE,OAAO,CAAC;IAC1B,oBAAoB,EAAE,OAAO,CAAC;IAC9B,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1C,cAAc,EAAE,MAAM,CAAC;IACvB,yHAAyH;IACzH,2BAA2B,EAAE,MAAM,GAAG,SAAS,CAAC;IAChD,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,EAAE,MAAM,CAAC;CAC9B,CAAC;AAGF;;;;GAIG;AACH,wBAAgB,6BAA6B,IAAI,uBAAuB,CAqCvE"}
@@ -30,6 +30,7 @@ export function get_email_verification_config() {
30
30
  showReturnHomeButton: alreadyLoggedInConfig.showReturnHomeButton,
31
31
  returnHomeButtonLabel: alreadyLoggedInConfig.returnHomeButtonLabel,
32
32
  returnHomePath: alreadyLoggedInConfig.returnHomePath,
33
+ alreadyLoggedInRedirectPath: alreadyLoggedInConfig.redirectPath,
33
34
  imageSrc,
34
35
  imageAlt,
35
36
  imageBackgroundColor,
@@ -5,6 +5,8 @@ export type ForgotPasswordConfig = {
5
5
  showReturnHomeButton: boolean;
6
6
  returnHomeButtonLabel: string | undefined;
7
7
  returnHomePath: string;
8
+ /** See `AlreadyLoggedInConfig.redirectPath` — undefined unless `[hazo_auth__already_logged_in] redirect_path` is set. */
9
+ alreadyLoggedInRedirectPath: string | undefined;
8
10
  imageSrc: string;
9
11
  imageAlt: string;
10
12
  imageBackgroundColor: string;
@@ -1 +1 @@
1
- {"version":3,"file":"forgot_password_config.server.d.ts","sourceRoot":"","sources":["../../src/lib/forgot_password_config.server.ts"],"names":[],"mappings":"AAEA,OAAO,aAAa,CAAC;AAYrB,MAAM,MAAM,oBAAoB,GAAG;IACjC,sBAAsB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3C,gBAAgB,EAAE,OAAO,CAAC;IAC1B,oBAAoB,EAAE,OAAO,CAAC;IAC9B,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1C,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,EAAE,MAAM,CAAC;CAC9B,CAAC;AAGF;;;;GAIG;AACH,wBAAgB,0BAA0B,IAAI,oBAAoB,CAoCjE"}
1
+ {"version":3,"file":"forgot_password_config.server.d.ts","sourceRoot":"","sources":["../../src/lib/forgot_password_config.server.ts"],"names":[],"mappings":"AAEA,OAAO,aAAa,CAAC;AAYrB,MAAM,MAAM,oBAAoB,GAAG;IACjC,sBAAsB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3C,gBAAgB,EAAE,OAAO,CAAC;IAC1B,oBAAoB,EAAE,OAAO,CAAC;IAC9B,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1C,cAAc,EAAE,MAAM,CAAC;IACvB,yHAAyH;IACzH,2BAA2B,EAAE,MAAM,GAAG,SAAS,CAAC;IAChD,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,EAAE,MAAM,CAAC;CAC9B,CAAC;AAGF;;;;GAIG;AACH,wBAAgB,0BAA0B,IAAI,oBAAoB,CAqCjE"}
@@ -30,6 +30,7 @@ export function get_forgot_password_config() {
30
30
  showReturnHomeButton: alreadyLoggedInConfig.showReturnHomeButton,
31
31
  returnHomeButtonLabel: alreadyLoggedInConfig.returnHomeButtonLabel,
32
32
  returnHomePath: alreadyLoggedInConfig.returnHomePath,
33
+ alreadyLoggedInRedirectPath: alreadyLoggedInConfig.redirectPath,
33
34
  imageSrc,
34
35
  imageAlt,
35
36
  imageBackgroundColor,
@@ -15,6 +15,8 @@ export type RegisterConfig = {
15
15
  showReturnHomeButton: boolean;
16
16
  returnHomeButtonLabel: string | undefined;
17
17
  returnHomePath: string;
18
+ /** See `AlreadyLoggedInConfig.redirectPath` — undefined unless `[hazo_auth__already_logged_in] redirect_path` is set. */
19
+ alreadyLoggedInRedirectPath: string | undefined;
18
20
  signInPath: string;
19
21
  /** Undefined when not configured — RegisterLayout falls back to `t("shared.sign_in_default")`. */
20
22
  signInLabel: string | undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"register_config.server.d.ts","sourceRoot":"","sources":["../../src/lib/register_config.server.ts"],"names":[],"mappings":"AAEA,OAAO,aAAa,CAAC;AAarB,OAAO,EAA8B,KAAK,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACxG,OAAO,EAA4B,KAAK,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAQjG,MAAM,MAAM,cAAc,GAAG;IAC3B,aAAa,EAAE,OAAO,CAAC;IACvB,oBAAoB,EAAE;QACpB,cAAc,EAAE,MAAM,CAAC;QACvB,iBAAiB,EAAE,OAAO,CAAC;QAC3B,iBAAiB,EAAE,OAAO,CAAC;QAC3B,cAAc,EAAE,OAAO,CAAC;QACxB,eAAe,EAAE,OAAO,CAAC;KAC1B,CAAC;IACF,sBAAsB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3C,gBAAgB,EAAE,OAAO,CAAC;IAC1B,oBAAoB,EAAE,OAAO,CAAC;IAC9B,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1C,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,kGAAkG;IAClG,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,0BAA0B;IAC1B,KAAK,EAAE;QACL,aAAa,EAAE,OAAO,CAAC;QACvB,qBAAqB,EAAE,OAAO,CAAC;QAC/B,kBAAkB,EAAE,MAAM,GAAG,SAAS,CAAC;QACvC,kBAAkB,EAAE,MAAM,GAAG,SAAS,CAAC;QACvC,qBAAqB,EAAE,OAAO,CAAC;QAC/B,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAC;KAC1C,CAAC;IACF;8DAC0D;IAC1D,cAAc,EAAE,oBAAoB,CAAC;IACrC;;;4DAGwD;IACxD,kBAAkB,EAAE,iBAAiB,GAAG,IAAI,CAAC;CAC9C,CAAC;AAGF;;;;GAIG;AACH,wBAAgB,mBAAmB,IAAI,cAAc,CAqFpD"}
1
+ {"version":3,"file":"register_config.server.d.ts","sourceRoot":"","sources":["../../src/lib/register_config.server.ts"],"names":[],"mappings":"AAEA,OAAO,aAAa,CAAC;AAarB,OAAO,EAA8B,KAAK,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACxG,OAAO,EAA4B,KAAK,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAQjG,MAAM,MAAM,cAAc,GAAG;IAC3B,aAAa,EAAE,OAAO,CAAC;IACvB,oBAAoB,EAAE;QACpB,cAAc,EAAE,MAAM,CAAC;QACvB,iBAAiB,EAAE,OAAO,CAAC;QAC3B,iBAAiB,EAAE,OAAO,CAAC;QAC3B,cAAc,EAAE,OAAO,CAAC;QACxB,eAAe,EAAE,OAAO,CAAC;KAC1B,CAAC;IACF,sBAAsB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3C,gBAAgB,EAAE,OAAO,CAAC;IAC1B,oBAAoB,EAAE,OAAO,CAAC;IAC9B,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1C,cAAc,EAAE,MAAM,CAAC;IACvB,yHAAyH;IACzH,2BAA2B,EAAE,MAAM,GAAG,SAAS,CAAC;IAChD,UAAU,EAAE,MAAM,CAAC;IACnB,kGAAkG;IAClG,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,0BAA0B;IAC1B,KAAK,EAAE;QACL,aAAa,EAAE,OAAO,CAAC;QACvB,qBAAqB,EAAE,OAAO,CAAC;QAC/B,kBAAkB,EAAE,MAAM,GAAG,SAAS,CAAC;QACvC,kBAAkB,EAAE,MAAM,GAAG,SAAS,CAAC;QACvC,qBAAqB,EAAE,OAAO,CAAC;QAC/B,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAC;KAC1C,CAAC;IACF;8DAC0D;IAC1D,cAAc,EAAE,oBAAoB,CAAC;IACrC;;;4DAGwD;IACxD,kBAAkB,EAAE,iBAAiB,GAAG,IAAI,CAAC;CAC9C,CAAC;AAGF;;;;GAIG;AACH,wBAAgB,mBAAmB,IAAI,cAAc,CAsFpD"}
@@ -59,6 +59,7 @@ export function get_register_config() {
59
59
  showReturnHomeButton: alreadyLoggedInConfig.showReturnHomeButton,
60
60
  returnHomeButtonLabel: alreadyLoggedInConfig.returnHomeButtonLabel,
61
61
  returnHomePath: alreadyLoggedInConfig.returnHomePath,
62
+ alreadyLoggedInRedirectPath: alreadyLoggedInConfig.redirectPath,
62
63
  signInPath,
63
64
  signInLabel,
64
65
  imageSrc,
@@ -11,6 +11,8 @@ export type ResetPasswordConfig = {
11
11
  showReturnHomeButton: boolean;
12
12
  returnHomeButtonLabel: string | undefined;
13
13
  returnHomePath: string;
14
+ /** See `AlreadyLoggedInConfig.redirectPath` — undefined unless `[hazo_auth__already_logged_in] redirect_path` is set. */
15
+ alreadyLoggedInRedirectPath: string | undefined;
14
16
  passwordRequirements: {
15
17
  minimum_length: number;
16
18
  require_uppercase: boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"reset_password_config.server.d.ts","sourceRoot":"","sources":["../../src/lib/reset_password_config.server.ts"],"names":[],"mappings":"AAEA,OAAO,aAAa,CAAC;AAarB,MAAM,MAAM,mBAAmB,GAAG;IAChC,oHAAoH;IACpH,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,uHAAuH;IACvH,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,sBAAsB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3C,gBAAgB,EAAE,OAAO,CAAC;IAC1B,oBAAoB,EAAE,OAAO,CAAC;IAC9B,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1C,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE;QACpB,cAAc,EAAE,MAAM,CAAC;QACvB,iBAAiB,EAAE,OAAO,CAAC;QAC3B,iBAAiB,EAAE,OAAO,CAAC;QAC3B,cAAc,EAAE,OAAO,CAAC;QACxB,eAAe,EAAE,OAAO,CAAC;KAC1B,CAAC;IACF,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,EAAE,MAAM,CAAC;CAC9B,CAAC;AAGF;;;;GAIG;AACH,wBAAgB,yBAAyB,IAAI,mBAAmB,CAwD/D"}
1
+ {"version":3,"file":"reset_password_config.server.d.ts","sourceRoot":"","sources":["../../src/lib/reset_password_config.server.ts"],"names":[],"mappings":"AAEA,OAAO,aAAa,CAAC;AAarB,MAAM,MAAM,mBAAmB,GAAG;IAChC,oHAAoH;IACpH,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,uHAAuH;IACvH,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,sBAAsB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3C,gBAAgB,EAAE,OAAO,CAAC;IAC1B,oBAAoB,EAAE,OAAO,CAAC;IAC9B,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1C,cAAc,EAAE,MAAM,CAAC;IACvB,yHAAyH;IACzH,2BAA2B,EAAE,MAAM,GAAG,SAAS,CAAC;IAChD,oBAAoB,EAAE;QACpB,cAAc,EAAE,MAAM,CAAC;QACvB,iBAAiB,EAAE,OAAO,CAAC;QAC3B,iBAAiB,EAAE,OAAO,CAAC;QAC3B,cAAc,EAAE,OAAO,CAAC;QACxB,eAAe,EAAE,OAAO,CAAC;KAC1B,CAAC;IACF,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,EAAE,MAAM,CAAC;CAC9B,CAAC;AAGF;;;;GAIG;AACH,wBAAgB,yBAAyB,IAAI,mBAAmB,CAyD/D"}
@@ -45,6 +45,7 @@ export function get_reset_password_config() {
45
45
  showReturnHomeButton: alreadyLoggedInConfig.showReturnHomeButton,
46
46
  returnHomeButtonLabel: alreadyLoggedInConfig.returnHomeButtonLabel,
47
47
  returnHomePath: alreadyLoggedInConfig.returnHomePath,
48
+ alreadyLoggedInRedirectPath: alreadyLoggedInConfig.redirectPath,
48
49
  passwordRequirements,
49
50
  imageSrc,
50
51
  imageAlt,
@@ -1,2 +1,2 @@
1
- export declare const SQLITE_SCHEMA = "\n-- hazo_auth canonical SQLite schema\n-- This schema creates all tables required by hazo_auth\n\n-- Users table (from migration 011)\nCREATE TABLE IF NOT EXISTS hazo_users (\n id TEXT PRIMARY KEY,\n email_address TEXT NOT NULL UNIQUE,\n password_hash TEXT,\n name TEXT,\n email_verified BOOLEAN DEFAULT false,\n login_attempts INTEGER DEFAULT 0,\n last_logon TEXT,\n profile_picture_url TEXT,\n profile_source TEXT CHECK(profile_source IN ('gravatar', 'custom', 'predefined')),\n mfa_secret TEXT,\n url_on_logon TEXT,\n google_id TEXT UNIQUE,\n auth_providers TEXT DEFAULT 'email',\n user_type TEXT,\n app_user_data TEXT,\n status TEXT DEFAULT 'ACTIVE' CHECK(status IN ('PENDING', 'ACTIVE', 'BLOCKED')),\n managed_by_user_id TEXT REFERENCES hazo_users(id) ON DELETE SET NULL,\n pin_hash TEXT,\n created_at TEXT NOT NULL DEFAULT (datetime('now')),\n changed_at TEXT NOT NULL DEFAULT (datetime('now'))\n);\n\nCREATE INDEX IF NOT EXISTS idx_hazo_users_email ON hazo_users(email_address);\nCREATE INDEX IF NOT EXISTS idx_hazo_users_google_id ON hazo_users(google_id);\nCREATE INDEX IF NOT EXISTS idx_hazo_users_status ON hazo_users(status);\n\n-- Refresh tokens table\n-- Note: runtime (token_service.ts) writes token_hash (argon2-hashed value) on\n-- insert and verifies via argon2.verify(token_hash, plaintext_token) on read.\n-- The plaintext \"token\" column is retained nullable for legacy compatibility\n-- but new writes only set token_hash.\nCREATE TABLE IF NOT EXISTS hazo_refresh_tokens (\n id TEXT PRIMARY KEY,\n user_id TEXT NOT NULL REFERENCES hazo_users(id) ON DELETE CASCADE,\n token TEXT UNIQUE,\n token_hash TEXT,\n token_type TEXT DEFAULT 'refresh',\n expires_at TEXT NOT NULL,\n created_at TEXT NOT NULL DEFAULT (datetime('now'))\n);\n\nCREATE INDEX IF NOT EXISTS idx_hazo_refresh_tokens_user ON hazo_refresh_tokens(user_id);\nCREATE INDEX IF NOT EXISTS idx_hazo_refresh_tokens_token ON hazo_refresh_tokens(token);\nCREATE INDEX IF NOT EXISTS idx_hazo_refresh_tokens_token_hash ON hazo_refresh_tokens(token_hash);\n\n-- Roles table\nCREATE TABLE IF NOT EXISTS hazo_roles (\n id TEXT PRIMARY KEY,\n role_name TEXT NOT NULL UNIQUE,\n created_at TEXT NOT NULL DEFAULT (datetime('now')),\n changed_at TEXT NOT NULL DEFAULT (datetime('now'))\n);\n\n-- Permissions table\nCREATE TABLE IF NOT EXISTS hazo_permissions (\n id TEXT PRIMARY KEY,\n permission_name TEXT NOT NULL UNIQUE,\n description TEXT,\n created_at TEXT NOT NULL DEFAULT (datetime('now')),\n changed_at TEXT NOT NULL DEFAULT (datetime('now'))\n);\n\n-- Role-permission assignments (composite PK, no id column)\nCREATE TABLE IF NOT EXISTS hazo_role_permissions (\n role_id TEXT NOT NULL REFERENCES hazo_roles(id) ON DELETE CASCADE,\n permission_id TEXT NOT NULL REFERENCES hazo_permissions(id) ON DELETE CASCADE,\n created_at TEXT NOT NULL DEFAULT (datetime('now')),\n PRIMARY KEY (role_id, permission_id)\n);\n\n-- Unified scopes table (hierarchical multi-tenancy)\nCREATE TABLE IF NOT EXISTS hazo_scopes (\n id TEXT PRIMARY KEY,\n parent_id TEXT REFERENCES hazo_scopes(id) ON DELETE CASCADE,\n name TEXT NOT NULL,\n level TEXT NOT NULL,\n logo_url TEXT,\n primary_color TEXT,\n secondary_color TEXT,\n tagline TEXT,\n slug TEXT,\n created_at TEXT NOT NULL DEFAULT (datetime('now')),\n changed_at TEXT NOT NULL DEFAULT (datetime('now'))\n);\n\nCREATE INDEX IF NOT EXISTS idx_hazo_scopes_parent ON hazo_scopes(parent_id);\nCREATE INDEX IF NOT EXISTS idx_hazo_scopes_level ON hazo_scopes(level);\nCREATE INDEX IF NOT EXISTS idx_hazo_scopes_slug ON hazo_scopes(slug);\n\n-- Default system scope (for non-multi-tenancy mode)\nINSERT OR IGNORE INTO hazo_scopes (id, parent_id, name, level, created_at, changed_at)\nVALUES ('00000000-0000-0000-0000-000000000001', NULL, 'System', 'default', datetime('now'), datetime('now'));\n\n-- User-scope assignments (membership model with scope-specific roles)\nCREATE TABLE IF NOT EXISTS hazo_user_scopes (\n user_id TEXT NOT NULL REFERENCES hazo_users(id) ON DELETE CASCADE,\n scope_id TEXT NOT NULL REFERENCES hazo_scopes(id) ON DELETE CASCADE,\n root_scope_id TEXT NOT NULL REFERENCES hazo_scopes(id) ON DELETE CASCADE,\n role_id TEXT NOT NULL REFERENCES hazo_roles(id) ON DELETE CASCADE,\n status TEXT DEFAULT 'ACTIVE' CHECK (status IN ('INVITED', 'ACTIVE', 'SUSPENDED', 'DEPARTED')),\n created_at TEXT NOT NULL DEFAULT (datetime('now')),\n changed_at TEXT NOT NULL DEFAULT (datetime('now')),\n PRIMARY KEY (user_id, scope_id)\n);\n\nCREATE INDEX IF NOT EXISTS idx_hazo_user_scopes_scope ON hazo_user_scopes(scope_id);\nCREATE INDEX IF NOT EXISTS idx_hazo_user_scopes_root ON hazo_user_scopes(root_scope_id);\nCREATE INDEX IF NOT EXISTS idx_hazo_user_scopes_role ON hazo_user_scopes(role_id);\n\n-- Invitations table\nCREATE TABLE IF NOT EXISTS hazo_invitations (\n id TEXT PRIMARY KEY,\n email_address TEXT NOT NULL,\n token TEXT NOT NULL UNIQUE,\n scope_id TEXT NOT NULL REFERENCES hazo_scopes(id) ON DELETE CASCADE,\n root_scope_id TEXT NOT NULL REFERENCES hazo_scopes(id) ON DELETE CASCADE,\n role_id TEXT NOT NULL REFERENCES hazo_roles(id) ON DELETE CASCADE,\n invited_by TEXT REFERENCES hazo_users(id) ON DELETE SET NULL,\n status TEXT NOT NULL DEFAULT 'PENDING' CHECK(status IN ('PENDING', 'ACCEPTED', 'EXPIRED', 'REVOKED')),\n expires_at TEXT NOT NULL,\n accepted_at TEXT,\n created_at TEXT NOT NULL DEFAULT (datetime('now')),\n changed_at TEXT NOT NULL DEFAULT (datetime('now'))\n);\n\nCREATE INDEX IF NOT EXISTS idx_hazo_invitations_email ON hazo_invitations(email_address);\nCREATE INDEX IF NOT EXISTS idx_hazo_invitations_token ON hazo_invitations(token);\nCREATE INDEX IF NOT EXISTS idx_hazo_invitations_scope ON hazo_invitations(scope_id);\nCREATE INDEX IF NOT EXISTS idx_hazo_invitations_status ON hazo_invitations(status);\nCREATE INDEX IF NOT EXISTS idx_hazo_invitations_expires ON hazo_invitations(expires_at);\n\nCREATE INDEX IF NOT EXISTS idx_hazo_users_managed_by ON hazo_users(managed_by_user_id);\n\n-- Relationships table\nCREATE TABLE IF NOT EXISTS hazo_user_relationships (\n id TEXT PRIMARY KEY,\n parent_user_id TEXT NOT NULL REFERENCES hazo_users(id) ON DELETE CASCADE,\n child_user_id TEXT NOT NULL REFERENCES hazo_users(id) ON DELETE CASCADE,\n relationship_type TEXT NOT NULL DEFAULT 'parent',\n can_view_progress BOOLEAN DEFAULT true,\n can_edit_profile BOOLEAN DEFAULT true,\n can_delete BOOLEAN DEFAULT false,\n is_self BOOLEAN DEFAULT false,\n created_at TEXT NOT NULL DEFAULT (datetime('now')),\n UNIQUE(parent_user_id, child_user_id)\n);\n\nCREATE INDEX IF NOT EXISTS idx_hazo_user_relationships_parent ON hazo_user_relationships(parent_user_id);\nCREATE INDEX IF NOT EXISTS idx_hazo_user_relationships_child ON hazo_user_relationships(child_user_id);\n\n-- Firm admin role (for firm creators)\nINSERT OR IGNORE INTO hazo_roles (id, role_name, created_at, changed_at)\nVALUES (lower(hex(randomblob(4)) || '-' || hex(randomblob(2)) || '-4' || substr(hex(randomblob(2)),2) || '-' || substr('89ab',abs(random()) % 4 + 1, 1) || substr(hex(randomblob(2)),2) || '-' || hex(randomblob(6))), 'firm_admin', datetime('now'), datetime('now'));\n\n-- Google OAuth tokens (encrypted refresh/access tokens for extra-scope API access)\nCREATE TABLE IF NOT EXISTS hazo_google_oauth_tokens (\n id TEXT PRIMARY KEY,\n user_id TEXT NOT NULL REFERENCES hazo_users(id) ON DELETE CASCADE,\n provider TEXT NOT NULL DEFAULT 'google',\n refresh_token_enc TEXT NOT NULL,\n access_token_enc TEXT,\n scopes TEXT NOT NULL DEFAULT '',\n expires_at TEXT,\n created_at TEXT NOT NULL DEFAULT (datetime('now')),\n changed_at TEXT NOT NULL DEFAULT (datetime('now')),\n UNIQUE(user_id, provider)\n);\n\nCREATE INDEX IF NOT EXISTS idx_hazo_google_oauth_tokens_user ON hazo_google_oauth_tokens(user_id);\n";
1
+ export declare const SQLITE_SCHEMA = "\n-- hazo_auth canonical SQLite schema\n-- This schema creates all tables required by hazo_auth\n-- Represents the FINAL schema state after all 26 migrations.\n\nPRAGMA foreign_keys = ON;\n\n-- Users table\nCREATE TABLE IF NOT EXISTS hazo_users (\n id TEXT PRIMARY KEY,\n email_address TEXT NOT NULL UNIQUE,\n password_hash TEXT,\n name TEXT,\n email_verified INTEGER NOT NULL DEFAULT 0,\n login_attempts INTEGER NOT NULL DEFAULT 0,\n last_logon TEXT,\n profile_picture_url TEXT,\n profile_source TEXT CHECK(profile_source IN ('gravatar', 'custom', 'predefined')),\n mfa_secret TEXT,\n url_on_logon TEXT,\n google_id TEXT UNIQUE,\n auth_providers TEXT NOT NULL DEFAULT 'email',\n user_type TEXT,\n app_user_data TEXT NOT NULL DEFAULT '{}',\n status TEXT NOT NULL DEFAULT 'ACTIVE' CHECK(status IN ('PENDING', 'ACTIVE', 'BLOCKED')),\n managed_by_user_id TEXT REFERENCES hazo_users(id) ON DELETE SET NULL,\n pin_hash TEXT,\n facebook_id TEXT UNIQUE,\n legal_acceptance TEXT NOT NULL DEFAULT '{}',\n preferred_locale TEXT,\n country TEXT,\n state_province TEXT,\n suburb TEXT,\n created_at TEXT NOT NULL DEFAULT (datetime('now')),\n changed_at TEXT NOT NULL DEFAULT (datetime('now'))\n);\n\nCREATE INDEX IF NOT EXISTS idx_hazo_users_email ON hazo_users(email_address);\nCREATE INDEX IF NOT EXISTS idx_hazo_users_google_id ON hazo_users(google_id);\nCREATE INDEX IF NOT EXISTS idx_hazo_users_facebook_id ON hazo_users(facebook_id);\nCREATE INDEX IF NOT EXISTS idx_hazo_users_managed_by ON hazo_users(managed_by_user_id);\nCREATE INDEX IF NOT EXISTS idx_hazo_users_status ON hazo_users(status);\nCREATE INDEX IF NOT EXISTS idx_hazo_users_country ON hazo_users(country);\nCREATE INDEX IF NOT EXISTS idx_hazo_users_state ON hazo_users(state_province);\n\n-- Roles table\nCREATE TABLE IF NOT EXISTS hazo_roles (\n id TEXT PRIMARY KEY,\n role_name TEXT NOT NULL UNIQUE,\n created_at TEXT NOT NULL DEFAULT (datetime('now')),\n changed_at TEXT NOT NULL DEFAULT (datetime('now'))\n);\n\nCREATE INDEX IF NOT EXISTS idx_hazo_roles_role_name ON hazo_roles(role_name);\n\n-- Permissions table\nCREATE TABLE IF NOT EXISTS hazo_permissions (\n id TEXT PRIMARY KEY,\n permission_name TEXT NOT NULL UNIQUE,\n description TEXT,\n created_at TEXT NOT NULL DEFAULT (datetime('now')),\n changed_at TEXT NOT NULL DEFAULT (datetime('now'))\n);\n\nCREATE INDEX IF NOT EXISTS idx_hazo_permissions_permission_name ON hazo_permissions(permission_name);\n\n-- User-role assignments (composite PK, no id column)\nCREATE TABLE IF NOT EXISTS hazo_user_roles (\n user_id TEXT NOT NULL REFERENCES hazo_users(id) ON DELETE CASCADE,\n role_id TEXT NOT NULL REFERENCES hazo_roles(id) ON DELETE CASCADE,\n created_at TEXT NOT NULL DEFAULT (datetime('now')),\n changed_at TEXT NOT NULL DEFAULT (datetime('now')),\n PRIMARY KEY (user_id, role_id)\n);\n\nCREATE INDEX IF NOT EXISTS idx_hazo_user_roles_user_id ON hazo_user_roles(user_id);\nCREATE INDEX IF NOT EXISTS idx_hazo_user_roles_role_id ON hazo_user_roles(role_id);\n\n-- Role-permission assignments (composite PK, no id column)\nCREATE TABLE IF NOT EXISTS hazo_role_permissions (\n role_id TEXT NOT NULL REFERENCES hazo_roles(id) ON DELETE CASCADE,\n permission_id TEXT NOT NULL REFERENCES hazo_permissions(id) ON DELETE CASCADE,\n created_at TEXT NOT NULL DEFAULT (datetime('now')),\n changed_at TEXT NOT NULL DEFAULT (datetime('now')),\n PRIMARY KEY (role_id, permission_id)\n);\n\nCREATE INDEX IF NOT EXISTS idx_hazo_role_permissions_role_id ON hazo_role_permissions(role_id);\nCREATE INDEX IF NOT EXISTS idx_hazo_role_permissions_permission_id ON hazo_role_permissions(permission_id);\n\n-- Refresh tokens table\n-- Note: runtime (token_service.ts) writes token_hash (argon2-hashed value) on\n-- insert and verifies via argon2.verify(token_hash, plaintext_token) on read.\n-- The plaintext \"token\" column is retained nullable for legacy compatibility\n-- but new writes only set token_hash.\nCREATE TABLE IF NOT EXISTS hazo_refresh_tokens (\n id TEXT PRIMARY KEY,\n user_id TEXT NOT NULL REFERENCES hazo_users(id) ON DELETE CASCADE,\n token TEXT UNIQUE,\n token_hash TEXT,\n token_type TEXT NOT NULL DEFAULT 'refresh' CHECK (token_type IN ('refresh', 'password_reset', 'email_verification')),\n expires_at TEXT NOT NULL,\n created_at TEXT NOT NULL DEFAULT (datetime('now'))\n);\n\nCREATE INDEX IF NOT EXISTS idx_hazo_refresh_tokens_user ON hazo_refresh_tokens(user_id);\nCREATE INDEX IF NOT EXISTS idx_hazo_refresh_tokens_token ON hazo_refresh_tokens(token);\nCREATE INDEX IF NOT EXISTS idx_hazo_refresh_tokens_token_hash ON hazo_refresh_tokens(token_hash);\nCREATE INDEX IF NOT EXISTS idx_hazo_refresh_tokens_expires_at ON hazo_refresh_tokens(expires_at);\n\n-- Unified scopes table (hierarchical multi-tenancy)\nCREATE TABLE IF NOT EXISTS hazo_scopes (\n id TEXT PRIMARY KEY,\n parent_id TEXT REFERENCES hazo_scopes(id) ON DELETE SET NULL,\n name TEXT NOT NULL,\n level TEXT NOT NULL,\n logo_url TEXT,\n primary_color TEXT,\n secondary_color TEXT,\n tagline TEXT,\n slug TEXT,\n subscription_id TEXT,\n app_title TEXT,\n footer_config TEXT,\n timezone TEXT,\n locale TEXT,\n created_at TEXT NOT NULL DEFAULT (datetime('now')),\n changed_at TEXT NOT NULL DEFAULT (datetime('now'))\n);\n\nCREATE INDEX IF NOT EXISTS idx_hazo_scopes_parent ON hazo_scopes(parent_id);\nCREATE INDEX IF NOT EXISTS idx_hazo_scopes_level ON hazo_scopes(level);\nCREATE INDEX IF NOT EXISTS idx_hazo_scopes_slug ON hazo_scopes(slug);\nCREATE INDEX IF NOT EXISTS idx_hazo_scopes_subscription_id ON hazo_scopes(subscription_id);\n\n-- Default system scope (for non-multi-tenancy mode)\nINSERT OR IGNORE INTO hazo_scopes (id, parent_id, name, level, created_at, changed_at)\nVALUES ('00000000-0000-0000-0000-000000000001', NULL, 'System', 'default', datetime('now'), datetime('now'));\n\n-- User-scope assignments (membership model with scope-specific roles)\nCREATE TABLE IF NOT EXISTS hazo_user_scopes (\n user_id TEXT NOT NULL REFERENCES hazo_users(id) ON DELETE CASCADE,\n scope_id TEXT NOT NULL REFERENCES hazo_scopes(id) ON DELETE CASCADE,\n root_scope_id TEXT NOT NULL REFERENCES hazo_scopes(id) ON DELETE CASCADE,\n role_id TEXT NOT NULL REFERENCES hazo_roles(id) ON DELETE RESTRICT,\n status TEXT NOT NULL DEFAULT 'ACTIVE' CHECK (status IN ('INVITED', 'ACTIVE', 'SUSPENDED', 'DEPARTED')),\n created_at TEXT NOT NULL DEFAULT (datetime('now')),\n changed_at TEXT NOT NULL DEFAULT (datetime('now')),\n PRIMARY KEY (user_id, scope_id)\n);\n\nCREATE INDEX IF NOT EXISTS idx_hazo_user_scopes_scope ON hazo_user_scopes(scope_id);\nCREATE INDEX IF NOT EXISTS idx_hazo_user_scopes_root ON hazo_user_scopes(root_scope_id);\nCREATE INDEX IF NOT EXISTS idx_hazo_user_scopes_role ON hazo_user_scopes(role_id);\n\n-- Invitations table\nCREATE TABLE IF NOT EXISTS hazo_invitations (\n id TEXT PRIMARY KEY,\n email_address TEXT NOT NULL,\n token TEXT NOT NULL UNIQUE,\n scope_id TEXT REFERENCES hazo_scopes(id) ON DELETE SET NULL,\n root_scope_id TEXT REFERENCES hazo_scopes(id) ON DELETE SET NULL,\n role_id TEXT REFERENCES hazo_roles(id) ON DELETE SET NULL,\n invited_by TEXT REFERENCES hazo_users(id) ON DELETE SET NULL,\n status TEXT NOT NULL DEFAULT 'PENDING' CHECK(status IN ('PENDING', 'ACCEPTED', 'EXPIRED', 'REVOKED')),\n expires_at TEXT NOT NULL,\n accepted_at TEXT,\n created_at TEXT NOT NULL DEFAULT (datetime('now')),\n changed_at TEXT NOT NULL DEFAULT (datetime('now'))\n);\n\nCREATE INDEX IF NOT EXISTS idx_hazo_invitations_email ON hazo_invitations(email_address);\nCREATE INDEX IF NOT EXISTS idx_hazo_invitations_token ON hazo_invitations(token);\nCREATE INDEX IF NOT EXISTS idx_hazo_invitations_scope ON hazo_invitations(scope_id);\nCREATE INDEX IF NOT EXISTS idx_hazo_invitations_status ON hazo_invitations(status);\n\n-- Relationships table\nCREATE TABLE IF NOT EXISTS hazo_user_relationships (\n id TEXT PRIMARY KEY,\n parent_user_id TEXT NOT NULL REFERENCES hazo_users(id) ON DELETE CASCADE,\n child_user_id TEXT NOT NULL REFERENCES hazo_users(id) ON DELETE CASCADE,\n relationship_type TEXT NOT NULL DEFAULT 'parent',\n can_view_progress INTEGER NOT NULL DEFAULT 1,\n can_edit_profile INTEGER NOT NULL DEFAULT 1,\n can_delete INTEGER NOT NULL DEFAULT 0,\n is_self INTEGER NOT NULL DEFAULT 0,\n created_at TEXT NOT NULL DEFAULT (datetime('now')),\n UNIQUE(parent_user_id, child_user_id)\n);\n\nCREATE INDEX IF NOT EXISTS idx_hazo_user_relationships_parent ON hazo_user_relationships(parent_user_id);\nCREATE INDEX IF NOT EXISTS idx_hazo_user_relationships_child ON hazo_user_relationships(child_user_id);\n\n-- Email OTPs (migration 015)\nCREATE TABLE IF NOT EXISTS hazo_email_otps (\n id TEXT PRIMARY KEY,\n user_id TEXT REFERENCES hazo_users(id) ON DELETE CASCADE,\n email TEXT NOT NULL,\n otp_hash TEXT NOT NULL,\n expires_at TEXT NOT NULL,\n consumed_at TEXT,\n attempt_count INTEGER NOT NULL DEFAULT 0,\n created_at TEXT NOT NULL DEFAULT (datetime('now')),\n requester_ip TEXT\n);\n\nCREATE INDEX IF NOT EXISTS idx_hazo_email_otps_user_id ON hazo_email_otps(user_id);\nCREATE INDEX IF NOT EXISTS idx_hazo_email_otps_email ON hazo_email_otps(email);\nCREATE INDEX IF NOT EXISTS idx_hazo_email_otps_expires_at ON hazo_email_otps(expires_at);\n\n-- Legal acceptances (migration 018)\nCREATE TABLE IF NOT EXISTS hazo_legal_acceptances (\n id TEXT PRIMARY KEY,\n user_id TEXT REFERENCES hazo_users(id) ON DELETE CASCADE,\n doc_key TEXT NOT NULL,\n doc_hash TEXT NOT NULL,\n accepted_at TEXT NOT NULL DEFAULT (datetime('now')),\n ip TEXT,\n user_agent TEXT\n);\n\nCREATE INDEX IF NOT EXISTS idx_hazo_legal_acceptances_user_id ON hazo_legal_acceptances(user_id);\nCREATE INDEX IF NOT EXISTS idx_hazo_legal_acceptances_doc_key ON hazo_legal_acceptances(doc_key);\n\n-- Legal doc versions (migration 019)\nCREATE TABLE IF NOT EXISTS hazo_legal_doc_versions (\n doc_key TEXT PRIMARY KEY,\n required_hash TEXT NOT NULL,\n published_at TEXT NOT NULL DEFAULT (datetime('now')),\n published_by_user_id TEXT REFERENCES hazo_users(id) ON DELETE SET NULL\n);\n\nCREATE INDEX IF NOT EXISTS idx_hazo_legal_doc_versions_published_at ON hazo_legal_doc_versions(published_at);\n\n-- Firm admin role (for firm creators)\nINSERT OR IGNORE INTO hazo_roles (id, role_name, created_at, changed_at)\nVALUES (lower(hex(randomblob(4)) || '-' || hex(randomblob(2)) || '-4' || substr(hex(randomblob(2)),2) || '-' || substr('89ab',abs(random()) % 4 + 1, 1) || substr(hex(randomblob(2)),2) || '-' || hex(randomblob(6))), 'firm_admin', datetime('now'), datetime('now'));\n\n-- Google OAuth tokens (encrypted refresh/access tokens for extra-scope API access)\nCREATE TABLE IF NOT EXISTS hazo_google_oauth_tokens (\n id TEXT PRIMARY KEY,\n user_id TEXT NOT NULL REFERENCES hazo_users(id) ON DELETE CASCADE,\n provider TEXT NOT NULL DEFAULT 'google',\n refresh_token_enc TEXT NOT NULL,\n access_token_enc TEXT,\n scopes TEXT NOT NULL DEFAULT '',\n expires_at TEXT,\n created_at TEXT NOT NULL DEFAULT (datetime('now')),\n changed_at TEXT NOT NULL DEFAULT (datetime('now')),\n UNIQUE(user_id, provider)\n);\n\nCREATE INDEX IF NOT EXISTS idx_hazo_google_oauth_tokens_user ON hazo_google_oauth_tokens(user_id);\n\n-- Groups + join codes (migration 024, ADR-0005)\nCREATE TABLE IF NOT EXISTS hazo_groups (\n id TEXT PRIMARY KEY,\n scope_id TEXT NOT NULL REFERENCES hazo_scopes(id) ON DELETE CASCADE,\n name TEXT NOT NULL,\n join_code TEXT NOT NULL UNIQUE,\n created_by TEXT REFERENCES hazo_users(id) ON DELETE SET NULL,\n metadata TEXT,\n status TEXT NOT NULL DEFAULT 'ACTIVE' CHECK (status IN ('ACTIVE', 'ARCHIVED')),\n created_at TEXT NOT NULL DEFAULT (datetime('now')),\n changed_at TEXT NOT NULL DEFAULT (datetime('now'))\n);\n\nCREATE INDEX IF NOT EXISTS idx_hazo_groups_scope ON hazo_groups(scope_id);\n\nCREATE TABLE IF NOT EXISTS hazo_group_memberships (\n user_id TEXT NOT NULL REFERENCES hazo_users(id) ON DELETE CASCADE,\n group_id TEXT NOT NULL REFERENCES hazo_groups(id) ON DELETE CASCADE,\n role_id TEXT REFERENCES hazo_roles(id) ON DELETE SET NULL,\n joined_at TEXT NOT NULL DEFAULT (datetime('now')),\n status TEXT NOT NULL DEFAULT 'ACTIVE' CHECK (status IN ('ACTIVE', 'REMOVED')),\n PRIMARY KEY (user_id, group_id)\n);\n\nCREATE INDEX IF NOT EXISTS idx_hazo_group_memberships_group ON hazo_group_memberships(group_id);\n";
2
2
  //# sourceMappingURL=sqlite_schema.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"sqlite_schema.d.ts","sourceRoot":"","sources":["../../../src/lib/schema/sqlite_schema.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,aAAa,uoPA+KzB,CAAC"}
1
+ {"version":3,"file":"sqlite_schema.d.ts","sourceRoot":"","sources":["../../../src/lib/schema/sqlite_schema.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,aAAa,okYAuRzB,CAAC"}
@@ -1,56 +1,58 @@
1
1
  // file_description: canonical SQLite schema for hazo_auth database
2
2
  // This is the single source of truth for the hazo_auth SQLite schema.
3
3
  // Used by: npx hazo_auth init, npx hazo_auth init-db, npx hazo_auth schema
4
+ //
5
+ // Kept in lockstep with db_setup_sqlite.sql (same table/column/index set — that
6
+ // file is the human-readable reference copy, this is the one the CLI actually
7
+ // runs). __tests__/schema/sqlite_schema_canonical.test.ts asserts the two never
8
+ // drift again the way they did pre-10.30.1 (db_setup_sqlite.sql reflected all 26
9
+ // migrations; this constant was still frozen at migration ~14 and was missing
10
+ // hazo_role_permissions.changed_at, three whole tables, and several columns —
11
+ // see CHANGE_LOG 10.30.1).
4
12
  export const SQLITE_SCHEMA = `
5
13
  -- hazo_auth canonical SQLite schema
6
14
  -- This schema creates all tables required by hazo_auth
15
+ -- Represents the FINAL schema state after all 26 migrations.
7
16
 
8
- -- Users table (from migration 011)
17
+ PRAGMA foreign_keys = ON;
18
+
19
+ -- Users table
9
20
  CREATE TABLE IF NOT EXISTS hazo_users (
10
21
  id TEXT PRIMARY KEY,
11
22
  email_address TEXT NOT NULL UNIQUE,
12
23
  password_hash TEXT,
13
24
  name TEXT,
14
- email_verified BOOLEAN DEFAULT false,
15
- login_attempts INTEGER DEFAULT 0,
25
+ email_verified INTEGER NOT NULL DEFAULT 0,
26
+ login_attempts INTEGER NOT NULL DEFAULT 0,
16
27
  last_logon TEXT,
17
28
  profile_picture_url TEXT,
18
29
  profile_source TEXT CHECK(profile_source IN ('gravatar', 'custom', 'predefined')),
19
30
  mfa_secret TEXT,
20
31
  url_on_logon TEXT,
21
32
  google_id TEXT UNIQUE,
22
- auth_providers TEXT DEFAULT 'email',
33
+ auth_providers TEXT NOT NULL DEFAULT 'email',
23
34
  user_type TEXT,
24
- app_user_data TEXT,
25
- status TEXT DEFAULT 'ACTIVE' CHECK(status IN ('PENDING', 'ACTIVE', 'BLOCKED')),
35
+ app_user_data TEXT NOT NULL DEFAULT '{}',
36
+ status TEXT NOT NULL DEFAULT 'ACTIVE' CHECK(status IN ('PENDING', 'ACTIVE', 'BLOCKED')),
26
37
  managed_by_user_id TEXT REFERENCES hazo_users(id) ON DELETE SET NULL,
27
38
  pin_hash TEXT,
39
+ facebook_id TEXT UNIQUE,
40
+ legal_acceptance TEXT NOT NULL DEFAULT '{}',
41
+ preferred_locale TEXT,
42
+ country TEXT,
43
+ state_province TEXT,
44
+ suburb TEXT,
28
45
  created_at TEXT NOT NULL DEFAULT (datetime('now')),
29
46
  changed_at TEXT NOT NULL DEFAULT (datetime('now'))
30
47
  );
31
48
 
32
49
  CREATE INDEX IF NOT EXISTS idx_hazo_users_email ON hazo_users(email_address);
33
50
  CREATE INDEX IF NOT EXISTS idx_hazo_users_google_id ON hazo_users(google_id);
51
+ CREATE INDEX IF NOT EXISTS idx_hazo_users_facebook_id ON hazo_users(facebook_id);
52
+ CREATE INDEX IF NOT EXISTS idx_hazo_users_managed_by ON hazo_users(managed_by_user_id);
34
53
  CREATE INDEX IF NOT EXISTS idx_hazo_users_status ON hazo_users(status);
35
-
36
- -- Refresh tokens table
37
- -- Note: runtime (token_service.ts) writes token_hash (argon2-hashed value) on
38
- -- insert and verifies via argon2.verify(token_hash, plaintext_token) on read.
39
- -- The plaintext "token" column is retained nullable for legacy compatibility
40
- -- but new writes only set token_hash.
41
- CREATE TABLE IF NOT EXISTS hazo_refresh_tokens (
42
- id TEXT PRIMARY KEY,
43
- user_id TEXT NOT NULL REFERENCES hazo_users(id) ON DELETE CASCADE,
44
- token TEXT UNIQUE,
45
- token_hash TEXT,
46
- token_type TEXT DEFAULT 'refresh',
47
- expires_at TEXT NOT NULL,
48
- created_at TEXT NOT NULL DEFAULT (datetime('now'))
49
- );
50
-
51
- CREATE INDEX IF NOT EXISTS idx_hazo_refresh_tokens_user ON hazo_refresh_tokens(user_id);
52
- CREATE INDEX IF NOT EXISTS idx_hazo_refresh_tokens_token ON hazo_refresh_tokens(token);
53
- CREATE INDEX IF NOT EXISTS idx_hazo_refresh_tokens_token_hash ON hazo_refresh_tokens(token_hash);
54
+ CREATE INDEX IF NOT EXISTS idx_hazo_users_country ON hazo_users(country);
55
+ CREATE INDEX IF NOT EXISTS idx_hazo_users_state ON hazo_users(state_province);
54
56
 
55
57
  -- Roles table
56
58
  CREATE TABLE IF NOT EXISTS hazo_roles (
@@ -60,6 +62,8 @@ CREATE TABLE IF NOT EXISTS hazo_roles (
60
62
  changed_at TEXT NOT NULL DEFAULT (datetime('now'))
61
63
  );
62
64
 
65
+ CREATE INDEX IF NOT EXISTS idx_hazo_roles_role_name ON hazo_roles(role_name);
66
+
63
67
  -- Permissions table
64
68
  CREATE TABLE IF NOT EXISTS hazo_permissions (
65
69
  id TEXT PRIMARY KEY,
@@ -69,18 +73,56 @@ CREATE TABLE IF NOT EXISTS hazo_permissions (
69
73
  changed_at TEXT NOT NULL DEFAULT (datetime('now'))
70
74
  );
71
75
 
76
+ CREATE INDEX IF NOT EXISTS idx_hazo_permissions_permission_name ON hazo_permissions(permission_name);
77
+
78
+ -- User-role assignments (composite PK, no id column)
79
+ CREATE TABLE IF NOT EXISTS hazo_user_roles (
80
+ user_id TEXT NOT NULL REFERENCES hazo_users(id) ON DELETE CASCADE,
81
+ role_id TEXT NOT NULL REFERENCES hazo_roles(id) ON DELETE CASCADE,
82
+ created_at TEXT NOT NULL DEFAULT (datetime('now')),
83
+ changed_at TEXT NOT NULL DEFAULT (datetime('now')),
84
+ PRIMARY KEY (user_id, role_id)
85
+ );
86
+
87
+ CREATE INDEX IF NOT EXISTS idx_hazo_user_roles_user_id ON hazo_user_roles(user_id);
88
+ CREATE INDEX IF NOT EXISTS idx_hazo_user_roles_role_id ON hazo_user_roles(role_id);
89
+
72
90
  -- Role-permission assignments (composite PK, no id column)
73
91
  CREATE TABLE IF NOT EXISTS hazo_role_permissions (
74
92
  role_id TEXT NOT NULL REFERENCES hazo_roles(id) ON DELETE CASCADE,
75
93
  permission_id TEXT NOT NULL REFERENCES hazo_permissions(id) ON DELETE CASCADE,
76
94
  created_at TEXT NOT NULL DEFAULT (datetime('now')),
95
+ changed_at TEXT NOT NULL DEFAULT (datetime('now')),
77
96
  PRIMARY KEY (role_id, permission_id)
78
97
  );
79
98
 
99
+ CREATE INDEX IF NOT EXISTS idx_hazo_role_permissions_role_id ON hazo_role_permissions(role_id);
100
+ CREATE INDEX IF NOT EXISTS idx_hazo_role_permissions_permission_id ON hazo_role_permissions(permission_id);
101
+
102
+ -- Refresh tokens table
103
+ -- Note: runtime (token_service.ts) writes token_hash (argon2-hashed value) on
104
+ -- insert and verifies via argon2.verify(token_hash, plaintext_token) on read.
105
+ -- The plaintext "token" column is retained nullable for legacy compatibility
106
+ -- but new writes only set token_hash.
107
+ CREATE TABLE IF NOT EXISTS hazo_refresh_tokens (
108
+ id TEXT PRIMARY KEY,
109
+ user_id TEXT NOT NULL REFERENCES hazo_users(id) ON DELETE CASCADE,
110
+ token TEXT UNIQUE,
111
+ token_hash TEXT,
112
+ token_type TEXT NOT NULL DEFAULT 'refresh' CHECK (token_type IN ('refresh', 'password_reset', 'email_verification')),
113
+ expires_at TEXT NOT NULL,
114
+ created_at TEXT NOT NULL DEFAULT (datetime('now'))
115
+ );
116
+
117
+ CREATE INDEX IF NOT EXISTS idx_hazo_refresh_tokens_user ON hazo_refresh_tokens(user_id);
118
+ CREATE INDEX IF NOT EXISTS idx_hazo_refresh_tokens_token ON hazo_refresh_tokens(token);
119
+ CREATE INDEX IF NOT EXISTS idx_hazo_refresh_tokens_token_hash ON hazo_refresh_tokens(token_hash);
120
+ CREATE INDEX IF NOT EXISTS idx_hazo_refresh_tokens_expires_at ON hazo_refresh_tokens(expires_at);
121
+
80
122
  -- Unified scopes table (hierarchical multi-tenancy)
81
123
  CREATE TABLE IF NOT EXISTS hazo_scopes (
82
124
  id TEXT PRIMARY KEY,
83
- parent_id TEXT REFERENCES hazo_scopes(id) ON DELETE CASCADE,
125
+ parent_id TEXT REFERENCES hazo_scopes(id) ON DELETE SET NULL,
84
126
  name TEXT NOT NULL,
85
127
  level TEXT NOT NULL,
86
128
  logo_url TEXT,
@@ -88,6 +130,11 @@ CREATE TABLE IF NOT EXISTS hazo_scopes (
88
130
  secondary_color TEXT,
89
131
  tagline TEXT,
90
132
  slug TEXT,
133
+ subscription_id TEXT,
134
+ app_title TEXT,
135
+ footer_config TEXT,
136
+ timezone TEXT,
137
+ locale TEXT,
91
138
  created_at TEXT NOT NULL DEFAULT (datetime('now')),
92
139
  changed_at TEXT NOT NULL DEFAULT (datetime('now'))
93
140
  );
@@ -95,6 +142,7 @@ CREATE TABLE IF NOT EXISTS hazo_scopes (
95
142
  CREATE INDEX IF NOT EXISTS idx_hazo_scopes_parent ON hazo_scopes(parent_id);
96
143
  CREATE INDEX IF NOT EXISTS idx_hazo_scopes_level ON hazo_scopes(level);
97
144
  CREATE INDEX IF NOT EXISTS idx_hazo_scopes_slug ON hazo_scopes(slug);
145
+ CREATE INDEX IF NOT EXISTS idx_hazo_scopes_subscription_id ON hazo_scopes(subscription_id);
98
146
 
99
147
  -- Default system scope (for non-multi-tenancy mode)
100
148
  INSERT OR IGNORE INTO hazo_scopes (id, parent_id, name, level, created_at, changed_at)
@@ -105,8 +153,8 @@ CREATE TABLE IF NOT EXISTS hazo_user_scopes (
105
153
  user_id TEXT NOT NULL REFERENCES hazo_users(id) ON DELETE CASCADE,
106
154
  scope_id TEXT NOT NULL REFERENCES hazo_scopes(id) ON DELETE CASCADE,
107
155
  root_scope_id TEXT NOT NULL REFERENCES hazo_scopes(id) ON DELETE CASCADE,
108
- role_id TEXT NOT NULL REFERENCES hazo_roles(id) ON DELETE CASCADE,
109
- status TEXT DEFAULT 'ACTIVE' CHECK (status IN ('INVITED', 'ACTIVE', 'SUSPENDED', 'DEPARTED')),
156
+ role_id TEXT NOT NULL REFERENCES hazo_roles(id) ON DELETE RESTRICT,
157
+ status TEXT NOT NULL DEFAULT 'ACTIVE' CHECK (status IN ('INVITED', 'ACTIVE', 'SUSPENDED', 'DEPARTED')),
110
158
  created_at TEXT NOT NULL DEFAULT (datetime('now')),
111
159
  changed_at TEXT NOT NULL DEFAULT (datetime('now')),
112
160
  PRIMARY KEY (user_id, scope_id)
@@ -121,9 +169,9 @@ CREATE TABLE IF NOT EXISTS hazo_invitations (
121
169
  id TEXT PRIMARY KEY,
122
170
  email_address TEXT NOT NULL,
123
171
  token TEXT NOT NULL UNIQUE,
124
- scope_id TEXT NOT NULL REFERENCES hazo_scopes(id) ON DELETE CASCADE,
125
- root_scope_id TEXT NOT NULL REFERENCES hazo_scopes(id) ON DELETE CASCADE,
126
- role_id TEXT NOT NULL REFERENCES hazo_roles(id) ON DELETE CASCADE,
172
+ scope_id TEXT REFERENCES hazo_scopes(id) ON DELETE SET NULL,
173
+ root_scope_id TEXT REFERENCES hazo_scopes(id) ON DELETE SET NULL,
174
+ role_id TEXT REFERENCES hazo_roles(id) ON DELETE SET NULL,
127
175
  invited_by TEXT REFERENCES hazo_users(id) ON DELETE SET NULL,
128
176
  status TEXT NOT NULL DEFAULT 'PENDING' CHECK(status IN ('PENDING', 'ACCEPTED', 'EXPIRED', 'REVOKED')),
129
177
  expires_at TEXT NOT NULL,
@@ -136,9 +184,6 @@ CREATE INDEX IF NOT EXISTS idx_hazo_invitations_email ON hazo_invitations(email_
136
184
  CREATE INDEX IF NOT EXISTS idx_hazo_invitations_token ON hazo_invitations(token);
137
185
  CREATE INDEX IF NOT EXISTS idx_hazo_invitations_scope ON hazo_invitations(scope_id);
138
186
  CREATE INDEX IF NOT EXISTS idx_hazo_invitations_status ON hazo_invitations(status);
139
- CREATE INDEX IF NOT EXISTS idx_hazo_invitations_expires ON hazo_invitations(expires_at);
140
-
141
- CREATE INDEX IF NOT EXISTS idx_hazo_users_managed_by ON hazo_users(managed_by_user_id);
142
187
 
143
188
  -- Relationships table
144
189
  CREATE TABLE IF NOT EXISTS hazo_user_relationships (
@@ -146,10 +191,10 @@ CREATE TABLE IF NOT EXISTS hazo_user_relationships (
146
191
  parent_user_id TEXT NOT NULL REFERENCES hazo_users(id) ON DELETE CASCADE,
147
192
  child_user_id TEXT NOT NULL REFERENCES hazo_users(id) ON DELETE CASCADE,
148
193
  relationship_type TEXT NOT NULL DEFAULT 'parent',
149
- can_view_progress BOOLEAN DEFAULT true,
150
- can_edit_profile BOOLEAN DEFAULT true,
151
- can_delete BOOLEAN DEFAULT false,
152
- is_self BOOLEAN DEFAULT false,
194
+ can_view_progress INTEGER NOT NULL DEFAULT 1,
195
+ can_edit_profile INTEGER NOT NULL DEFAULT 1,
196
+ can_delete INTEGER NOT NULL DEFAULT 0,
197
+ is_self INTEGER NOT NULL DEFAULT 0,
153
198
  created_at TEXT NOT NULL DEFAULT (datetime('now')),
154
199
  UNIQUE(parent_user_id, child_user_id)
155
200
  );
@@ -157,6 +202,47 @@ CREATE TABLE IF NOT EXISTS hazo_user_relationships (
157
202
  CREATE INDEX IF NOT EXISTS idx_hazo_user_relationships_parent ON hazo_user_relationships(parent_user_id);
158
203
  CREATE INDEX IF NOT EXISTS idx_hazo_user_relationships_child ON hazo_user_relationships(child_user_id);
159
204
 
205
+ -- Email OTPs (migration 015)
206
+ CREATE TABLE IF NOT EXISTS hazo_email_otps (
207
+ id TEXT PRIMARY KEY,
208
+ user_id TEXT REFERENCES hazo_users(id) ON DELETE CASCADE,
209
+ email TEXT NOT NULL,
210
+ otp_hash TEXT NOT NULL,
211
+ expires_at TEXT NOT NULL,
212
+ consumed_at TEXT,
213
+ attempt_count INTEGER NOT NULL DEFAULT 0,
214
+ created_at TEXT NOT NULL DEFAULT (datetime('now')),
215
+ requester_ip TEXT
216
+ );
217
+
218
+ CREATE INDEX IF NOT EXISTS idx_hazo_email_otps_user_id ON hazo_email_otps(user_id);
219
+ CREATE INDEX IF NOT EXISTS idx_hazo_email_otps_email ON hazo_email_otps(email);
220
+ CREATE INDEX IF NOT EXISTS idx_hazo_email_otps_expires_at ON hazo_email_otps(expires_at);
221
+
222
+ -- Legal acceptances (migration 018)
223
+ CREATE TABLE IF NOT EXISTS hazo_legal_acceptances (
224
+ id TEXT PRIMARY KEY,
225
+ user_id TEXT REFERENCES hazo_users(id) ON DELETE CASCADE,
226
+ doc_key TEXT NOT NULL,
227
+ doc_hash TEXT NOT NULL,
228
+ accepted_at TEXT NOT NULL DEFAULT (datetime('now')),
229
+ ip TEXT,
230
+ user_agent TEXT
231
+ );
232
+
233
+ CREATE INDEX IF NOT EXISTS idx_hazo_legal_acceptances_user_id ON hazo_legal_acceptances(user_id);
234
+ CREATE INDEX IF NOT EXISTS idx_hazo_legal_acceptances_doc_key ON hazo_legal_acceptances(doc_key);
235
+
236
+ -- Legal doc versions (migration 019)
237
+ CREATE TABLE IF NOT EXISTS hazo_legal_doc_versions (
238
+ doc_key TEXT PRIMARY KEY,
239
+ required_hash TEXT NOT NULL,
240
+ published_at TEXT NOT NULL DEFAULT (datetime('now')),
241
+ published_by_user_id TEXT REFERENCES hazo_users(id) ON DELETE SET NULL
242
+ );
243
+
244
+ CREATE INDEX IF NOT EXISTS idx_hazo_legal_doc_versions_published_at ON hazo_legal_doc_versions(published_at);
245
+
160
246
  -- Firm admin role (for firm creators)
161
247
  INSERT OR IGNORE INTO hazo_roles (id, role_name, created_at, changed_at)
162
248
  VALUES (lower(hex(randomblob(4)) || '-' || hex(randomblob(2)) || '-4' || substr(hex(randomblob(2)),2) || '-' || substr('89ab',abs(random()) % 4 + 1, 1) || substr(hex(randomblob(2)),2) || '-' || hex(randomblob(6))), 'firm_admin', datetime('now'), datetime('now'));
@@ -176,4 +262,30 @@ CREATE TABLE IF NOT EXISTS hazo_google_oauth_tokens (
176
262
  );
177
263
 
178
264
  CREATE INDEX IF NOT EXISTS idx_hazo_google_oauth_tokens_user ON hazo_google_oauth_tokens(user_id);
265
+
266
+ -- Groups + join codes (migration 024, ADR-0005)
267
+ CREATE TABLE IF NOT EXISTS hazo_groups (
268
+ id TEXT PRIMARY KEY,
269
+ scope_id TEXT NOT NULL REFERENCES hazo_scopes(id) ON DELETE CASCADE,
270
+ name TEXT NOT NULL,
271
+ join_code TEXT NOT NULL UNIQUE,
272
+ created_by TEXT REFERENCES hazo_users(id) ON DELETE SET NULL,
273
+ metadata TEXT,
274
+ status TEXT NOT NULL DEFAULT 'ACTIVE' CHECK (status IN ('ACTIVE', 'ARCHIVED')),
275
+ created_at TEXT NOT NULL DEFAULT (datetime('now')),
276
+ changed_at TEXT NOT NULL DEFAULT (datetime('now'))
277
+ );
278
+
279
+ CREATE INDEX IF NOT EXISTS idx_hazo_groups_scope ON hazo_groups(scope_id);
280
+
281
+ CREATE TABLE IF NOT EXISTS hazo_group_memberships (
282
+ user_id TEXT NOT NULL REFERENCES hazo_users(id) ON DELETE CASCADE,
283
+ group_id TEXT NOT NULL REFERENCES hazo_groups(id) ON DELETE CASCADE,
284
+ role_id TEXT REFERENCES hazo_roles(id) ON DELETE SET NULL,
285
+ joined_at TEXT NOT NULL DEFAULT (datetime('now')),
286
+ status TEXT NOT NULL DEFAULT 'ACTIVE' CHECK (status IN ('ACTIVE', 'REMOVED')),
287
+ PRIMARY KEY (user_id, group_id)
288
+ );
289
+
290
+ CREATE INDEX IF NOT EXISTS idx_hazo_group_memberships_group ON hazo_group_memberships(group_id);
179
291
  `;
@@ -16,6 +16,7 @@ export * from "./firm_service.js";
16
16
  export * from "./post_verification_service.js";
17
17
  export * from "./scope_service.js";
18
18
  export * from "./user_scope_service.js";
19
+ export * from "./scope_membership_service.js";
19
20
  export * from "./group_service.js";
20
21
  export * from "./oauth_service.js";
21
22
  export * from "./branding_service.js";
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/services/index.ts"],"names":[],"mappings":"AAEA,cAAc,iBAAiB,CAAC;AAChC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,0BAA0B,CAAC;AACzC,cAAc,kCAAkC,CAAC;AACjD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,iCAAiC,CAAC;AAChD,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/services/index.ts"],"names":[],"mappings":"AAEA,cAAc,iBAAiB,CAAC;AAChC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,0BAA0B,CAAC;AACzC,cAAc,kCAAkC,CAAC;AACjD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,iCAAiC,CAAC;AAChD,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC"}
@@ -18,6 +18,7 @@ export * from "./firm_service.js";
18
18
  export * from "./post_verification_service.js";
19
19
  export * from "./scope_service.js";
20
20
  export * from "./user_scope_service.js";
21
+ export * from "./scope_membership_service.js";
21
22
  export * from "./group_service.js";
22
23
  export * from "./oauth_service.js";
23
24
  export * from "./branding_service.js";
@@ -18,6 +18,17 @@ export type RegistrationData = {
18
18
  * existing `app_user_data` JSONB column via `update_app_user_data()` — no new
19
19
  * column or config parser for these; see register_config.server.ts. */
20
20
  custom_fields?: Record<string, unknown>;
21
+ /**
22
+ * Explicit user type for this registration (e.g. a consumer with separate
23
+ * `/register/parent` and `/register/teacher` entry points, each setting a
24
+ * different type). Only takes effect when `[hazo_auth__user_types]`'s
25
+ * `enable_user_types` is on, and must match a configured `user_type_N` key
26
+ * — an unknown key fails the registration with `error: "Invalid user
27
+ * type"` rather than silently falling back to the config default.
28
+ * Omitted = fall back to `[hazo_auth__user_types].default_user_type`, same
29
+ * as before this field existed.
30
+ */
31
+ user_type?: string;
21
32
  };
22
33
  export type RegistrationResult = {
23
34
  success: boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"registration_service.d.ts","sourceRoot":"","sources":["../../../src/lib/services/registration_service.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAkBvD,OAAO,EAAyB,KAAK,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAI3F,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAClD,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B;;gFAE4E;IAC5E,QAAQ,CAAC,EAAE,mBAAmB,CAAC;IAC/B;;4EAEwE;IACxE,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACzC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAGF;;;;;GAKG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE,kBAAkB,EAC3B,IAAI,EAAE,gBAAgB,GACrB,OAAO,CAAC,kBAAkB,CAAC,CAqL7B"}
1
+ {"version":3,"file":"registration_service.d.ts","sourceRoot":"","sources":["../../../src/lib/services/registration_service.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAmBvD,OAAO,EAAyB,KAAK,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAI3F,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAClD,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B;;gFAE4E;IAC5E,QAAQ,CAAC,EAAE,mBAAmB,CAAC;IAC/B;;4EAEwE;IACxE,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxC;;;;;;;;;OASG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAGF;;;;;GAKG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE,kBAAkB,EAC3B,IAAI,EAAE,gBAAgB,GACrB,OAAO,CAAC,kBAAkB,CAAC,CAkM7B"}
@@ -9,7 +9,7 @@ import { create_app_logger } from "../app_logger.js";
9
9
  import { send_template_email } from "./email_service.js";
10
10
  import { sanitize_error_for_user } from "../utils/error_sanitizer.js";
11
11
  import { get_line_number } from "../utils/api_route_helpers.js";
12
- import { is_user_types_enabled, get_default_user_type, } from "../user_types_config.server.js";
12
+ import { is_user_types_enabled, get_default_user_type, get_user_type_by_key, } from "../user_types_config.server.js";
13
13
  import { write_legal_acceptance } from "../legal/legal_docs_service.js";
14
14
  import { fire_auth_hook } from "../auth_hooks.js";
15
15
  import { build_location_fields } from "./location_fields_helper.js";
@@ -78,11 +78,25 @@ export async function register_user(adapter, data) {
78
78
  insert_data.profile_source = map_ui_source_to_db(default_photo.profile_source);
79
79
  }
80
80
  }
81
- // Set default user type if feature is enabled and default is configured
81
+ // Set the user's type if the feature is enabled: an explicit `data.user_type`
82
+ // takes precedence over the configured default (validated against the
83
+ // configured type list either way — an unknown key is a registration
84
+ // error, not a silent fallback to the default).
82
85
  if (is_user_types_enabled()) {
83
- const default_type = get_default_user_type();
84
- if (default_type) {
85
- insert_data.user_type = default_type;
86
+ if (data.user_type !== undefined) {
87
+ if (!get_user_type_by_key(data.user_type)) {
88
+ return {
89
+ success: false,
90
+ error: "Invalid user type",
91
+ };
92
+ }
93
+ insert_data.user_type = data.user_type;
94
+ }
95
+ else {
96
+ const default_type = get_default_user_type();
97
+ if (default_type) {
98
+ insert_data.user_type = default_type;
99
+ }
86
100
  }
87
101
  }
88
102
  const inserted_users = await users_service.insert(insert_data);
@@ -0,0 +1,20 @@
1
+ import "server-only";
2
+ import { type UserScope } from "./user_scope_service.js";
3
+ export type ScopeMember = {
4
+ user_id: string;
5
+ role_id: string;
6
+ /** hazo_users.status for this member — "ACTIVE" counts toward seat usage. */
7
+ status: string;
8
+ email_address: string | null;
9
+ name: string | null;
10
+ };
11
+ /**
12
+ * All members (user + role) assigned to a scope, joined with their hazo_users
13
+ * status/email/name — the basis for Team seat management (ticket 13/18).
14
+ */
15
+ export declare function getScopeMembers(scopeId: string): Promise<ScopeMember[]>;
16
+ /** All scope assignments for a user (every scope they belong to, with their role in each). */
17
+ export declare function getUserScopes(userId: string): Promise<UserScope[]>;
18
+ /** Count of ACTIVE members in a scope — the number of Team seats actually in use. */
19
+ export declare function getSeatCount(scopeId: string): Promise<number>;
20
+ //# sourceMappingURL=scope_membership_service.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"scope_membership_service.d.ts","sourceRoot":"","sources":["../../../src/lib/services/scope_membership_service.ts"],"names":[],"mappings":"AAOA,OAAO,aAAa,CAAC;AAIrB,OAAO,EAAuC,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAI3F,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,6EAA6E;IAC7E,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB,CAAC;AAIF;;;GAGG;AACH,wBAAsB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAwB7E;AAED,8FAA8F;AAC9F,wBAAsB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAIxE;AAED,qFAAqF;AACrF,wBAAsB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAGnE"}