hazo_auth 10.27.0 → 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.
- package/cli-src/lib/auth/auth_cache.ts +11 -1
- package/cli-src/lib/auth/hazo_get_auth.server.ts +65 -8
- package/cli-src/lib/auth/hazo_get_tenant_auth.server.ts +9 -45
- package/cli-src/lib/auth/scope_header.ts +58 -0
- package/cli-src/lib/email_verification_config.server.ts +3 -0
- package/cli-src/lib/forgot_password_config.server.ts +3 -0
- package/cli-src/lib/register_config.server.ts +3 -0
- package/cli-src/lib/reset_password_config.server.ts +3 -0
- package/cli-src/lib/schema/sqlite_schema.ts +150 -38
- package/cli-src/lib/services/index.ts +1 -0
- package/cli-src/lib/services/scope_membership_service.ts +68 -0
- package/cli-src/lib/services/scope_service.ts +21 -0
- package/cli-src/lib/services/user_scope_service.ts +4 -32
- package/dist/components/layouts/email_verification/index.d.ts +3 -1
- package/dist/components/layouts/email_verification/index.d.ts.map +1 -1
- package/dist/components/layouts/email_verification/index.js +4 -4
- package/dist/components/layouts/forgot_password/index.d.ts +3 -1
- package/dist/components/layouts/forgot_password/index.d.ts.map +1 -1
- package/dist/components/layouts/forgot_password/index.js +2 -2
- package/dist/components/layouts/my_settings/hooks/use_my_settings.d.ts +8 -0
- package/dist/components/layouts/my_settings/hooks/use_my_settings.d.ts.map +1 -1
- package/dist/components/layouts/my_settings/hooks/use_my_settings.js +37 -0
- package/dist/components/layouts/my_settings/index.d.ts +6 -1
- package/dist/components/layouts/my_settings/index.d.ts.map +1 -1
- package/dist/components/layouts/my_settings/index.js +3 -3
- package/dist/components/layouts/register/hooks/use_register_form.d.ts +20 -1
- package/dist/components/layouts/register/hooks/use_register_form.d.ts.map +1 -1
- package/dist/components/layouts/register/hooks/use_register_form.js +70 -4
- package/dist/components/layouts/register/index.d.ts +13 -1
- package/dist/components/layouts/register/index.d.ts.map +1 -1
- package/dist/components/layouts/register/index.js +26 -4
- package/dist/components/layouts/reset_password/index.d.ts +3 -1
- package/dist/components/layouts/reset_password/index.d.ts.map +1 -1
- package/dist/components/layouts/reset_password/index.js +5 -5
- package/dist/components/layouts/shared/hooks/use_auth_status.d.ts +3 -0
- package/dist/components/layouts/shared/hooks/use_auth_status.d.ts.map +1 -1
- package/dist/components/layouts/shared/hooks/use_auth_status.js +5 -2
- package/dist/components/layouts/user_management/components/user_signup_stats_cards.d.ts +1 -8
- package/dist/components/layouts/user_management/components/user_signup_stats_cards.d.ts.map +1 -1
- package/dist/components/layouts/user_management/components/user_signup_stats_cards.js +8 -90
- package/dist/components/ui/alert-dialog.d.ts +9 -9
- package/dist/components/ui/alert-dialog.d.ts.map +1 -1
- package/dist/components/ui/avatar.d.ts +4 -3
- package/dist/components/ui/avatar.d.ts.map +1 -1
- package/dist/components/ui/button.d.ts +1 -1
- package/dist/components/ui/checkbox.d.ts +2 -1
- package/dist/components/ui/checkbox.d.ts.map +1 -1
- package/dist/components/ui/dialog.d.ts +8 -8
- package/dist/components/ui/dialog.d.ts.map +1 -1
- package/dist/components/ui/dropdown-menu.d.ts +17 -17
- package/dist/components/ui/dropdown-menu.d.ts.map +1 -1
- package/dist/components/ui/hover-card.d.ts +3 -3
- package/dist/components/ui/hover-card.d.ts.map +1 -1
- package/dist/components/ui/input-otp.d.ts +27 -1
- package/dist/components/ui/input-otp.d.ts.map +1 -1
- package/dist/components/ui/label.d.ts +2 -1
- package/dist/components/ui/label.d.ts.map +1 -1
- package/dist/components/ui/select.d.ts +10 -10
- package/dist/components/ui/select.d.ts.map +1 -1
- package/dist/components/ui/separator.d.ts +2 -1
- package/dist/components/ui/separator.d.ts.map +1 -1
- package/dist/components/ui/sheet.d.ts +9 -9
- package/dist/components/ui/sheet.d.ts.map +1 -1
- package/dist/components/ui/sidebar.d.ts +1 -1
- package/dist/components/ui/sidebar.d.ts.map +1 -1
- package/dist/components/ui/switch.d.ts +2 -1
- package/dist/components/ui/switch.d.ts.map +1 -1
- package/dist/components/ui/tabs.d.ts +4 -4
- package/dist/components/ui/tabs.d.ts.map +1 -1
- package/dist/components/ui/tooltip.d.ts +4 -4
- package/dist/components/ui/tooltip.d.ts.map +1 -1
- package/dist/components/ui/tree-view.d.ts +2 -1
- package/dist/components/ui/tree-view.d.ts.map +1 -1
- package/dist/components/ui/vertical-tabs.d.ts +4 -4
- package/dist/components/ui/vertical-tabs.d.ts.map +1 -1
- package/dist/lib/auth/auth_cache.d.ts +6 -2
- package/dist/lib/auth/auth_cache.d.ts.map +1 -1
- package/dist/lib/auth/auth_cache.js +6 -2
- package/dist/lib/auth/auth_types.d.ts +4 -0
- package/dist/lib/auth/auth_types.d.ts.map +1 -1
- package/dist/lib/auth/hazo_get_auth.server.d.ts.map +1 -1
- package/dist/lib/auth/hazo_get_auth.server.js +64 -8
- package/dist/lib/auth/hazo_get_tenant_auth.server.d.ts +2 -18
- package/dist/lib/auth/hazo_get_tenant_auth.server.d.ts.map +1 -1
- package/dist/lib/auth/hazo_get_tenant_auth.server.js +5 -38
- package/dist/lib/auth/scope_header.d.ts +28 -0
- package/dist/lib/auth/scope_header.d.ts.map +1 -0
- package/dist/lib/auth/scope_header.js +34 -0
- package/dist/lib/email_verification_config.server.d.ts +2 -0
- package/dist/lib/email_verification_config.server.d.ts.map +1 -1
- package/dist/lib/email_verification_config.server.js +1 -0
- package/dist/lib/forgot_password_config.server.d.ts +2 -0
- package/dist/lib/forgot_password_config.server.d.ts.map +1 -1
- package/dist/lib/forgot_password_config.server.js +1 -0
- package/dist/lib/my_settings_config.server.d.ts +4 -0
- package/dist/lib/my_settings_config.server.d.ts.map +1 -1
- package/dist/lib/my_settings_config.server.js +3 -0
- package/dist/lib/register_config.server.d.ts +12 -0
- package/dist/lib/register_config.server.d.ts.map +1 -1
- package/dist/lib/register_config.server.js +8 -0
- package/dist/lib/reset_password_config.server.d.ts +2 -0
- package/dist/lib/reset_password_config.server.d.ts.map +1 -1
- package/dist/lib/reset_password_config.server.js +1 -0
- package/dist/lib/schema/sqlite_schema.d.ts +1 -1
- package/dist/lib/schema/sqlite_schema.d.ts.map +1 -1
- package/dist/lib/schema/sqlite_schema.js +150 -38
- package/dist/lib/services/index.d.ts +1 -0
- package/dist/lib/services/index.d.ts.map +1 -1
- package/dist/lib/services/index.js +1 -0
- package/dist/lib/services/registration_service.js +30 -5
- package/dist/lib/services/scope_membership_service.d.ts +20 -0
- package/dist/lib/services/scope_membership_service.d.ts.map +1 -0
- package/dist/lib/services/scope_membership_service.js +49 -0
- package/dist/lib/services/scope_service.d.ts +6 -0
- package/dist/lib/services/scope_service.d.ts.map +1 -1
- package/dist/lib/services/scope_service.js +12 -0
- package/dist/lib/services/user_scope_service.d.ts.map +1 -1
- package/dist/lib/services/user_scope_service.js +4 -30
- package/dist/lib/services/user_update_service.d.ts +5 -0
- package/dist/lib/services/user_update_service.d.ts.map +1 -1
- package/dist/lib/services/user_update_service.js +2 -0
- package/dist/locales/en.json +10 -0
- package/dist/page_components/my_settings.d.ts +9 -1
- package/dist/page_components/my_settings.d.ts.map +1 -1
- package/dist/page_components/my_settings.js +8 -2
- package/dist/server/routes/me.d.ts.map +1 -1
- package/dist/server/routes/me.js +5 -1
- package/dist/server/routes/register.js +53 -2
- package/dist/server/routes/update_user.d.ts.map +1 -1
- package/dist/server/routes/update_user.js +24 -1
- package/dist/server_pages/forgot_password.d.ts.map +1 -1
- package/dist/server_pages/forgot_password.js +1 -1
- package/dist/server_pages/forgot_password_client_wrapper.d.ts +1 -1
- package/dist/server_pages/forgot_password_client_wrapper.d.ts.map +1 -1
- package/dist/server_pages/forgot_password_client_wrapper.js +2 -2
- package/dist/server_pages/my_settings.d.ts.map +1 -1
- package/dist/server_pages/my_settings.js +1 -1
- package/dist/server_pages/register.d.ts +19 -1
- package/dist/server_pages/register.d.ts.map +1 -1
- package/dist/server_pages/register.js +4 -4
- package/dist/server_pages/register_client_wrapper.d.ts +6 -2
- package/dist/server_pages/register_client_wrapper.d.ts.map +1 -1
- package/dist/server_pages/register_client_wrapper.js +2 -2
- package/dist/server_pages/reset_password.d.ts.map +1 -1
- package/dist/server_pages/reset_password.js +1 -1
- package/dist/server_pages/reset_password_client_wrapper.d.ts +1 -1
- package/dist/server_pages/reset_password_client_wrapper.d.ts.map +1 -1
- package/dist/server_pages/reset_password_client_wrapper.js +2 -2
- package/dist/server_pages/verify_email.d.ts.map +1 -1
- package/dist/server_pages/verify_email.js +1 -1
- package/dist/server_pages/verify_email_client_wrapper.d.ts +1 -1
- package/dist/server_pages/verify_email_client_wrapper.d.ts.map +1 -1
- package/dist/server_pages/verify_email_client_wrapper.js +2 -2
- package/package.json +3 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tree-view.d.ts","sourceRoot":"","sources":["../../../src/components/ui/tree-view.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"tree-view.d.ts","sourceRoot":"","sources":["../../../src/components/ui/tree-view.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import * as React from "react";
|
|
2
2
|
import * as TabsPrimitive from "@radix-ui/react-tabs";
|
|
3
|
-
declare const VerticalTabs:
|
|
4
|
-
declare const VerticalTabsList: React.ForwardRefExoticComponent<React.RefAttributes<
|
|
5
|
-
declare const VerticalTabsTrigger: React.ForwardRefExoticComponent<React.RefAttributes<
|
|
6
|
-
declare const VerticalTabsContent: React.ForwardRefExoticComponent<React.RefAttributes<
|
|
3
|
+
declare const VerticalTabs: React.ForwardRefExoticComponent<TabsPrimitive.TabsProps & React.RefAttributes<HTMLDivElement>>;
|
|
4
|
+
declare const VerticalTabsList: React.ForwardRefExoticComponent<Omit<TabsPrimitive.TabsListProps & React.RefAttributes<HTMLDivElement>, "ref"> & React.RefAttributes<HTMLDivElement>>;
|
|
5
|
+
declare const VerticalTabsTrigger: React.ForwardRefExoticComponent<Omit<TabsPrimitive.TabsTriggerProps & React.RefAttributes<HTMLButtonElement>, "ref"> & React.RefAttributes<HTMLButtonElement>>;
|
|
6
|
+
declare const VerticalTabsContent: React.ForwardRefExoticComponent<Omit<TabsPrimitive.TabsContentProps & React.RefAttributes<HTMLDivElement>, "ref"> & React.RefAttributes<HTMLDivElement>>;
|
|
7
7
|
export { VerticalTabs, VerticalTabsList, VerticalTabsTrigger, VerticalTabsContent };
|
|
8
8
|
//# sourceMappingURL=vertical-tabs.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vertical-tabs.d.ts","sourceRoot":"","sources":["../../../src/components/ui/vertical-tabs.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,aAAa,MAAM,sBAAsB,CAAC;AAItD,QAAA,MAAM,YAAY,
|
|
1
|
+
{"version":3,"file":"vertical-tabs.d.ts","sourceRoot":"","sources":["../../../src/components/ui/vertical-tabs.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,aAAa,MAAM,sBAAsB,CAAC;AAItD,QAAA,MAAM,YAAY,gGAAqB,CAAC;AAExC,QAAA,MAAM,gBAAgB,uJAYpB,CAAC;AAGH,QAAA,MAAM,mBAAmB,gKAYvB,CAAC;AAGH,QAAA,MAAM,mBAAmB,0JAYvB,CAAC;AAGH,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,CAAC"}
|
|
@@ -9,6 +9,7 @@ type CacheEntry = {
|
|
|
9
9
|
permissions: string[];
|
|
10
10
|
role_ids: string[];
|
|
11
11
|
scopes: ScopeDetails[];
|
|
12
|
+
permissions_by_role: Record<string, string[]>;
|
|
12
13
|
timestamp: number;
|
|
13
14
|
cache_version: number;
|
|
14
15
|
};
|
|
@@ -35,11 +36,14 @@ declare class AuthCache {
|
|
|
35
36
|
* Evicts least recently used entries if cache is full
|
|
36
37
|
* @param user_id - User ID
|
|
37
38
|
* @param user - User data
|
|
38
|
-
* @param permissions - User permissions
|
|
39
|
+
* @param permissions - User permissions (union across all scope roles)
|
|
39
40
|
* @param role_ids - User role IDs (v5.x: string UUIDs)
|
|
40
41
|
* @param scopes - User scope details with full information (v5.2+)
|
|
42
|
+
* @param permissions_by_role - Per-role permission breakdown (v10.29+), used
|
|
43
|
+
* for HRBAC scope-aware filtering. Defaults to {} for callers that haven't
|
|
44
|
+
* been updated yet (scope-aware resolution simply won't have data to filter).
|
|
41
45
|
*/
|
|
42
|
-
set(user_id: string, user: HazoAuthUser, permissions: string[], role_ids: string[], scopes?: ScopeDetails[]): void;
|
|
46
|
+
set(user_id: string, user: HazoAuthUser, permissions: string[], role_ids: string[], scopes?: ScopeDetails[], permissions_by_role?: Record<string, string[]>): void;
|
|
43
47
|
/**
|
|
44
48
|
* Invalidates cache for a specific user
|
|
45
49
|
* @param user_id - User ID to invalidate
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth_cache.d.ts","sourceRoot":"","sources":["../../../src/lib/auth/auth_cache.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAI/D;;;;GAIG;AACH,KAAK,UAAU,GAAG;IAChB,IAAI,EAAE,YAAY,CAAC;IACnB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,EAAE,YAAY,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"auth_cache.d.ts","sourceRoot":"","sources":["../../../src/lib/auth/auth_cache.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAI/D;;;;GAIG;AACH,KAAK,UAAU,GAAG;IAChB,IAAI,EAAE,YAAY,CAAC;IACnB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,EAAE,YAAY,EAAE,CAAC;IAKvB,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC9C,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF;;;GAGG;AACH,cAAM,SAAS;IACb,OAAO,CAAC,KAAK,CAA0B;IACvC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,gBAAgB,CAAsB;gBAG5C,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM;IASzB;;;;;OAKG;IACH,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS;IA+B5C;;;;;;;;;;;OAWG;IACH,GAAG,CACD,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,YAAY,EAClB,WAAW,EAAE,MAAM,EAAE,EACrB,QAAQ,EAAE,MAAM,EAAE,EAClB,MAAM,GAAE,YAAY,EAAO,EAC3B,mBAAmB,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAM,GACjD,IAAI;IA2BP;;;OAGG;IACH,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAItC;;;;OAIG;IACH,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI;IAqB7C;;OAEG;IACH,cAAc,IAAI,IAAI;IAItB;;;;OAIG;IACH,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI;IAalD;;;;;OAKG;IACH,OAAO,CAAC,oBAAoB;IAc5B;;;OAGG;IACH,SAAS,IAAI;QACX,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC;KAClB;CAMF;AAMD;;;;;;GAMG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,GAAE,MAAc,EACxB,WAAW,GAAE,MAAW,EACxB,eAAe,GAAE,MAAW,GAC3B,SAAS,CAKX;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,IAAI,CAEvC"}
|
|
@@ -45,11 +45,14 @@ class AuthCache {
|
|
|
45
45
|
* Evicts least recently used entries if cache is full
|
|
46
46
|
* @param user_id - User ID
|
|
47
47
|
* @param user - User data
|
|
48
|
-
* @param permissions - User permissions
|
|
48
|
+
* @param permissions - User permissions (union across all scope roles)
|
|
49
49
|
* @param role_ids - User role IDs (v5.x: string UUIDs)
|
|
50
50
|
* @param scopes - User scope details with full information (v5.2+)
|
|
51
|
+
* @param permissions_by_role - Per-role permission breakdown (v10.29+), used
|
|
52
|
+
* for HRBAC scope-aware filtering. Defaults to {} for callers that haven't
|
|
53
|
+
* been updated yet (scope-aware resolution simply won't have data to filter).
|
|
51
54
|
*/
|
|
52
|
-
set(user_id, user, permissions, role_ids, scopes = []) {
|
|
55
|
+
set(user_id, user, permissions, role_ids, scopes = [], permissions_by_role = {}) {
|
|
53
56
|
// Evict LRU entries if cache is full
|
|
54
57
|
while (this.cache.size >= this.max_size) {
|
|
55
58
|
const first_key = this.cache.keys().next().value;
|
|
@@ -67,6 +70,7 @@ class AuthCache {
|
|
|
67
70
|
permissions,
|
|
68
71
|
role_ids,
|
|
69
72
|
scopes,
|
|
73
|
+
permissions_by_role,
|
|
70
74
|
timestamp: Date.now(),
|
|
71
75
|
cache_version,
|
|
72
76
|
};
|
|
@@ -12,6 +12,10 @@ export type HazoAuthUser = {
|
|
|
12
12
|
app_user_data: Record<string, unknown> | null;
|
|
13
13
|
legal_acceptance: LegalAcceptanceMap | null;
|
|
14
14
|
preferred_locale: string | null;
|
|
15
|
+
country: string | null;
|
|
16
|
+
state_province: string | null;
|
|
17
|
+
suburb: string | null;
|
|
18
|
+
user_type: string | null;
|
|
15
19
|
};
|
|
16
20
|
/**
|
|
17
21
|
* Scope access information returned when scope checking is used
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth_types.d.ts","sourceRoot":"","sources":["../../../src/lib/auth/auth_types.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEpE;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAEnC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAE9C,gBAAgB,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAG5C,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"auth_types.d.ts","sourceRoot":"","sources":["../../../src/lib/auth/auth_types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hazo_get_auth.server.d.ts","sourceRoot":"","sources":["../../../src/lib/auth/hazo_get_auth.server.ts"],"names":[],"mappings":"AAEA,OAAO,aAAa,CAAC;AAGrB,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAM1C,OAAO,KAAK,EACV,cAAc,EAEd,eAAe,EAGhB,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"hazo_get_auth.server.d.ts","sourceRoot":"","sources":["../../../src/lib/auth/hazo_get_auth.server.ts"],"names":[],"mappings":"AAEA,OAAO,aAAa,CAAC;AAGrB,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAM1C,OAAO,KAAK,EACV,cAAc,EAEd,eAAe,EAGhB,MAAM,cAAc,CAAC;AAiEtB;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,CAU1D;AAwUD;;;;;;;;;GASG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE,WAAW,EACpB,OAAO,CAAC,EAAE,eAAe,GACxB,OAAO,CAAC,cAAc,CAAC,CAgQzB"}
|
|
@@ -17,6 +17,7 @@ import { check_user_scope_access, get_user_scopes, } from "../services/user_scop
|
|
|
17
17
|
import { get_cookie_name, BASE_COOKIE_NAMES } from "../cookies_config.server.js";
|
|
18
18
|
import { get_app_permission_descriptions } from "../app_permissions_config.server.js";
|
|
19
19
|
import { GLOBAL_ADMIN_PERMISSION } from "../constants.js";
|
|
20
|
+
import { extract_scope_id_from_request } from "./scope_header.js";
|
|
20
21
|
// section: helpers
|
|
21
22
|
/**
|
|
22
23
|
* Parse JSON string to object, returning null on failure
|
|
@@ -126,6 +127,7 @@ async function fetch_user_scope_details(user_id) {
|
|
|
126
127
|
* @returns Object with user, permissions, role_ids, and scopes
|
|
127
128
|
*/
|
|
128
129
|
async function fetch_user_data_from_db(user_id) {
|
|
130
|
+
var _a;
|
|
129
131
|
const hazoConnect = get_hazo_connect_instance();
|
|
130
132
|
const users_service = createCrudService(hazoConnect, "hazo_users");
|
|
131
133
|
// v5.x: Use hazo_user_scopes instead of hazo_user_roles
|
|
@@ -154,6 +156,10 @@ async function fetch_user_data_from_db(user_id) {
|
|
|
154
156
|
app_user_data: parse_app_user_data(user_db.app_user_data),
|
|
155
157
|
legal_acceptance: parse_legal_acceptance(user_db.legal_acceptance),
|
|
156
158
|
preferred_locale: user_db.preferred_locale || null,
|
|
159
|
+
country: user_db.country || null,
|
|
160
|
+
state_province: user_db.state_province || null,
|
|
161
|
+
suburb: user_db.suburb || null,
|
|
162
|
+
user_type: user_db.user_type || null,
|
|
157
163
|
};
|
|
158
164
|
// v5.x: Fetch user's roles from hazo_user_scopes (scope-based role assignments)
|
|
159
165
|
// Each scope assignment has a role_id (string UUID)
|
|
@@ -168,8 +174,12 @@ async function fetch_user_data_from_db(user_id) {
|
|
|
168
174
|
}
|
|
169
175
|
}
|
|
170
176
|
const role_ids = Array.from(role_ids_set);
|
|
171
|
-
// Fetch role permissions
|
|
177
|
+
// Fetch role permissions. Builds both the flattened union (`permissions`,
|
|
178
|
+
// used when HRBAC is disabled or no active scope is set) and a per-role
|
|
179
|
+
// breakdown (`permissions_by_role`, used by hazo_get_auth to filter down to
|
|
180
|
+
// just the active scope's role — see "section: scope_aware_permissions" below).
|
|
172
181
|
const permissions_set = new Set();
|
|
182
|
+
const permissions_by_role = {};
|
|
173
183
|
if (role_ids.length > 0) {
|
|
174
184
|
const role_permissions = await role_permissions_service.findBy({});
|
|
175
185
|
if (Array.isArray(role_permissions)) {
|
|
@@ -183,7 +193,9 @@ async function fetch_user_data_from_db(user_id) {
|
|
|
183
193
|
permission_ids.add(String(perm_id));
|
|
184
194
|
}
|
|
185
195
|
}
|
|
186
|
-
// Fetch permission names
|
|
196
|
+
// Fetch permission names, keyed by permission_id, so we can resolve
|
|
197
|
+
// both the flattened union and each role's own subset from one query.
|
|
198
|
+
const permission_names_by_id = new Map();
|
|
187
199
|
if (permission_ids.size > 0) {
|
|
188
200
|
const permissions = await permissions_service.findBy({});
|
|
189
201
|
if (Array.isArray(permissions)) {
|
|
@@ -192,18 +204,32 @@ async function fetch_user_data_from_db(user_id) {
|
|
|
192
204
|
if (perm_id !== undefined && permission_ids.has(String(perm_id))) {
|
|
193
205
|
const perm_name = perm.permission_name;
|
|
194
206
|
if (perm_name) {
|
|
195
|
-
|
|
207
|
+
permission_names_by_id.set(String(perm_id), perm_name);
|
|
196
208
|
}
|
|
197
209
|
}
|
|
198
210
|
}
|
|
199
211
|
}
|
|
200
212
|
}
|
|
213
|
+
for (const role_id of role_ids) {
|
|
214
|
+
permissions_by_role[role_id] = [];
|
|
215
|
+
}
|
|
216
|
+
for (const rp of user_role_permissions) {
|
|
217
|
+
const perm_id = rp.permission_id;
|
|
218
|
+
if (perm_id === undefined)
|
|
219
|
+
continue;
|
|
220
|
+
const perm_name = permission_names_by_id.get(String(perm_id));
|
|
221
|
+
if (!perm_name)
|
|
222
|
+
continue;
|
|
223
|
+
permissions_set.add(perm_name);
|
|
224
|
+
const role_id = String(rp.role_id);
|
|
225
|
+
((_a = permissions_by_role[role_id]) !== null && _a !== void 0 ? _a : (permissions_by_role[role_id] = [])).push(perm_name);
|
|
226
|
+
}
|
|
201
227
|
}
|
|
202
228
|
}
|
|
203
229
|
const permissions = Array.from(permissions_set);
|
|
204
230
|
// v5.2: Fetch full scope details for caching
|
|
205
231
|
const scopes = await fetch_user_scope_details(user_id);
|
|
206
|
-
return { user, permissions, role_ids, scopes };
|
|
232
|
+
return { user, permissions, role_ids, scopes, permissions_by_role };
|
|
207
233
|
}
|
|
208
234
|
/**
|
|
209
235
|
* Checks if user has required permissions
|
|
@@ -307,7 +333,7 @@ async function check_scope_access_internal(user_id, scope_id) {
|
|
|
307
333
|
* @throws ScopeAccessError if strict mode and scope access is denied
|
|
308
334
|
*/
|
|
309
335
|
export async function hazo_get_auth(request, options) {
|
|
310
|
-
var _a, _b, _c;
|
|
336
|
+
var _a, _b, _c, _d, _e;
|
|
311
337
|
const logger = create_app_logger();
|
|
312
338
|
const config = get_auth_utility_config();
|
|
313
339
|
const cache = get_auth_cache(config.cache_max_users, config.cache_ttl_minutes, config.cache_max_age_minutes);
|
|
@@ -379,11 +405,15 @@ export async function hazo_get_auth(request, options) {
|
|
|
379
405
|
let user;
|
|
380
406
|
let permissions;
|
|
381
407
|
let role_ids; // v5.x: role_ids are now string UUIDs
|
|
408
|
+
let scopes;
|
|
409
|
+
let permissions_by_role;
|
|
382
410
|
if (cached_entry) {
|
|
383
411
|
// Cache hit
|
|
384
412
|
user = cached_entry.user;
|
|
385
413
|
permissions = cached_entry.permissions;
|
|
386
414
|
role_ids = cached_entry.role_ids;
|
|
415
|
+
scopes = cached_entry.scopes;
|
|
416
|
+
permissions_by_role = cached_entry.permissions_by_role;
|
|
387
417
|
}
|
|
388
418
|
else {
|
|
389
419
|
// Cache miss - fetch from database
|
|
@@ -392,8 +422,10 @@ export async function hazo_get_auth(request, options) {
|
|
|
392
422
|
user = user_data.user;
|
|
393
423
|
permissions = user_data.permissions;
|
|
394
424
|
role_ids = user_data.role_ids;
|
|
395
|
-
|
|
396
|
-
|
|
425
|
+
scopes = user_data.scopes;
|
|
426
|
+
permissions_by_role = user_data.permissions_by_role;
|
|
427
|
+
// Update cache (v5.2: includes scope details for tenant auth; v10.29: per-role breakdown)
|
|
428
|
+
cache.set(user_id, user, permissions, role_ids, scopes, permissions_by_role);
|
|
397
429
|
}
|
|
398
430
|
catch (error) {
|
|
399
431
|
const error_message = error instanceof Error ? error.message : "Unknown error";
|
|
@@ -412,6 +444,31 @@ export async function hazo_get_auth(request, options) {
|
|
|
412
444
|
};
|
|
413
445
|
}
|
|
414
446
|
}
|
|
447
|
+
// section: scope_aware_permissions (ticket 12 — HRBAC scope-aware permissions)
|
|
448
|
+
//
|
|
449
|
+
// `permissions` above is the union across every scope the user belongs to — the
|
|
450
|
+
// pre-existing behavior, which this block preserves as the fallback whenever:
|
|
451
|
+
// - HRBAC is disabled, or
|
|
452
|
+
// - no active scope is set (no X-Hazo-Scope-Id header/cookie, and the caller
|
|
453
|
+
// didn't pass options.scope_id), or
|
|
454
|
+
// - the user holds the global-admin permission, which transcends scope by
|
|
455
|
+
// design (identical bypass to the scope-ACCESS check further below).
|
|
456
|
+
//
|
|
457
|
+
// Otherwise, permissions are narrowed to ONLY the role assigned in the active
|
|
458
|
+
// scope — fixing the gap where a role in scope A incorrectly granted its
|
|
459
|
+
// permissions while the user was operating in unrelated scope B. A user with no
|
|
460
|
+
// hazo_user_scopes row for the active scope gets zero permissions there (not the
|
|
461
|
+
// union) — they are simply not a member of that scope.
|
|
462
|
+
const hrbac_enabled = is_hrbac_enabled();
|
|
463
|
+
const active_scope_id = (_d = options === null || options === void 0 ? void 0 : options.scope_id) !== null && _d !== void 0 ? _d : extract_scope_id_from_request(request);
|
|
464
|
+
if (hrbac_enabled &&
|
|
465
|
+
active_scope_id &&
|
|
466
|
+
!permissions.includes(GLOBAL_ADMIN_PERMISSION)) {
|
|
467
|
+
const active_scope = scopes.find((s) => s.id === active_scope_id);
|
|
468
|
+
permissions = active_scope
|
|
469
|
+
? (_e = permissions_by_role[active_scope.role_id]) !== null && _e !== void 0 ? _e : []
|
|
470
|
+
: [];
|
|
471
|
+
}
|
|
415
472
|
// Check permissions if required
|
|
416
473
|
let permission_ok = true;
|
|
417
474
|
let missing_permissions;
|
|
@@ -444,7 +501,6 @@ export async function hazo_get_auth(request, options) {
|
|
|
444
501
|
// Check scope access if enabled and scope_id provided
|
|
445
502
|
let scope_ok;
|
|
446
503
|
let scope_access_via;
|
|
447
|
-
const hrbac_enabled = is_hrbac_enabled();
|
|
448
504
|
if (hrbac_enabled && (options === null || options === void 0 ? void 0 : options.scope_id)) {
|
|
449
505
|
// Global admin permission grants access to all scopes
|
|
450
506
|
const has_global_admin = permissions.includes(GLOBAL_ADMIN_PERMISSION);
|
|
@@ -1,24 +1,8 @@
|
|
|
1
1
|
import "server-only";
|
|
2
2
|
import { NextRequest } from "next/server";
|
|
3
|
+
import { extract_scope_id_from_request, SCOPE_COOKIE_BASE_NAME, get_scope_cookie_name } from "./scope_header.js";
|
|
3
4
|
import type { TenantAuthOptions, TenantAuthResult, RequiredTenantAuthResult } from "./auth_types";
|
|
4
|
-
|
|
5
|
-
* Base cookie name for scope ID (will have prefix applied).
|
|
6
|
-
*
|
|
7
|
-
* Exported so a consuming app can SET the same cookie this module READS —
|
|
8
|
-
* without it, an app implementing a scope switcher has to duplicate the
|
|
9
|
-
* configured prefix and drift the moment it changes.
|
|
10
|
-
*/
|
|
11
|
-
export declare const SCOPE_COOKIE_BASE_NAME = "hazo_auth_scope_id";
|
|
12
|
-
/** The live, prefixed scope cookie name for this deployment. */
|
|
13
|
-
export declare function get_scope_cookie_name(): string;
|
|
14
|
-
/**
|
|
15
|
-
* Extracts scope ID from request headers or cookies
|
|
16
|
-
* Priority: Header > Cookie
|
|
17
|
-
* @param request - NextRequest object
|
|
18
|
-
* @param options - TenantAuthOptions for customization
|
|
19
|
-
* @returns Scope ID if found, undefined otherwise
|
|
20
|
-
*/
|
|
21
|
-
export declare function extract_scope_id_from_request(request: NextRequest, options: TenantAuthOptions): string | undefined;
|
|
5
|
+
export { extract_scope_id_from_request, SCOPE_COOKIE_BASE_NAME, get_scope_cookie_name };
|
|
22
6
|
/**
|
|
23
7
|
* Tenant-aware authentication function
|
|
24
8
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hazo_get_tenant_auth.server.d.ts","sourceRoot":"","sources":["../../../src/lib/auth/hazo_get_tenant_auth.server.ts"],"names":[],"mappings":"AAEA,OAAO,aAAa,CAAC;AAGrB,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"hazo_get_tenant_auth.server.d.ts","sourceRoot":"","sources":["../../../src/lib/auth/hazo_get_tenant_auth.server.ts"],"names":[],"mappings":"AAEA,OAAO,aAAa,CAAC;AAGrB,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAO1C,OAAO,EACL,6BAA6B,EAC7B,sBAAsB,EACtB,qBAAqB,EACtB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EACV,iBAAiB,EACjB,gBAAgB,EAChB,wBAAwB,EAGzB,MAAM,cAAc,CAAC;AAUtB,OAAO,EAAE,6BAA6B,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,CAAC;AAgCxF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,WAAW,EACpB,OAAO,GAAE,iBAAsB,GAC9B,OAAO,CAAC,gBAAgB,CAAC,CAwF3B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,WAAW,EACpB,OAAO,GAAE,iBAAsB,GAC9B,OAAO,CAAC,wBAAwB,CAAC,CA0BnC"}
|
|
@@ -6,47 +6,14 @@ import { get_auth_cache } from "./auth_cache.js";
|
|
|
6
6
|
import { get_scope_by_id } from "../services/scope_service.js";
|
|
7
7
|
import { GLOBAL_ADMIN_PERMISSION } from "../constants.js";
|
|
8
8
|
import { get_hazo_connect_instance } from "../hazo_connect_instance.server.js";
|
|
9
|
-
import { get_cookie_name } from "../cookies_config.server.js";
|
|
10
9
|
import { get_auth_utility_config } from "../auth_utility_config.server.js";
|
|
10
|
+
import { extract_scope_id_from_request, SCOPE_COOKIE_BASE_NAME, get_scope_cookie_name, } from "./scope_header.js";
|
|
11
11
|
import { AuthenticationRequiredError, TenantRequiredError, TenantAccessDeniedError, } from "./auth_types.js";
|
|
12
|
-
// section:
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
const DEFAULT_SCOPE_HEADER = "X-Hazo-Scope-Id";
|
|
17
|
-
/**
|
|
18
|
-
* Base cookie name for scope ID (will have prefix applied).
|
|
19
|
-
*
|
|
20
|
-
* Exported so a consuming app can SET the same cookie this module READS —
|
|
21
|
-
* without it, an app implementing a scope switcher has to duplicate the
|
|
22
|
-
* configured prefix and drift the moment it changes.
|
|
23
|
-
*/
|
|
24
|
-
export const SCOPE_COOKIE_BASE_NAME = "hazo_auth_scope_id";
|
|
25
|
-
/** The live, prefixed scope cookie name for this deployment. */
|
|
26
|
-
export function get_scope_cookie_name() {
|
|
27
|
-
return get_cookie_name(SCOPE_COOKIE_BASE_NAME);
|
|
28
|
-
}
|
|
12
|
+
// section: re_exports
|
|
13
|
+
// Moved to scope_header.ts (shared with hazo_get_auth's scope-aware permission
|
|
14
|
+
// resolution) — re-exported here so existing consumers of this module keep working.
|
|
15
|
+
export { extract_scope_id_from_request, SCOPE_COOKIE_BASE_NAME, get_scope_cookie_name };
|
|
29
16
|
// section: helpers
|
|
30
|
-
/**
|
|
31
|
-
* Extracts scope ID from request headers or cookies
|
|
32
|
-
* Priority: Header > Cookie
|
|
33
|
-
* @param request - NextRequest object
|
|
34
|
-
* @param options - TenantAuthOptions for customization
|
|
35
|
-
* @returns Scope ID if found, undefined otherwise
|
|
36
|
-
*/
|
|
37
|
-
export function extract_scope_id_from_request(request, options) {
|
|
38
|
-
var _a;
|
|
39
|
-
// Check header first
|
|
40
|
-
const header_name = options.scope_header_name || DEFAULT_SCOPE_HEADER;
|
|
41
|
-
const header_value = request.headers.get(header_name);
|
|
42
|
-
if (header_value) {
|
|
43
|
-
return header_value;
|
|
44
|
-
}
|
|
45
|
-
// Check cookie (with prefix)
|
|
46
|
-
const cookie_name = options.scope_cookie_name || get_cookie_name(SCOPE_COOKIE_BASE_NAME);
|
|
47
|
-
const cookie_value = (_a = request.cookies.get(cookie_name)) === null || _a === void 0 ? void 0 : _a.value;
|
|
48
|
-
return cookie_value;
|
|
49
|
-
}
|
|
50
17
|
/**
|
|
51
18
|
* Builds TenantOrganization from scope details
|
|
52
19
|
* @param scope_details - Full scope details from cache
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { NextRequest } from "next/server";
|
|
2
|
+
/** Default header name for the active scope ID. */
|
|
3
|
+
export declare const DEFAULT_SCOPE_HEADER = "X-Hazo-Scope-Id";
|
|
4
|
+
/**
|
|
5
|
+
* Base cookie name for scope ID (will have the configured prefix applied).
|
|
6
|
+
*
|
|
7
|
+
* Exported so a consuming app can SET the same cookie this module READS — without it,
|
|
8
|
+
* an app implementing a scope switcher has to duplicate the configured prefix and drift
|
|
9
|
+
* the moment it changes.
|
|
10
|
+
*/
|
|
11
|
+
export declare const SCOPE_COOKIE_BASE_NAME = "hazo_auth_scope_id";
|
|
12
|
+
/** The live, prefixed scope cookie name for this deployment. */
|
|
13
|
+
export declare function get_scope_cookie_name(): string;
|
|
14
|
+
export type ScopeHeaderOverrides = {
|
|
15
|
+
/** Header name to check for scope ID (default: "X-Hazo-Scope-Id") */
|
|
16
|
+
scope_header_name?: string;
|
|
17
|
+
/** Cookie name to check for scope ID (uses cookie prefix if not specified) */
|
|
18
|
+
scope_cookie_name?: string;
|
|
19
|
+
};
|
|
20
|
+
/**
|
|
21
|
+
* Extracts the active scope ID from request headers or cookies.
|
|
22
|
+
* Priority: header > cookie.
|
|
23
|
+
* @param request - NextRequest object
|
|
24
|
+
* @param overrides - optional header/cookie name overrides
|
|
25
|
+
* @returns Scope ID if found, undefined otherwise
|
|
26
|
+
*/
|
|
27
|
+
export declare function extract_scope_id_from_request(request: NextRequest, overrides?: ScopeHeaderOverrides): string | undefined;
|
|
28
|
+
//# sourceMappingURL=scope_header.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"scope_header.d.ts","sourceRoot":"","sources":["../../../src/lib/auth/scope_header.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAK1C,mDAAmD;AACnD,eAAO,MAAM,oBAAoB,oBAAoB,CAAC;AAEtD;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB,uBAAuB,CAAC;AAE3D,gEAAgE;AAChE,wBAAgB,qBAAqB,IAAI,MAAM,CAE9C;AAID,MAAM,MAAM,oBAAoB,GAAG;IACjC,qEAAqE;IACrE,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,8EAA8E;IAC9E,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAIF;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,WAAW,EACpB,SAAS,GAAE,oBAAyB,GACnC,MAAM,GAAG,SAAS,CASpB"}
|
|
@@ -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,
|
|
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,
|
|
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,
|
|
@@ -1,10 +1,14 @@
|
|
|
1
1
|
import "server-only";
|
|
2
|
+
import { type LocationFieldsConfig } from "./location_fields_config.server.js";
|
|
2
3
|
export type MySettingsConfig = {
|
|
3
4
|
userFields: {
|
|
4
5
|
show_name_field: boolean;
|
|
5
6
|
show_email_field: boolean;
|
|
6
7
|
show_password_field: boolean;
|
|
7
8
|
};
|
|
9
|
+
/** Which indexed location fields to show as an editable "Location" card —
|
|
10
|
+
* see [hazo_auth__custom_fields] in hazo_auth_config.ini. */
|
|
11
|
+
locationFields: LocationFieldsConfig;
|
|
8
12
|
passwordRequirements: {
|
|
9
13
|
minimum_length: number;
|
|
10
14
|
require_uppercase: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"my_settings_config.server.d.ts","sourceRoot":"","sources":["../../src/lib/my_settings_config.server.ts"],"names":[],"mappings":"AAEA,OAAO,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"my_settings_config.server.d.ts","sourceRoot":"","sources":["../../src/lib/my_settings_config.server.ts"],"names":[],"mappings":"AAEA,OAAO,aAAa,CAAC;AAUrB,OAAO,EAA8B,KAAK,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAGxG,MAAM,MAAM,gBAAgB,GAAG;IAC7B,UAAU,EAAE;QACV,eAAe,EAAE,OAAO,CAAC;QACzB,gBAAgB,EAAE,OAAO,CAAC;QAC1B,mBAAmB,EAAE,OAAO,CAAC;KAC9B,CAAC;IACF;kEAC8D;IAC9D,cAAc,EAAE,oBAAoB,CAAC;IACrC,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,cAAc,EAAE;QACd,kBAAkB,EAAE,OAAO,CAAC;QAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,cAAc,EAAE,MAAM,CAAC;QACvB,kBAAkB,EAAE,OAAO,CAAC;QAC5B,4BAA4B,EAAE,UAAU,GAAG,SAAS,CAAC;QACrD,4BAA4B,CAAC,EAAE,SAAS,GAAG,UAAU,CAAC;QACtD,kBAAkB,EAAE,MAAM,CAAC;KAC5B,CAAC;IACF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,0EAA0E;IAC1E,qBAAqB,EAAE,OAAO,CAAC;IAC/B,QAAQ,EAAE;QACR,6BAA6B,EAAE,MAAM,CAAC;QACtC,sBAAsB,EAAE,MAAM,CAAC;QAC/B,2BAA2B,EAAE,MAAM,CAAC;QACpC,uBAAuB,EAAE,MAAM,CAAC;KACjC,CAAC;IACF,OAAO,EAAE;QACP,aAAa,EAAE,MAAM,CAAC;QACtB,oBAAoB,EAAE,MAAM,CAAC;QAC7B,yBAAyB,EAAE,MAAM,CAAC;QAClC,uBAAuB,EAAE,MAAM,CAAC;QAChC,0BAA0B,EAAE,MAAM,CAAC;QACnC,0BAA0B,EAAE,MAAM,CAAC;QACnC,+BAA+B,EAAE,MAAM,CAAC;QACxC,4BAA4B,EAAE,MAAM,CAAC;KACtC,CAAC;IACF,SAAS,EAAE;QACT,wBAAwB,EAAE,MAAM,EAAE,CAAC;QACnC,wBAAwB,EAAE,MAAM,EAAE,CAAC;KACpC,CAAC;CACH,CAAC;AAGF;;;;GAIG;AACH,wBAAgB,sBAAsB,IAAI,gBAAgB,CAoEzD"}
|
|
@@ -9,6 +9,7 @@ import { get_profile_picture_config } from "./profile_picture_config.server.js";
|
|
|
9
9
|
import { get_messages_config } from "./messages_config.server.js";
|
|
10
10
|
import { get_ui_sizes_config } from "./ui_sizes_config.server.js";
|
|
11
11
|
import { get_file_types_config } from "./file_types_config.server.js";
|
|
12
|
+
import { get_location_fields_config } from "./location_fields_config.server.js";
|
|
12
13
|
// section: helpers
|
|
13
14
|
/**
|
|
14
15
|
* Reads my settings layout configuration from hazo_auth_config.ini file
|
|
@@ -51,8 +52,10 @@ export function get_my_settings_config() {
|
|
|
51
52
|
const loginButtonLabel = get_config_value_optional(section, "login_button_label");
|
|
52
53
|
const loginPath = get_config_value(section, "login_path", "/hazo_auth/login");
|
|
53
54
|
const enableAccountDeletion = get_config_boolean(section, "enable_account_deletion", false);
|
|
55
|
+
const locationFields = get_location_fields_config();
|
|
54
56
|
return {
|
|
55
57
|
userFields,
|
|
58
|
+
locationFields,
|
|
56
59
|
passwordRequirements,
|
|
57
60
|
profilePicture,
|
|
58
61
|
heading,
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import "server-only";
|
|
2
|
+
import { type LocationFieldsConfig } from "./location_fields_config.server.js";
|
|
3
|
+
import { type AppUserDataSchema } from "./app_user_data_config.server.js";
|
|
2
4
|
export type RegisterConfig = {
|
|
3
5
|
showNameField: boolean;
|
|
4
6
|
passwordRequirements: {
|
|
@@ -13,6 +15,8 @@ export type RegisterConfig = {
|
|
|
13
15
|
showReturnHomeButton: boolean;
|
|
14
16
|
returnHomeButtonLabel: string | undefined;
|
|
15
17
|
returnHomePath: string;
|
|
18
|
+
/** See `AlreadyLoggedInConfig.redirectPath` — undefined unless `[hazo_auth__already_logged_in] redirect_path` is set. */
|
|
19
|
+
alreadyLoggedInRedirectPath: string | undefined;
|
|
16
20
|
signInPath: string;
|
|
17
21
|
/** Undefined when not configured — RegisterLayout falls back to `t("shared.sign_in_default")`. */
|
|
18
22
|
signInLabel: string | undefined;
|
|
@@ -28,6 +32,14 @@ export type RegisterConfig = {
|
|
|
28
32
|
enable_facebook_oauth: boolean;
|
|
29
33
|
facebook_button_text: string | undefined;
|
|
30
34
|
};
|
|
35
|
+
/** Which indexed location fields to render on the registration form — see
|
|
36
|
+
* [hazo_auth__custom_fields] in hazo_auth_config.ini. */
|
|
37
|
+
locationFields: LocationFieldsConfig;
|
|
38
|
+
/** Arbitrary custom fields to render on the registration form, reusing the
|
|
39
|
+
* EXISTING [hazo_auth__app_user_data] JSON Schema config (ticket 09 does NOT
|
|
40
|
+
* introduce a second, parallel custom-field config format). Null when
|
|
41
|
+
* schema-based app_user_data editing isn't enabled. */
|
|
42
|
+
customFieldsSchema: AppUserDataSchema | null;
|
|
31
43
|
};
|
|
32
44
|
/**
|
|
33
45
|
* Reads register layout configuration from hazo_auth_config.ini file
|
|
@@ -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;
|
|
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"}
|