Added free-text input and issuer

Author: jvogt23

Auth/AuthConfig.ts

@@ -17,10 +17,6 @@ export default async function config(environment: AppEnvironment): Promise<AuthC
     const json = await response.json();
 
     const config: AuthConfiguration = {
-        // serviceConfiguration: {
-        //     authorizationEndpoint: environment.baseUrl + '/oauth/authorize',
-        //     tokenEndpoint: environment.baseUrl + '/oauth/token',
-        // },
         issuer: environment.baseUrl,
         clientId: json.info.oAuthClients.reactNative.clientId,
         redirectUrl: 'org.robojackets.apiary://oauth',

Auth/EnvironmentSelect.tsx

@@ -1,5 +1,5 @@
-import React, { useState } from 'react';
-import { StyleSheet, Text, View } from 'react-native';
+import React, { useEffect, useState } from 'react';
+import { StyleSheet, Text, TextInput, View } from 'react-native';
 import { Modal, RadioButton } from 'react-native-paper';
 import { APP_ENVIRONMENTS, useAppEnvironment } from '../AppEnvironment';
 import RoundedButton from '../Components/RoundedButton';
@@ -16,31 +16,63 @@ export default function EnvironmentSelect({
 
   const {environment, setEnvironment} = useAppEnvironment();
   const [selectedEnv, setSelectedEnv] = useState<string>(environment.name.toLowerCase());
+  const [customUrl, setCustomUrl] = useState<string>('');
 
-    return (
-      <Modal visible={visible} onDismiss={onDismiss} contentContainerStyle={styles.sheet}>
-          <Text style={styles.title}>Change Server</Text>
+  useEffect(() => {
+    if (visible) {
+      setSelectedEnv(environment.name.toLowerCase());
+      setCustomUrl('');
+    }
+  }, [visible]);
 
-          <RadioButton.Group onValueChange={setSelectedEnv} value={selectedEnv}>
-            <View style={{ flexDirection: 'row', alignItems: 'center', marginBottom: 8 }}>
-              <RadioButton.Android value="production" />
-              <Text>Production</Text>
-            </View>
-            <View style={{ flexDirection: 'row', alignItems: 'center', marginBottom: 8 }}>
-              <RadioButton.Android value="test" />
-              <Text>Test</Text>
-            </View>
-            <View style={{ flexDirection: 'row', alignItems: 'center', marginBottom: 8 }}>
-              <RadioButton.Android value="demo" />
-              <Text>Demo</Text>
-            </View>
-          </RadioButton.Group>
+  return (
+    <Modal visible={visible} onDismiss={onDismiss} contentContainerStyle={styles.sheet}>
+        <Text style={styles.title}>Change Server</Text>
+        <RadioButton.Group onValueChange={setSelectedEnv} value={selectedEnv}>
+          <View style={styles.row}>
+            <RadioButton.Android value="production" />
+            <Text>Production</Text>
+          </View>
+          <View style={styles.row}>
+            <RadioButton.Android value="test" />
+            <Text>Test</Text>
+          </View>
+          <View style={styles.row}>
+            <RadioButton.Android value="demo" />
+            <Text>Demo</Text>
+          </View>
+          <View style={styles.row}>
+            <RadioButton.Android value="other" />
+            <Text>Other</Text>
+          </View>
+        </RadioButton.Group>
 
-          <RoundedButton title="Save Changes" onPress={() => {
+        {selectedEnv === "other" && (
+          <TextInput
+            style={styles.textInput}
+            placeholder="Enter base URL"
+            value={customUrl}
+            onChangeText={setCustomUrl}
+          />
+        )}
+
+        <RoundedButton title="Save Changes" onPress={() => {
+          if (selectedEnv === "other") {
+            if (!customUrl.trim()) {
+              onDismiss();
+              return;
+            }
+            setEnvironment({
+              name: "Other",
+              production: false,
+              baseUrl: customUrl,
+            });
+          } else {
             setEnvironment(APP_ENVIRONMENTS[selectedEnv]);
-            onDismiss();
-          }} />
-      </Modal>
+          }
+          onDismiss();
+        }} />
+    </Modal>
   );
 }
 
@@ -60,4 +92,13 @@ const styles = StyleSheet.create({
     marginBottom: 16,
     textAlign: 'center',
   },
+  row: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    marginBottom: 8,
+  },
+  textInput: {
+    padding: 8,
+    marginBottom: 12,
+  },
 });

package-lock.json

@@ -21,7 +21,7 @@
     "jwt-decode": "^4.0.0",
     "react": "19.1.0",
     "react-native": "0.80.1",
-    "react-native-app-auth": "^8.0.3",
+    "react-native-app-auth": "^8.1.0",
     "react-native-keychain": "^10.0.0",
     "react-native-nfc-manager": "^3.16.2",
     "react-native-paper": "^5.14.5",