@oxyhq/services 5.13.40 → 5.15.0

package/lib/module/ui/screens/OxyAuthScreen.js

@@ -0,0 +1,432 @@
+"use strict";
+
+/**
+ * OxyAuthScreen - Sign in with Oxy
+ * 
+ * This screen is used by OTHER apps in the Oxy ecosystem to authenticate users.
+ * It presents two options:
+ * 1. Scan QR code with Oxy Accounts app
+ * 2. Open Oxy Accounts app directly (via deep link)
+ * 
+ * The Oxy Accounts app is where users manage their cryptographic identity.
+ * This screen should NOT be used within the Accounts app itself.
+ */
+
+import { useState, useEffect, useCallback, useRef } from 'react';
+import { View, Text, TouchableOpacity, StyleSheet, Linking, Platform, ActivityIndicator } from 'react-native';
+import { useThemeColors } from '../styles';
+import { useOxy } from '../context/OxyContext';
+import QRCode from 'react-native-qrcode-svg';
+import OxyLogo from '../components/OxyLogo';
+
+// Deep link scheme for Oxy Accounts app
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+const OXY_ACCOUNTS_SCHEME = 'oxyaccounts://';
+const OXY_ACCOUNTS_WEB_URL = 'https://accounts.oxy.so';
+
+// Auth session expiration (5 minutes)
+const AUTH_SESSION_EXPIRY_MS = 5 * 60 * 1000;
+const OxyAuthScreen = ({
+  navigate,
+  goBack,
+  onAuthenticated,
+  theme
+}) => {
+  const themeValue = theme === 'light' || theme === 'dark' ? theme : 'light';
+  const colors = useThemeColors(themeValue);
+  const {
+    oxyServices,
+    signIn
+  } = useOxy();
+  const [authSession, setAuthSession] = useState(null);
+  const [isLoading, setIsLoading] = useState(true);
+  const [error, setError] = useState(null);
+  const [isPolling, setIsPolling] = useState(false);
+  const pollingIntervalRef = useRef(null);
+
+  // Generate a new auth session
+  const generateAuthSession = useCallback(async () => {
+    setIsLoading(true);
+    setError(null);
+    try {
+      // Generate a unique session token for this auth request
+      const sessionToken = generateSessionToken();
+      const expiresAt = Date.now() + AUTH_SESSION_EXPIRY_MS;
+
+      // Register the auth session with the server
+      // The server will associate this token with the user when they authorize in Accounts
+      await oxyServices.makeRequest('POST', '/api/auth/session/create', {
+        sessionToken,
+        expiresAt,
+        appId: Platform.OS // Identifier for requesting app
+      }, {
+        cache: false
+      });
+      setAuthSession({
+        sessionToken,
+        expiresAt
+      });
+      startPolling(sessionToken);
+    } catch (err) {
+      setError(err.message || 'Failed to create auth session');
+    } finally {
+      setIsLoading(false);
+    }
+  }, [oxyServices]);
+
+  // Generate a random session token
+  const generateSessionToken = () => {
+    const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+    let result = '';
+    for (let i = 0; i < 32; i++) {
+      result += chars.charAt(Math.floor(Math.random() * chars.length));
+    }
+    return result;
+  };
+
+  // Start polling for authorization
+  const startPolling = useCallback(sessionToken => {
+    setIsPolling(true);
+    pollingIntervalRef.current = setInterval(async () => {
+      try {
+        const response = await oxyServices.makeRequest('GET', `/api/auth/session/status/${sessionToken}`, undefined, {
+          cache: false
+        });
+        if (response.authorized && response.sessionId) {
+          // Authorization successful!
+          stopPolling();
+
+          // Get token and user data
+          await oxyServices.getTokenBySession(response.sessionId);
+          const user = await oxyServices.getUserBySession(response.sessionId);
+          if (onAuthenticated) {
+            onAuthenticated(user);
+          }
+        }
+      } catch (err) {
+        // Silent fail for polling - will retry
+        if (__DEV__) {
+          console.log('Auth polling error:', err);
+        }
+      }
+    }, 2000); // Poll every 2 seconds
+  }, [oxyServices, onAuthenticated]);
+
+  // Stop polling
+  const stopPolling = useCallback(() => {
+    setIsPolling(false);
+    if (pollingIntervalRef.current) {
+      clearInterval(pollingIntervalRef.current);
+      pollingIntervalRef.current = null;
+    }
+  }, []);
+
+  // Clean up on unmount
+  useEffect(() => {
+    return () => {
+      stopPolling();
+    };
+  }, [stopPolling]);
+
+  // Initialize auth session
+  useEffect(() => {
+    generateAuthSession();
+  }, []);
+
+  // Check if session expired
+  useEffect(() => {
+    if (authSession && Date.now() > authSession.expiresAt) {
+      stopPolling();
+      setAuthSession(null);
+      setError('Session expired. Please try again.');
+    }
+  }, [authSession, stopPolling]);
+
+  // Build the QR code data
+  const getQRData = () => {
+    if (!authSession) return '';
+
+    // Format: oxyauth://{sessionToken}
+    return `oxyauth://${authSession.sessionToken}`;
+  };
+
+  // Open Oxy Accounts app
+  const handleOpenAccounts = useCallback(async () => {
+    if (!authSession) return;
+    const deepLinkUrl = `${OXY_ACCOUNTS_SCHEME}authorize?token=${authSession.sessionToken}`;
+    const webUrl = `${OXY_ACCOUNTS_WEB_URL}/authorize?token=${authSession.sessionToken}`;
+    try {
+      const canOpen = await Linking.canOpenURL(deepLinkUrl);
+      if (canOpen) {
+        await Linking.openURL(deepLinkUrl);
+      } else {
+        // Fallback to web URL
+        await Linking.openURL(webUrl);
+      }
+    } catch (err) {
+      // Fallback to web URL
+      try {
+        await Linking.openURL(webUrl);
+      } catch {
+        setError('Unable to open Oxy Accounts. Please install the app or use QR code.');
+      }
+    }
+  }, [authSession]);
+
+  // Refresh session
+  const handleRefresh = useCallback(() => {
+    stopPolling();
+    generateAuthSession();
+  }, [generateAuthSession, stopPolling]);
+  if (isLoading) {
+    return /*#__PURE__*/_jsxs(View, {
+      style: [styles.container, {
+        backgroundColor: colors.background
+      }],
+      children: [/*#__PURE__*/_jsx(ActivityIndicator, {
+        size: "large",
+        color: colors.primary
+      }), /*#__PURE__*/_jsx(Text, {
+        style: [styles.loadingText, {
+          color: colors.secondaryText
+        }],
+        children: "Preparing sign in..."
+      })]
+    });
+  }
+  if (error) {
+    return /*#__PURE__*/_jsxs(View, {
+      style: [styles.container, {
+        backgroundColor: colors.background
+      }],
+      children: [/*#__PURE__*/_jsx(Text, {
+        style: [styles.errorText, {
+          color: colors.error
+        }],
+        children: error
+      }), /*#__PURE__*/_jsx(TouchableOpacity, {
+        style: [styles.button, {
+          backgroundColor: colors.primary
+        }],
+        onPress: handleRefresh,
+        children: /*#__PURE__*/_jsx(Text, {
+          style: styles.buttonText,
+          children: "Try Again"
+        })
+      })]
+    });
+  }
+  return /*#__PURE__*/_jsxs(View, {
+    style: [styles.container, {
+      backgroundColor: colors.background
+    }],
+    children: [/*#__PURE__*/_jsxs(View, {
+      style: styles.header,
+      children: [/*#__PURE__*/_jsx(OxyLogo, {
+        width: 48,
+        height: 48
+      }), /*#__PURE__*/_jsx(Text, {
+        style: [styles.title, {
+          color: colors.text
+        }],
+        children: "Sign in with Oxy"
+      }), /*#__PURE__*/_jsx(Text, {
+        style: [styles.subtitle, {
+          color: colors.secondaryText
+        }],
+        children: "Use your Oxy identity to sign in securely"
+      })]
+    }), /*#__PURE__*/_jsxs(View, {
+      style: [styles.qrContainer, {
+        backgroundColor: colors.inputBackground,
+        borderColor: colors.border
+      }],
+      children: [/*#__PURE__*/_jsx(View, {
+        style: styles.qrWrapper,
+        children: /*#__PURE__*/_jsx(QRCode, {
+          value: getQRData(),
+          size: 200,
+          backgroundColor: "white",
+          color: "black"
+        })
+      }), /*#__PURE__*/_jsx(Text, {
+        style: [styles.qrHint, {
+          color: colors.secondaryText
+        }],
+        children: "Scan with Oxy Accounts app"
+      })]
+    }), /*#__PURE__*/_jsxs(View, {
+      style: styles.dividerContainer,
+      children: [/*#__PURE__*/_jsx(View, {
+        style: [styles.divider, {
+          backgroundColor: colors.border
+        }]
+      }), /*#__PURE__*/_jsx(Text, {
+        style: [styles.dividerText, {
+          color: colors.secondaryText
+        }],
+        children: "or"
+      }), /*#__PURE__*/_jsx(View, {
+        style: [styles.divider, {
+          backgroundColor: colors.border
+        }]
+      })]
+    }), /*#__PURE__*/_jsxs(TouchableOpacity, {
+      style: [styles.button, {
+        backgroundColor: colors.primary
+      }],
+      onPress: handleOpenAccounts,
+      children: [/*#__PURE__*/_jsx(OxyLogo, {
+        width: 20,
+        height: 20,
+        fillColor: "white",
+        style: styles.buttonIcon
+      }), /*#__PURE__*/_jsx(Text, {
+        style: styles.buttonText,
+        children: "Open Oxy Accounts"
+      })]
+    }), isPolling && /*#__PURE__*/_jsxs(View, {
+      style: styles.statusContainer,
+      children: [/*#__PURE__*/_jsx(ActivityIndicator, {
+        size: "small",
+        color: colors.primary
+      }), /*#__PURE__*/_jsx(Text, {
+        style: [styles.statusText, {
+          color: colors.secondaryText
+        }],
+        children: "Waiting for authorization..."
+      })]
+    }), /*#__PURE__*/_jsxs(View, {
+      style: styles.footer,
+      children: [/*#__PURE__*/_jsxs(Text, {
+        style: [styles.footerText, {
+          color: colors.secondaryText
+        }],
+        children: ["Don't have Oxy Accounts?", ' ']
+      }), /*#__PURE__*/_jsx(TouchableOpacity, {
+        onPress: () => Linking.openURL(OXY_ACCOUNTS_WEB_URL),
+        children: /*#__PURE__*/_jsx(Text, {
+          style: [styles.footerLink, {
+            color: colors.primary
+          }],
+          children: "Get it here"
+        })
+      })]
+    }), goBack && /*#__PURE__*/_jsx(TouchableOpacity, {
+      style: styles.cancelButton,
+      onPress: goBack,
+      children: /*#__PURE__*/_jsx(Text, {
+        style: [styles.cancelText, {
+          color: colors.secondaryText
+        }],
+        children: "Cancel"
+      })
+    })]
+  });
+};
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    padding: 24,
+    alignItems: 'center',
+    justifyContent: 'center'
+  },
+  header: {
+    alignItems: 'center',
+    marginBottom: 32
+  },
+  title: {
+    fontSize: 24,
+    fontWeight: 'bold',
+    marginTop: 16
+  },
+  subtitle: {
+    fontSize: 14,
+    marginTop: 8,
+    textAlign: 'center'
+  },
+  qrContainer: {
+    padding: 24,
+    borderRadius: 16,
+    borderWidth: 1,
+    alignItems: 'center'
+  },
+  qrWrapper: {
+    padding: 16,
+    backgroundColor: 'white',
+    borderRadius: 12
+  },
+  qrHint: {
+    marginTop: 16,
+    fontSize: 12
+  },
+  dividerContainer: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    marginVertical: 24,
+    width: '100%'
+  },
+  divider: {
+    flex: 1,
+    height: 1
+  },
+  dividerText: {
+    marginHorizontal: 16,
+    fontSize: 14
+  },
+  button: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'center',
+    paddingVertical: 16,
+    paddingHorizontal: 24,
+    borderRadius: 12,
+    width: '100%'
+  },
+  buttonIcon: {
+    marginRight: 10
+  },
+  buttonText: {
+    color: 'white',
+    fontSize: 16,
+    fontWeight: '600'
+  },
+  statusContainer: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    marginTop: 24
+  },
+  statusText: {
+    marginLeft: 8,
+    fontSize: 14
+  },
+  footer: {
+    flexDirection: 'row',
+    marginTop: 32
+  },
+  footerText: {
+    fontSize: 14
+  },
+  footerLink: {
+    fontSize: 14,
+    fontWeight: '600'
+  },
+  cancelButton: {
+    marginTop: 16,
+    padding: 12
+  },
+  cancelText: {
+    fontSize: 14
+  },
+  loadingText: {
+    marginTop: 16,
+    fontSize: 14
+  },
+  errorText: {
+    fontSize: 14,
+    textAlign: 'center',
+    marginBottom: 16
+  }
+});
+export default OxyAuthScreen;
+//# sourceMappingURL=OxyAuthScreen.js.map

