From e2c5e173d5149c52c89ea5b0e6f896c172a6a6a1 Mon Sep 17 00:00:00 2001
From: Zhiyuan Zheng <me@xmflsct.com>
Date: Sun, 12 Dec 2021 22:09:18 +0100
Subject: [PATCH] Final test for new push system

---
 src/utils/push/useConnect.ts                   | 10 +++-------
 src/utils/slices/instances/push/register.ts    |  2 +-
 src/utils/slices/instances/updatePushDecode.ts |  2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/utils/push/useConnect.ts b/src/utils/push/useConnect.ts
index 77f3ad6b..e0ef63fb 100644
--- a/src/utils/push/useConnect.ts
+++ b/src/utils/push/useConnect.ts
@@ -25,12 +25,8 @@ const pushUseConnect = ({ mode, t, instances, dispatch }: Params) => {
       ).data
 
       apiTooot({
-        method: 'post',
-        service: 'push',
-        url: 'connect',
-        body: {
-          expoToken
-        },
+        method: 'get',
+        url: `push/connect/${expoToken}`,
         sentry: true
       }).catch(error => {
         if (error.status == 410) {
@@ -76,7 +72,7 @@ const pushUseConnect = ({ mode, t, instances, dispatch }: Params) => {
 
     const pushEnabled = instances.filter(instance => instance.push.global.value)
     if (pushEnabled.length) {
-      // connect()
+      connect()
     }
   }, [instances])
 }
diff --git a/src/utils/slices/instances/push/register.ts b/src/utils/slices/instances/push/register.ts
index 38f1cefd..c91a9279 100644
--- a/src/utils/slices/instances/push/register.ts
+++ b/src/utils/slices/instances/push/register.ts
@@ -77,7 +77,7 @@ const pushRegister = async (
     accountId,
     accountFull,
     serverKey: res.body.server_key,
-    auth
+    auth: instancePush.decode.value === false ? null : auth
   })
 
   if (Platform.OS === 'android') {
diff --git a/src/utils/slices/instances/updatePushDecode.ts b/src/utils/slices/instances/updatePushDecode.ts
index 172ca3d4..5ef848ed 100644
--- a/src/utils/slices/instances/updatePushDecode.ts
+++ b/src/utils/slices/instances/updatePushDecode.ts
@@ -29,7 +29,7 @@ export const updateInstancePushDecode = createAsyncThunk(
       method: 'put',
       url: `/push/update-decode/${expoToken}/${instance.url}/${instance.account.id}`,
       body: {
-        auth: disable ? null : instance.push.keys.auth
+        auth: !disable ? null : instance.push.keys.auth
       },
       sentry: true
     })