From a1970a4c0612b202506920c0a788f50a10ba260d Mon Sep 17 00:00:00 2001 From: Peter Velkov Date: Tue, 28 Dec 2021 23:04:12 +0200 Subject: [PATCH 1/3] Fix api usage inside AddEncryptedAuthToken migration --- src/libs/migrations/AddEncryptedAuthToken.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/migrations/AddEncryptedAuthToken.js b/src/libs/migrations/AddEncryptedAuthToken.js index 540b3c9f3e10..dbd5077bbc70 100644 --- a/src/libs/migrations/AddEncryptedAuthToken.js +++ b/src/libs/migrations/AddEncryptedAuthToken.js @@ -2,7 +2,7 @@ import _ from 'underscore'; import Onyx from 'react-native-onyx'; import Log from '../Log'; import ONYXKEYS from '../../ONYXKEYS'; -import * as reauthenticate from '../API'; +import * as Api from '../API'; /** * This migration adds an encryptedAuthToken to the SESSION key, if it is not present. @@ -28,7 +28,7 @@ export default function () { // If there is an auth token but no encrypted auth token, reauthenticate. if (session.authToken && _.isUndefined(session.encryptedAuthToken)) { - return reauthenticate('Onyx_Migration_AddEncryptedAuthToken') + return Api.reauthenticate('Onyx_Migration_AddEncryptedAuthToken') .then(() => { Log.info('[Migrate Onyx] Ran migration AddEncryptedAuthToken'); return resolve(); From c15d71bd7ac4b66efe13661564d7dc317bb18b8c Mon Sep 17 00:00:00 2001 From: Peter Velkov Date: Wed, 29 Dec 2021 17:21:41 +0200 Subject: [PATCH 2/3] Update `API` to uppercase --- src/libs/migrations/AddEncryptedAuthToken.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/migrations/AddEncryptedAuthToken.js b/src/libs/migrations/AddEncryptedAuthToken.js index dbd5077bbc70..e951d108ecf3 100644 --- a/src/libs/migrations/AddEncryptedAuthToken.js +++ b/src/libs/migrations/AddEncryptedAuthToken.js @@ -2,7 +2,7 @@ import _ from 'underscore'; import Onyx from 'react-native-onyx'; import Log from '../Log'; import ONYXKEYS from '../../ONYXKEYS'; -import * as Api from '../API'; +import * as API from '../API'; /** * This migration adds an encryptedAuthToken to the SESSION key, if it is not present. @@ -28,7 +28,7 @@ export default function () { // If there is an auth token but no encrypted auth token, reauthenticate. if (session.authToken && _.isUndefined(session.encryptedAuthToken)) { - return Api.reauthenticate('Onyx_Migration_AddEncryptedAuthToken') + return API.reauthenticate('Onyx_Migration_AddEncryptedAuthToken') .then(() => { Log.info('[Migrate Onyx] Ran migration AddEncryptedAuthToken'); return resolve(); From 58db73d0a0d14ffc5c053f67a9b410f3aad2b746 Mon Sep 17 00:00:00 2001 From: Peter Velkov Date: Wed, 29 Dec 2021 17:30:59 +0200 Subject: [PATCH 3/3] Suppress API calls being made outside `actions` --- src/libs/migrations/AddEncryptedAuthToken.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libs/migrations/AddEncryptedAuthToken.js b/src/libs/migrations/AddEncryptedAuthToken.js index e951d108ecf3..751ae7478f79 100644 --- a/src/libs/migrations/AddEncryptedAuthToken.js +++ b/src/libs/migrations/AddEncryptedAuthToken.js @@ -1,3 +1,4 @@ +/* eslint-disable rulesdir/no-api-in-views */ import _ from 'underscore'; import Onyx from 'react-native-onyx'; import Log from '../Log';