Fix migration and NABs

Expensify · Jun 17, 2021 · e830882 · e830882
1 parent 859726d
commit e830882
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/libs/addEncryptedAuthTokenToURL.js b/src/libs/addEncryptedAuthTokenToURL.js
@@ -1,14 +1,15 @@
+import lodashGet from 'lodash/get';
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../ONYXKEYS';
 
 let encryptedAuthToken = '';
 Onyx.connect({
     key: ONYXKEYS.SESSION,
-    callback: session => encryptedAuthToken = session.encryptedAuthToken,
+    callback: session => encryptedAuthToken = lodashGet(session, 'encryptedAuthToken', ''),
 });
 
 /**
- * Add authToken to this attachment URL if necessary
+ * Add encryptedAuthToken to this attachment URL if necessary
  *
  * @param {String} url
  * @returns {String}

diff --git a/src/libs/migrations/AddEncryptedAuthToken.js b/src/libs/migrations/AddEncryptedAuthToken.js
@@ -3,8 +3,6 @@ import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../../ONYXKEYS';
 import {reauthenticate} from '../API';
 
-const reauthenticateThrottled = _.throttle(reauthenticate, 5000);
-
 /**
  * This migration adds an encryptedAuthToken to the SESSION key, if it is not present.
  *
@@ -18,20 +16,21 @@ export default function () {
                 Onyx.disconnect(connectionID);
 
                 if (session && !_.isEmpty(session.encryptedAuthToken)) {
-                    console.debug('[Onyx Migration] Skipped migration AddEncryptedAuthToken');
+                    console.debug('[Migrate Onyx] Skipped migration AddEncryptedAuthToken');
                     return resolve();
                 }
 
                 if (!session || !session.authToken) {
-                    console.debug('[Onyx Migration] Skipped migration AddEncryptedAuthToken');
+                    console.debug('[Migrate Onyx] Skipped migration AddEncryptedAuthToken');
                     return resolve();
                 }
 
                 // If there is an auth token but no encrypted auth token, reauthenticate.
                 if (session.authToken && _.isUndefined(session.encryptedAuthToken)) {
-                    return reauthenticateThrottled('Onyx_Migration_AddEncryptedAuthToken')
+                    return reauthenticate('Onyx_Migration_AddEncryptedAuthToken')
                         .then(() => {
-                            console.debug('[Onyx Migration] Ran migration AddEncryptedAuthToken');
+                            console.debug('[Migrate Onyx] Ran migration AddEncryptedAuthToken');
+                            resolve();
                         });
                 }