Use new AuthenticatePusher NewDot Optimized API commands

Expensify · Jul 1, 2022 · b7d7b42 · b7d7b42
1 parent a757446
commit b7d7b42
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 35 deletions.
diff --git a/src/ONYXKEYS.js b/src/ONYXKEYS.js
@@ -196,4 +196,7 @@ export default {
     FORMS: {
         ADD_DEBIT_CARD_FORM: 'addDebitCardForm',
     },
+
+    // Pusher token
+    PUSHER_AUTHORIZATION: 'pusherAuthorization',
 };
diff --git a/src/libs/PusherConnectionManager.js b/src/libs/PusherConnectionManager.js
@@ -1,8 +1,21 @@
 import lodashGet from 'lodash/get';
+import Onyx from 'react-native-onyx';
 import * as Pusher from './Pusher/pusher';
 import * as Session from './actions/Session';
 import Log from './Log';
 import CONST from '../CONST';
+import ONYXKEYS from '../ONYXKEYS';
+
+let authorizerCallback;
+Onyx.connect({
+    key: ONYXKEYS.PUSHER_AUTHORIZATION,
+    callback: (authorizationData) => {
+        if (!authorizerCallback) {
+            return;
+        }
+        authorizerCallback(authorizationData.error, authorizationData.token);
+    },
+});
 
 function init() {
     /**
@@ -13,7 +26,8 @@ function init() {
      */
     Pusher.registerCustomAuthorizer(channel => ({
         authorize: (socketID, callback) => {
-            Session.authenticatePusher(socketID, channel.name, callback);
+            authorizerCallback = callback;
+            Session.authenticatePusher(socketID, channel.name);
         },
     }));
 

diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
@@ -21,6 +21,7 @@ import * as ValidationUtils from '../../ValidationUtils';
 import * as Authentication from '../../Authentication';
 import * as ErrorUtils from '../../ErrorUtils';
 import * as Welcome from '../Welcome';
+import * as API from '../../API';
 
 let credentials = {};
 Onyx.connect({
@@ -444,47 +445,15 @@ const reauthenticatePusher = _.throttle(() => {
         });
 }, 5000, {trailing: false});
 
-/**
- * @param {String} socketID
- * @param {String} channelName
- * @param {Function} callback
- */
 function authenticatePusher(socketID, channelName, callback) {
     Log.info('[PusherAuthorizer] Attempting to authorize Pusher', false, {channelName});
 
-    DeprecatedAPI.Push_Authenticate({
+    API.read('AuthenticatePusher', {
         socket_id: socketID,
         channel_name: channelName,
         shouldRetry: false,
         forceNetworkRequest: true,
-    })
-        .then((response) => {
-            if (response.jsonCode === CONST.JSON_CODE.NOT_AUTHENTICATED) {
-                Log.hmmm('[PusherAuthorizer] Unable to authenticate Pusher because authToken is expired');
-                callback(new Error('Pusher failed to authenticate because authToken is expired'), {auth: ''});
-
-                // Attempt to refresh the authToken then reconnect to Pusher
-                reauthenticatePusher();
-                return;
-            }
-
-            if (response.jsonCode !== CONST.JSON_CODE.SUCCESS) {
-                Log.hmmm('[PusherAuthorizer] Unable to authenticate Pusher for reason other than expired session');
-                callback(new Error(`Pusher failed to authenticate because code: ${response.jsonCode} message: ${response.message}`), {auth: ''});
-                return;
-            }
-
-            Log.info(
-                '[PusherAuthorizer] Pusher authenticated successfully',
-                false,
-                {channelName},
-            );
-            callback(null, response);
-        })
-        .catch((error) => {
-            Log.hmmm('[PusherAuthorizer] Unhandled error: ', {channelName, error});
-            callback(new Error('Push_Authenticate request failed'), {auth: ''});
-        });
+    });
 }
 
 /**