Merge pull request #381 from wavect/wsdt/registration-safety

chore: emulator backend support, auth service slightly more resilient

Author: wsdt

backend/custom-templates/runtime.mustache

@@ -2,15 +2,15 @@
 /* eslint-disable */
 {{>licenseInfo}}
 
-import Constants from 'expo-constants';
-import { IS_DEVELOPMENT_BUILD } from "../../../utils/env.utils";
-
-export const BASE_PATH = ((IS_DEVELOPMENT_BUILD ?
-`http://${Constants.expoConfig?.hostUri?.split(':').shift()?.concat(':3000')}`
-: "https://api.offlinery.io")+ "/v1").replace(
-/\/+$/,
-"",
-);
+import Constants from "expo-constants";
+import { IS_DEVELOPMENT_BUILD, USE_EMULATOR } from "../../../utils/env.utils";
+
+const DEV_BASE_URI = USE_EMULATOR ? "10.0.2.2" : Constants.expoConfig?.hostUri?.split(":").shift()
+export const BASE_PATH = (
+(IS_DEVELOPMENT_BUILD
+? `http://${DEV_BASE_URI?.concat(":3000")}`
+: "https://api.offlinery.io") + "/v1"
+).replace(/\/+$/, "");
 
 export interface ConfigurationParameters {
 basePath?: string; // override base path

mobile/api/gen/src/runtime.ts

@@ -13,11 +13,14 @@
  */
 
 import Constants from "expo-constants";
-import { IS_DEVELOPMENT_BUILD } from "../../../utils/env.utils";
+import { IS_DEVELOPMENT_BUILD, USE_EMULATOR } from "../../../utils/env.utils";
 
+const DEV_BASE_URI = USE_EMULATOR
+    ? "10.0.2.2"
+    : Constants.expoConfig?.hostUri?.split(":").shift();
 export const BASE_PATH = (
     (IS_DEVELOPMENT_BUILD
-        ? `http://${Constants.expoConfig?.hostUri?.split(":").shift()?.concat(":3000")}`
+        ? `http://${DEV_BASE_URI?.concat(":3000")}`
         : "https://api.offlinery.io") + "/v1"
 ).replace(/\/+$/, "");
 

mobile/package.json

@@ -12,6 +12,7 @@
         "start:prod": "expo start --no-dev --minify",
         "start:tunnel": "expo start --tunnel",
         "android": "npx concurrently \"EXPO_PUBLIC_ENVIRONMENT=development expo run:android\" \"npx react-native log-android\"",
+        "android:emulator": "EXPO_PUBLIC_USE_EMULATOR=true pnpm android",
         "ios": "EXPO_PUBLIC_ENVIRONMENT=development expo run:ios",
         "ios:device": "EXPO_PUBLIC_ENVIRONMENT=development expo run:ios --device",
         "ios:dev": "EXPO_PUBLIC_ENVIRONMENT=development expo run:ios",

mobile/services/auth.service.ts

@@ -99,13 +99,22 @@ export const registerUser = async (
         const { user, accessToken, refreshToken } = signInResponseDTO;
         console.log("User created successfully:", user);
 
-        await deleteOnboardingState();
-
-        // Update the user state
-        await refreshUserData(dispatch, user, accessToken, refreshToken);
-
         // Navigate to the next screen or update the UI as needed
         onSuccess();
+
+        try {
+            await deleteOnboardingState();
+
+            // Update the user state
+            await refreshUserData(dispatch, user, accessToken, refreshToken);
+        } catch (err) {
+            console.error("User registration postWork only failed: ", err);
+            Sentry.captureException(err, {
+                tags: {
+                    userContext: "registration:postWork",
+                },
+            });
+        }
     } catch (error: any) {
         console.error("Error creating user:", error, JSON.stringify(error));
         onError(error);

mobile/utils/env.utils.ts

@@ -1,2 +1,5 @@
 export const IS_DEVELOPMENT_BUILD =
     process.env.EXPO_PUBLIC_ENVIRONMENT?.trim() === "development";
+
+export const USE_EMULATOR =
+    process.env.EXPO_PUBLIC_USE_EMULATOR?.trim() === "true";