Refactor user creation logic to improve handling of restricted user attributes and country code. Updated conditions for setting restricted_by_admin and added country_code to the user response structure. Enhanced test snapshots to reflect these changes, ensuring accurate representation of user data.

Author: mantrakp04

apps/backend/src/lib/users.tsx

@@ -128,10 +128,10 @@ export async function createOrUpgradeAnonymousUserWithRules(
 
   const enrichedCreateOrUpdate = {
     ...createOrUpdate,
-    ...!!ruleResult.restrictedBecauseOfSignUpRuleId ? {
+    ...(ruleResult.restrictedBecauseOfSignUpRuleId != null ? {
       restricted_by_admin: true,
       restricted_by_admin_private_details: existingRestrictionPrivateDetails != null ? `${existingRestrictionPrivateDetails}\n\n${restrictionPrivateDetails}` : restrictionPrivateDetails,
-    } : {},
+    } : {}),
     ...(countryCodeToPersist !== null ? { country_code: countryCodeToPersist } : {}),
     risk_scores: {
       sign_up: {

apps/e2e/tests/backend/endpoints/api/v1/__snapshots__/internal-metrics.test.ts.snap

@@ -533,6 +533,7 @@ NiceResponse {
         "auth_with_email": true,
         "client_metadata": null,
         "client_read_only_metadata": null,
+        "country_code": null,
         "display_name": null,
         "has_password": false,
         "id": "<stripped UUID>",
@@ -551,6 +552,12 @@ NiceResponse {
         "restricted_by_admin_private_details": null,
         "restricted_by_admin_reason": null,
         "restricted_reason": null,
+        "risk_scores": {
+          "sign_up": {
+            "bot": 0,
+            "free_trial_abuse": 0,
+          },
+        },
         "selected_team": null,
         "selected_team_id": null,
         "server_metadata": null,
@@ -560,6 +567,7 @@ NiceResponse {
         "auth_with_email": true,
         "client_metadata": null,
         "client_read_only_metadata": null,
+        "country_code": null,
         "display_name": null,
         "has_password": false,
         "id": "<stripped UUID>",
@@ -578,6 +586,12 @@ NiceResponse {
         "restricted_by_admin_private_details": null,
         "restricted_by_admin_reason": null,
         "restricted_reason": null,
+        "risk_scores": {
+          "sign_up": {
+            "bot": 0,
+            "free_trial_abuse": 0,
+          },
+        },
         "selected_team": null,
         "selected_team_id": null,
         "server_metadata": null,
@@ -587,6 +601,7 @@ NiceResponse {
         "auth_with_email": true,
         "client_metadata": null,
         "client_read_only_metadata": null,
+        "country_code": null,
         "display_name": null,
         "has_password": false,
         "id": "<stripped UUID>",
@@ -605,6 +620,12 @@ NiceResponse {
         "restricted_by_admin_private_details": null,
         "restricted_by_admin_reason": null,
         "restricted_reason": null,
+        "risk_scores": {
+          "sign_up": {
+            "bot": 0,
+            "free_trial_abuse": 0,
+          },
+        },
         "selected_team": null,
         "selected_team_id": null,
         "server_metadata": null,
@@ -614,6 +635,7 @@ NiceResponse {
         "auth_with_email": true,
         "client_metadata": null,
         "client_read_only_metadata": null,
+        "country_code": null,
         "display_name": null,
         "has_password": false,
         "id": "<stripped UUID>",
@@ -632,6 +654,12 @@ NiceResponse {
         "restricted_by_admin_private_details": null,
         "restricted_by_admin_reason": null,
         "restricted_reason": null,
+        "risk_scores": {
+          "sign_up": {
+            "bot": 0,
+            "free_trial_abuse": 0,
+          },
+        },
         "selected_team": null,
         "selected_team_id": null,
         "server_metadata": null,
@@ -641,6 +669,7 @@ NiceResponse {
         "auth_with_email": true,
         "client_metadata": null,
         "client_read_only_metadata": null,
+        "country_code": null,
         "display_name": null,
         "has_password": false,
         "id": "<stripped UUID>",
@@ -659,6 +688,12 @@ NiceResponse {
         "restricted_by_admin_private_details": null,
         "restricted_by_admin_reason": null,
         "restricted_reason": null,
+        "risk_scores": {
+          "sign_up": {
+            "bot": 0,
+            "free_trial_abuse": 0,
+          },
+        },
         "selected_team": null,
         "selected_team_id": null,
         "server_metadata": null,
@@ -670,6 +705,7 @@ NiceResponse {
         "auth_with_email": true,
         "client_metadata": null,
         "client_read_only_metadata": null,
+        "country_code": null,
         "display_name": null,
         "has_password": false,
         "id": "<stripped UUID>",
@@ -688,6 +724,12 @@ NiceResponse {
         "restricted_by_admin_private_details": null,
         "restricted_by_admin_reason": null,
         "restricted_reason": null,
+        "risk_scores": {
+          "sign_up": {
+            "bot": 0,
+            "free_trial_abuse": 0,
+          },
+        },
         "selected_team": null,
         "selected_team_id": null,
         "server_metadata": null,
@@ -697,6 +739,7 @@ NiceResponse {
         "auth_with_email": true,
         "client_metadata": null,
         "client_read_only_metadata": null,
+        "country_code": null,
         "display_name": null,
         "has_password": false,
         "id": "<stripped UUID>",
@@ -715,6 +758,12 @@ NiceResponse {
         "restricted_by_admin_private_details": null,
         "restricted_by_admin_reason": null,
         "restricted_reason": null,
+        "risk_scores": {
+          "sign_up": {
+            "bot": 0,
+            "free_trial_abuse": 0,
+          },
+        },
         "selected_team": null,
         "selected_team_id": null,
         "server_metadata": null,
@@ -724,6 +773,7 @@ NiceResponse {
         "auth_with_email": true,
         "client_metadata": null,
         "client_read_only_metadata": null,
+        "country_code": null,
         "display_name": null,
         "has_password": false,
         "id": "<stripped UUID>",
@@ -742,6 +792,12 @@ NiceResponse {
         "restricted_by_admin_private_details": null,
         "restricted_by_admin_reason": null,
         "restricted_reason": null,
+        "risk_scores": {
+          "sign_up": {
+            "bot": 0,
+            "free_trial_abuse": 0,
+          },
+        },
         "selected_team": null,
         "selected_team_id": null,
         "server_metadata": null,
@@ -751,6 +807,7 @@ NiceResponse {
         "auth_with_email": true,
         "client_metadata": null,
         "client_read_only_metadata": null,
+        "country_code": null,
         "display_name": null,
         "has_password": false,
         "id": "<stripped UUID>",
@@ -769,6 +826,12 @@ NiceResponse {
         "restricted_by_admin_private_details": null,
         "restricted_by_admin_reason": null,
         "restricted_reason": null,
+        "risk_scores": {
+          "sign_up": {
+            "bot": 0,
+            "free_trial_abuse": 0,
+          },
+        },
         "selected_team": null,
         "selected_team_id": null,
         "server_metadata": null,
@@ -778,6 +841,7 @@ NiceResponse {
         "auth_with_email": true,
         "client_metadata": null,
         "client_read_only_metadata": null,
+        "country_code": null,
         "display_name": null,
         "has_password": false,
         "id": "<stripped UUID>",
@@ -796,6 +860,12 @@ NiceResponse {
         "restricted_by_admin_private_details": null,
         "restricted_by_admin_reason": null,
         "restricted_reason": null,
+        "risk_scores": {
+          "sign_up": {
+            "bot": 0,
+            "free_trial_abuse": 0,
+          },
+        },
         "selected_team": null,
         "selected_team_id": null,
         "server_metadata": null,