Mobile App Custom Proxy

.github/workflows/ci-tests.yml

@@ -104,16 +104,17 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v4
         with:
-          version: 10
+          # version: 10
+          cache: true
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
           node-version: "20"
           cache: "pnpm"
-          cache-dependency-path: SparkyFitnessMobile/pnpm-lock.yaml
+          cache-dependency-path: pnpm-lock.yaml
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile

SparkyFitnessMobile/.prettierignore

@@ -0,0 +1,10 @@
+.eas/
+android/
+assets/
+docs/
+ios/
+node_modules/
+coverage/
+.expo/
+plans/
+devdocs/

SparkyFitnessMobile/App.tsx

@@ -54,6 +54,7 @@ function AppContent() {
   const [showApiKeyModal, setShowApiKeyModal] = useState(false);
   const [apiKeyUrl, setApiKeyUrl] = useState('');
   const [apiKeyValue, setApiKeyValue] = useState('');
+  const [apiKeyProxyHeaders, setApiKeyProxyHeaders] = useState<import('./src/services/storage').ProxyHeader[]>([]);
 
   const [primary, chrome, chromeBorder, bgPrimary, textPrimary, tabActive, tabInactive] = useCSSVariable([
     '--color-accent-primary',
@@ -267,10 +268,11 @@ function AppContent() {
             handleLoginSuccess();
             queryClient.invalidateQueries({ queryKey: serverConnectionQueryKey });
           }}
-          onUseApiKey={(serverUrl) => {
+          onUseApiKey={(serverUrl, proxyHeaders) => {
             dismissLoginModal();
             setApiKeyUrl(serverUrl);
             setApiKeyValue('');
+            setApiKeyProxyHeaders(proxyHeaders);
             setShowApiKeyModal(true);
           }}
           onDismiss={dismissLoginModal}
@@ -281,6 +283,8 @@ function AppContent() {
           setUrl={setApiKeyUrl}
           apiKey={apiKeyValue}
           setApiKey={setApiKeyValue}
+          proxyHeaders={apiKeyProxyHeaders}
+          setProxyHeaders={setApiKeyProxyHeaders}
           isEditing={false}
           onSave={async () => {
             const url = apiKeyUrl.trim().replace(/\/+$/, '');
@@ -297,6 +301,7 @@ function AppContent() {
               url,
               apiKey: apiKeyValue.trim(),
               authType: 'apiKey',
+              proxyHeaders: apiKeyProxyHeaders,
             });
             setShowApiKeyModal(false);
             dismissLoginModal();

SparkyFitnessMobile/__tests__/components/LoginModal.test.tsx

@@ -25,12 +25,15 @@ jest.mock('../../src/services/api/authService', () => ({
   verifyTotp: jest.fn(),
   sendEmailOtp: jest.fn(),
   verifyEmailOtp: jest.fn(),
+  setPendingProxyHeaders: jest.fn(),
+  clearPendingProxyHeaders: jest.fn(),
 }));
 
 jest.mock('../../src/services/storage', () => ({
   getAllServerConfigs: jest.fn(),
   getActiveServerConfig: jest.fn(),
   saveServerConfig: jest.fn().mockResolvedValue(undefined),
+  proxyHeadersToRecord: jest.requireActual('../../src/services/storage').proxyHeadersToRecord,
 }));
 
 jest.mock('../../src/components/Icon', () => {
@@ -636,7 +639,7 @@ describe('LoginModal', () => {
 
       fireEvent.press(result.getAllByText('Use API Key Instead')[0]);
 
-      expect(onUseApiKey).toHaveBeenCalledWith('https://my-server.com');
+      expect(onUseApiKey).toHaveBeenCalledWith('https://my-server.com', []);
     });
 
     it('calls onDismiss when Later is pressed', async () => {
@@ -682,7 +685,36 @@ describe('LoginModal', () => {
 
       fireEvent.press(result.getAllByText('Use API Key Instead')[0]);
 
-      expect(onUseApiKey).toHaveBeenCalledWith('https://my-server.com');
+      expect(onUseApiKey).toHaveBeenCalledWith('https://my-server.com', []);
+    });
+
+    it('does not reuse stale local proxy headers for saved configs', async () => {
+      const onUseApiKey = jest.fn();
+      const result = renderModal({ onUseApiKey });
+      await waitForCredentialsForm(result);
+
+      fireEvent.press(result.getByText('Proxy Headers'));
+      fireEvent.changeText(
+        result.getByPlaceholderText('Header name (e.g. X-Access-Token)'),
+        'X-Proxy-Token',
+      );
+      fireEvent.changeText(result.getByPlaceholderText('Header value'), 'secret-token');
+      fireEvent.press(result.getByText('Save'));
+
+      result.rerender(<LoginModal {...defaultProps} onUseApiKey={onUseApiKey} visible={false} />);
+
+      mockGetAllServerConfigs.mockResolvedValue([existingConfig]);
+      mockGetActiveServerConfig.mockResolvedValue(existingConfig);
+
+      result.rerender(<LoginModal {...defaultProps} onUseApiKey={onUseApiKey} visible={true} />);
+
+      await waitFor(() =>
+        expect(result.getByText('https://existing-server.com')).toBeTruthy(),
+      );
+
+      fireEvent.press(result.getAllByText('Use API Key Instead')[0]);
+
+      expect(onUseApiKey).toHaveBeenCalledWith('https://existing-server.com', []);
     });
   });
 

SparkyFitnessMobile/__tests__/services/apiClient.test.ts

@@ -4,6 +4,7 @@ import { notifySessionExpired } from '../../src/services/api/authService';
 
 jest.mock('../../src/services/storage', () => ({
   getActiveServerConfig: jest.fn(),
+  proxyHeadersToRecord: jest.requireActual('../../src/services/storage').proxyHeadersToRecord,
 }));
 
 jest.mock('../../src/services/api/authService', () => ({

SparkyFitnessMobile/__tests__/services/exerciseApi.test.ts

@@ -9,6 +9,7 @@ import type { ExerciseEntry } from '../../src/types/exercise';
 
 jest.mock('../../src/services/storage', () => ({
   getActiveServerConfig: jest.fn(),
+  proxyHeadersToRecord: jest.requireActual('../../src/services/storage').proxyHeadersToRecord,
 }));
 
 jest.mock('../../src/services/LogService', () => ({

SparkyFitnessMobile/__tests__/services/externalFoodSearchApi.test.ts

@@ -13,6 +13,7 @@ import { getActiveServerConfig, ServerConfig } from '../../src/services/storage'
 
 jest.mock('../../src/services/storage', () => ({
   getActiveServerConfig: jest.fn(),
+  proxyHeadersToRecord: jest.requireActual('../../src/services/storage').proxyHeadersToRecord,
 }));
 
 jest.mock('../../src/services/LogService', () => ({

SparkyFitnessMobile/__tests__/services/foodEntriesApi.test.ts

@@ -13,6 +13,7 @@ import type { FoodEntry } from '../../src/types/foodEntries';
 
 jest.mock('../../src/services/storage', () => ({
   getActiveServerConfig: jest.fn(),
+  proxyHeadersToRecord: jest.requireActual('../../src/services/storage').proxyHeadersToRecord,
 }));
 
 jest.mock('../../src/services/LogService', () => ({

SparkyFitnessMobile/__tests__/services/foodsApi.test.ts

@@ -3,6 +3,7 @@ import { getActiveServerConfig, ServerConfig } from '../../src/services/storage'
 
 jest.mock('../../src/services/storage', () => ({
   getActiveServerConfig: jest.fn(),
+  proxyHeadersToRecord: jest.requireActual('../../src/services/storage').proxyHeadersToRecord,
 }));
 
 jest.mock('../../src/services/LogService', () => ({

SparkyFitnessMobile/__tests__/services/goalsApi.test.ts

@@ -3,6 +3,7 @@ import { getActiveServerConfig, ServerConfig } from '../../src/services/storage'
 
 jest.mock('../../src/services/storage', () => ({
   getActiveServerConfig: jest.fn(),
+  proxyHeadersToRecord: jest.requireActual('../../src/services/storage').proxyHeadersToRecord,
 }));
 
 jest.mock('../../src/services/LogService', () => ({

SparkyFitnessMobile/__tests__/services/healthDataApi.test.ts

@@ -7,6 +7,7 @@ import { getActiveServerConfig, ServerConfig } from '../../src/services/storage'
 
 jest.mock('../../src/services/storage', () => ({
   getActiveServerConfig: jest.fn(),
+  proxyHeadersToRecord: jest.requireActual('../../src/services/storage').proxyHeadersToRecord,
 }));
 
 const mockGetActiveServerConfig = getActiveServerConfig as jest.MockedFunction<

SparkyFitnessMobile/__tests__/services/measurementsApi.test.ts

@@ -3,6 +3,7 @@ import { getActiveServerConfig, ServerConfig } from '../../src/services/storage'
 
 jest.mock('../../src/services/storage', () => ({
   getActiveServerConfig: jest.fn(),
+  proxyHeadersToRecord: jest.requireActual('../../src/services/storage').proxyHeadersToRecord,
 }));
 
 jest.mock('../../src/services/LogService', () => ({

SparkyFitnessMobile/__tests__/services/preferencesApi.test.ts

@@ -3,6 +3,7 @@ import { getActiveServerConfig, ServerConfig } from '../../src/services/storage'
 
 jest.mock('../../src/services/storage', () => ({
   getActiveServerConfig: jest.fn(),
+  proxyHeadersToRecord: jest.requireActual('../../src/services/storage').proxyHeadersToRecord,
 }));
 
 jest.mock('../../src/services/LogService', () => ({

SparkyFitnessMobile/__tests__/services/profileApi.test.ts

@@ -3,6 +3,7 @@ import { getActiveServerConfig, ServerConfig } from '../../src/services/storage'
 
 jest.mock('../../src/services/storage', () => ({
   getActiveServerConfig: jest.fn(),
+  proxyHeadersToRecord: jest.requireActual('../../src/services/storage').proxyHeadersToRecord,
 }));
 
 jest.mock('../../src/services/LogService', () => ({

SparkyFitnessMobile/__tests__/services/storage.test.ts

@@ -517,18 +517,18 @@ describe('storage', () => {
   });
 
   describe('loadBackgroundSyncEnabled', () => {
-    test('defaults to true when no value stored', async () => {
+    test('defaults to false when no value stored', async () => {
       const result = await loadBackgroundSyncEnabled();
 
-      expect(result).toBe(true);
+      expect(result).toBe(false);
     });
 
-    test("defaults to true on storage error (doesn't throw)", async () => {
+    test("defaults to false on storage error (doesn't throw)", async () => {
       jest.spyOn(AsyncStorage, 'getItem').mockRejectedValueOnce(new Error('Storage error'));
 
       const result = await loadBackgroundSyncEnabled();
 
-      expect(result).toBe(true);
+      expect(result).toBe(false);
     });
   });
 

SparkyFitnessMobile/app.json

@@ -48,7 +48,8 @@
       ]
     ],
     "experiments": {
-      "reactCompiler": true
+      "reactCompiler": true,
+      "autolinkingModuleResolution": true
     },
     "extra": {
       "eas": {

SparkyFitnessMobile/package.json

@@ -43,14 +43,14 @@
     "expo-task-manager": "~14.0.9",
     "expo-web-browser": "~15.0.10",
     "react": "19.1.0",
-    "react-native": "^0.81.5",
+    "react-native": "0.81.5",
     "react-native-bottom-tabs": "^1.1.0",
     "react-native-gesture-handler": "~2.28.0",
     "react-native-health-connect": "^3.5.0",
     "react-native-nitro-modules": "^0.33.2",
-    "react-native-pager-view": "8.0.0",
+    "react-native-pager-view": "6.9.1",
     "react-native-reanimated": "~4.1.1",
-    "react-native-safe-area-context": "^5.6.2",
+    "react-native-safe-area-context": "~5.6.2",
     "react-native-screens": "~4.16.0",
     "react-native-svg": "15.12.1",
     "react-native-ui-datepicker": "^3.1.2",
@@ -59,11 +59,6 @@
     "uniwind": "^1.2.7",
     "victory-native": "^41.20.2"
   },
-  "pnpm": {
-    "overrides": {
-      "side-channel": "1.0.6"
-    }
-  },
   "devDependencies": {
     "@babel/core": "^7.25.2",
     "@babel/runtime": "^7.25.0",
@@ -75,6 +70,7 @@
     "eslint-config-expo": "~10.0.0",
     "expo-atlas": "^0.4.0",
     "jest": "~29.7.0",
+    "jest-environment-jsdom": "29.7.0",
     "jest-expo": "~54.0.17",
     "prettier": "2.8.8",
     "tsx": "^4.21.0",