Change to use makeRequestWithSideEffects

Author: yuwenmemon

src/ONYXKEYS.js

@@ -196,7 +196,4 @@ export default {
     FORMS: {
         ADD_DEBIT_CARD_FORM: 'addDebitCardForm',
     },
-
-    // Pusher token
-    PUSHER_AUTHORIZATION: 'pusherAuthorization',
 };

src/libs/PusherConnectionManager.js

@@ -1,21 +1,8 @@
 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() {
     /**
@@ -26,8 +13,7 @@ function init() {
      */
     Pusher.registerCustomAuthorizer(channel => ({
         authorize: (socketID, callback) => {
-            authorizerCallback = callback;
-            Session.authenticatePusher(socketID, channel.name);
+            Session.authenticatePusher(socketID, channel.name, callback);
         },
     }));
 

src/libs/actions/Session/index.js

@@ -445,14 +445,46 @@ 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});
 
-    API.read('AuthenticatePusher', {
+    // We use makeRequestWithSideEffects here because we need to authorize to Pusher (an external service) each time a user connects to any channel.
+    // eslint-disable-next-line rulesdir/no-api-side-effects-method
+    API.makeRequestWithSideEffects('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: ''});
     });
 }