new api call names

only create device if we got a expo push token
pushme-tgxn · Dec 20, 2022 · 94a2a30 · 94a2a30
1 parent 549446c
commit 94a2a30
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 17 deletions.
diff --git a/components/CustomNavigationBar.js b/components/CustomNavigationBar.js
@@ -76,15 +76,15 @@ function ViewDeviceButtons({ navigation, deviceData }) {
     const [deleteVisible, setDeleteVisible] = useState(false);
 
     const saveDevice = async () => {
-        await apiService.device.upsertDevice(deviceData.deviceKey, {
+        await apiService.device.update(deviceData.deviceKey, {
             name: deviceName,
         });
 
         setEditVisible(false);
     };
 
     const deleteDevice = async () => {
-        await apiService.device.deleteDevice(deviceData.id);
+        await apiService.device.delete(deviceData.id);
 
         setDeleteVisible(false);
         navigation.navigate("ConfigScreen", { refresh: true });

diff --git a/components/ViewTopic.js b/components/ViewTopic.js
@@ -47,7 +47,7 @@ const ViewTopic = ({ navigation, route }) => {
 
                 const topicDeviceArray = topicData.devices.map((device) => device.id);
 
-                const response = await apiService.device.getList();
+                const response = await apiService.device.list();
 
                 setDeviceList(response.devices);
 

diff --git a/reducers/app.js b/reducers/app.js
@@ -131,13 +131,17 @@ export function reducer(state, action) {
                 const defaultDeviceNameFormat = `${platform} (${Device.deviceName})`;
                 console.log("defaultDeviceNameFormat", defaultDeviceNameFormat);
 
-                // create registration
-                apiService.device.createDevice({
-                    deviceKey: state.deviceKey,
-                    name: defaultDeviceNameFormat,
-                    token: state.expoPushToken,
-                    nativeToken: state.nativePushToken,
-                });
+                // create registration only if we have an expo token
+                // TODO this should also update the device if the keys have changed
+                // currently it just tries to create the device every time
+                if (state.expoPushToken) {
+                    apiService.device.create({
+                        deviceKey: state.deviceKey,
+                        name: defaultDeviceNameFormat,
+                        token: state.expoPushToken,
+                        nativeToken: state.nativePushToken,
+                    });
+                }
 
                 return {
                     ...state,

diff --git a/screens/ConfigScreen.js b/screens/ConfigScreen.js
@@ -53,7 +53,7 @@ const ConfigScreen = ({ navigation, route }) => {
             setTokenList([]);
 
             try {
-                const response = await apiService.device.getList();
+                const response = await apiService.device.list();
                 setTokenList(response.devices);
             } catch (error) {
                 alert(error);

diff --git a/service/api.js b/service/api.js
@@ -1,11 +1,21 @@
 import { showToast } from "../components/Shared";
 
+import { BACKEND_URL } from "../const";
+
 import APIService from "@pushme-tgxn/pushmesdk";
 
-const apiService = new APIService({
-    logging: (message, ...args) => {
-        console.log(message, ...args);
-        showToast(message);
-    },
-});
+function createApiService() {
+    const apiService = new APIService({
+        backendUrl: BACKEND_URL,
+        // logging: (message) => {
+        //     console.log(message);
+        //     showToast(message);
+        // },
+    });
+    console.log("createApiService", apiService.backendUrl);
+
+    return apiService;
+}
+
+const apiService = createApiService();
 export default apiService;