package/lib/module/ui/screens/OxyAuthScreen.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["useState","useEffect","useCallback","useRef","View","Text","TouchableOpacity","StyleSheet","Linking","Platform","ActivityIndicator","useThemeColors","useOxy","QRCode","OxyLogo","jsx","_jsx","jsxs","_jsxs","OXY_ACCOUNTS_SCHEME","OXY_ACCOUNTS_WEB_URL","AUTH_SESSION_EXPIRY_MS","OxyAuthScreen","navigate","goBack","onAuthenticated","theme","themeValue","colors","oxyServices","signIn","authSession","setAuthSession","isLoading","setIsLoading","error","setError","isPolling","setIsPolling","pollingIntervalRef","generateAuthSession","sessionToken","generateSessionToken","expiresAt","Date","now","makeRequest","appId","OS","cache","startPolling","err","message","chars","result","i","charAt","Math","floor","random","length","current","setInterval","response","undefined","authorized","sessionId","stopPolling","getTokenBySession","user","getUserBySession","__DEV__","console","log","clearInterval","getQRData","handleOpenAccounts","deepLinkUrl","webUrl","canOpen","canOpenURL","openURL","handleRefresh","style","styles","container","backgroundColor","background","children","size","color","primary","loadingText","secondaryText","errorText","button","onPress","buttonText","header","width","height","title","text","subtitle","qrContainer","inputBackground","borderColor","border","qrWrapper","value","qrHint","dividerContainer","divider","dividerText","fillColor","buttonIcon","statusContainer","statusText","footer","footerText","footerLink","cancelButton","cancelText","create","flex","padding","alignItems","justifyContent","marginBottom","fontSize","fontWeight","marginTop","textAlign","borderRadius","borderWidth","flexDirection","marginVertical","marginHorizontal","paddingVertical","paddingHorizontal","marginRight","marginLeft"],"sourceRoot":"../../../../src","sources":["ui/screens/OxyAuthScreen.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/ui/screens/PaymentGatewayScreen.js

@@ -3,13 +3,15 @@
 import { useState, useRef, useMemo, useCallback } from 'react';
 import { View, Text, TouchableOpacity, StyleSheet, Platform, ScrollView, Animated, Linking, Clipboard, useWindowDimensions } from 'react-native';
 import { fontFamilies, useThemeColors, createCommonStyles } from '../styles';
+import { normalizeTheme } from '../utils/themeUtils';
 import GroupedPillButtons from '../components/internal/GroupedPillButtons';
-import TextField from '../components/internal/TextField';
+import TextField from '../components/TextField';
 import { Ionicons } from '@expo/vector-icons';
 import { FAIRWalletIcon } from '../components/icon';
 import { toast } from 'sonner';
 import QRCode from 'react-native-qrcode-svg';
 import { GroupedSection } from '../components';
+import { useThemeStyles } from '../hooks/useThemeStyles';
 
 // Restrict payment methods to Card, Oxy Pay, and FairCoin (QR)
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
@@ -155,9 +157,10 @@ const PaymentGatewayScreen = props => {
   const slideAnim = useRef(new Animated.Value(0)).current;
   const scaleAnim = useRef(new Animated.Value(1)).current;
   const progressAnim = useRef(new Animated.Value(0.2)).current;
-  const colors = useThemeColors(theme);
-  const commonStyles = createCommonStyles(theme);
-  const styles = useMemo(() => createStyles(colors, theme), [colors, theme]);
+  const normalizedTheme = normalizeTheme(theme);
+  const colors = useThemeColors(normalizedTheme);
+  const commonStyles = createCommonStyles(normalizedTheme);
+  const styles = useMemo(() => createStyles(colors, normalizedTheme), [colors, normalizedTheme]);
 
   // Get symbol and name for currency
   const currencySymbol = CURRENCY_SYMBOLS[currency.toUpperCase()] || currency;
@@ -264,7 +267,7 @@ const PaymentGatewayScreen = props => {
         success: true
       });
     }
-    navigate('AccountOverview');
+    navigate?.('AccountOverview');
   }, [onPaymentResult, navigate]);
 
   // Handle close/cancel: return failure result if payment is not completed
@@ -299,7 +302,7 @@ const PaymentGatewayScreen = props => {
           icon: 'close',
           variant: 'primary'
         }],
-        colors: useThemeColors(theme)
+        colors: useThemeColors(normalizedTheme)
       })]
     });
   }
@@ -386,8 +389,7 @@ const PaymentGatewayScreen = props => {
                     style: styles.summaryItemPrice,
                     children: [item.currency ? CURRENCY_SYMBOLS[item.currency.toUpperCase()] || item.currency : currencySymbol, " ", item.price * (item.quantity ?? 1)]
                   })
-                })),
-                theme: theme
+                }))
               })
             }), /*#__PURE__*/_jsx(View, {
               style: styles.summaryCardDivider
@@ -497,8 +499,7 @@ const PaymentGatewayScreen = props => {
           customIcon: method.key === 'faircoin' ? /*#__PURE__*/_jsx(FAIRWalletIcon, {
             size: 20
           }) : undefined
-        })),
-        theme: theme
+        }))
       })]
     }), /*#__PURE__*/_jsx(GroupedPillButtons, {
       buttons: [{
@@ -573,7 +574,7 @@ const PaymentGatewayScreen = props => {
               keyboardType: "numeric",
               maxLength: 19,
               style: styles.cardFieldContainer,
-              leading: /*#__PURE__*/_jsx(Ionicons, {
+              left: /*#__PURE__*/_jsx(Ionicons, {
                 name: "card-outline",
                 size: 18,
                 color: colors.primary
@@ -593,7 +594,7 @@ const PaymentGatewayScreen = props => {
                 placeholder: "MM/YY",
                 maxLength: 5,
                 style: styles.cardFieldHalfLeft,
-                leading: /*#__PURE__*/_jsx(Ionicons, {
+                left: /*#__PURE__*/_jsx(Ionicons, {
                   name: "calendar-outline",
                   size: 16,
                   color: colors.primary
@@ -612,7 +613,7 @@ const PaymentGatewayScreen = props => {
                 keyboardType: "numeric",
                 maxLength: 4,
                 style: styles.cardFieldHalfRight,
-                leading: /*#__PURE__*/_jsx(Ionicons, {
+                left: /*#__PURE__*/_jsx(Ionicons, {
                   name: "lock-closed-outline",
                   size: 16,
                   color: colors.primary
@@ -825,8 +826,7 @@ const PaymentGatewayScreen = props => {
           iconColor: colors.primary,
           title: 'FairCoin Wallet',
           subtitle: 'Paid via QR'
-        }] : [])],
-        theme: theme
+        }] : [])]
       })]
     }), /*#__PURE__*/_jsx(GroupedPillButtons, {
       buttons: [{
@@ -912,15 +912,9 @@ const PaymentGatewayScreen = props => {
     }
   };
 
-  // Memoize theme-related calculations to prevent unnecessary recalculations
-  const themeStyles = useMemo(() => {
-    const isDarkTheme = theme === 'dark';
-    return {
-      isDarkTheme,
-      backgroundColor: isDarkTheme ? '#121212' : '#f2f2f2',
-      primaryColor: '#007AFF'
-    };
-  }, [theme]);
+  // Use centralized theme styles hook for consistency
+  // primaryColor from hook (#007AFF) is already correct for this screen
+  const themeStyles = useThemeStyles(normalizedTheme);
   return /*#__PURE__*/_jsx(View, {
     style: [styles.container, {
       backgroundColor: themeStyles.backgroundColor