Implement deprecation of a static bank in the client and server

kresusapp · Feb 7, 2019 · fdf33d9 · fdf33d9
1 parent 417ecac
commit fdf33d9
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 35 deletions.
diff --git a/client/components/operations/sync-button.js b/client/components/operations/sync-button.js
@@ -7,8 +7,10 @@ import { actions, get } from '../../store';
 
 const Export = connect(
     (state, props) => {
+        let access = get.accessById(state, props.account.bankAccess);
+        let canBeSynced = !get.bankByUuid(state, access.bank).deprecated && access.enabled;
         return {
-            canBeSynced: get.accessByAccountId(state, props.account.id).enabled
+            canBeSynced
         };
     },
     (dispatch, ownProps) => {

diff --git a/client/components/settings/bank-accesses/form.js b/client/components/settings/bank-accesses/form.js
@@ -298,7 +298,7 @@ InitForm.defaultProps = {
 const Export = connect(
     state => {
         return {
-            banks: get.banks(state),
+            banks: get.activeBanks(state),
             emailEnabled: get.boolSetting(state, 'emails-enabled'),
             emailRecipient: get.setting(state, 'email-recipient'),
             categories: get.categories(state)

diff --git a/client/components/settings/bank-accesses/item.js b/client/components/settings/bank-accesses/item.js
@@ -114,34 +114,36 @@ export default connect(
 
     let toggleEnableIcon = null;
 
-    if (access.enabled) {
-        maybeFetchIcon = (
-            <button
-                type="button"
-                className="fa fa-refresh"
-                aria-label="Reload accounts"
-                onClick={props.handleSyncAccounts}
-                title={$t('client.settings.reload_accounts_button')}
-            />
-        );
-        maybeEditIcon = (
-            <ShowEditAccessModalButton
-                faIcon="fa-cog"
-                title={$t('client.settings.change_password_button')}
-                ariaLabel="Edit bank access"
-                accessId={access.id}
-            />
-        );
-        toggleEnableIcon = <DisableAccessButton accessId={access.id} />;
-    } else {
-        toggleEnableIcon = (
-            <ShowEditAccessModalButton
-                faIcon="fa-power-off"
-                title={$t('client.settings.enable_access')}
-                ariaLabel="Enable bank access"
-                accessId={access.id}
-            />
-        );
+    if (!access.bankIsVendorDeprecated) {
+        if (access.enabled) {
+            maybeFetchIcon = (
+                <button
+                    type="button"
+                    className="fa fa-refresh"
+                    aria-label="Reload accounts"
+                    onClick={props.handleSyncAccounts}
+                    title={$t('client.settings.reload_accounts_button')}
+                />
+            );
+            maybeEditIcon = (
+                <ShowEditAccessModalButton
+                    faIcon="fa-cog"
+                    title={$t('client.settings.change_password_button')}
+                    ariaLabel="Edit bank access"
+                    accessId={access.id}
+                />
+            );
+            toggleEnableIcon = <DisableAccessButton accessId={access.id} />;
+        } else {
+            toggleEnableIcon = (
+                <ShowEditAccessModalButton
+                    faIcon="fa-power-off"
+                    title={$t('client.settings.enable_access')}
+                    ariaLabel="Enable bank access"
+                    accessId={access.id}
+                />
+            );
+        }
     }
 
     return (

diff --git a/client/models.js b/client/models.js
@@ -30,6 +30,8 @@ export class Access {
 
         this.customLabel = (maybeHas(arg, 'customLabel') && arg.customLabel) || null;
 
+        this.bankIsVendorDeprecated = staticBank.deprecated;
+
         assert(!maybeHas(arg, 'customFields') || arg.customFields instanceof Array);
         let customFields =
             maybeHas(arg, 'customFields') && arg.customFields.length ? arg.customFields : [];
@@ -52,6 +54,7 @@ export class Bank {
         this.name = assertHas(arg, 'name') && arg.name;
         this.uuid = assertHas(arg, 'uuid') && arg.uuid;
         this.id = this.uuid;
+        this.deprecated = assertHas(arg, 'deprecated') && arg.deprecated;
 
         // Force a deep copy of the custom fields (see also issue #569).
         this.customFields = JSON.parse(JSON.stringify(arg.customFields || []));

diff --git a/client/store/banks.js b/client/store/banks.js
@@ -1284,10 +1284,14 @@ export function getCurrentAccountId(state) {
     return state.currentAccountId;
 }
 
-export function all(state) {
+function all(state) {
     return state.banks;
 }
 
+export function allActiveStaticBanks(state) {
+    return all(state).filter(b => !b.deprecated);
+}
+
 export function bankByUuid(state, uuid) {
     let candidate = state.banks.find(bank => bank.uuid === uuid);
     return typeof candidate !== 'undefined' ? candidate : null;

diff --git a/client/store/index.js b/client/store/index.js
@@ -81,9 +81,9 @@ const memoizedUnusedCategories = createSelector(
 export const get = {
     // *** Banks **************************************************************
     // [Bank]
-    banks(state) {
+    activeBanks(state) {
         assertDefined(state);
-        return Bank.all(state.banks);
+        return Bank.allActiveStaticBanks(state.banks);
     },
 
     // Bank

diff --git a/server/controllers/v1/accesses.js b/server/controllers/v1/accesses.js
@@ -1,5 +1,6 @@
 import Accesses from '../../models/accesses';
 import Accounts from '../../models/accounts';
+import { bankVendorByUuid } from '../models/static-data';
 
 import accountManager from '../../lib/accounts-manager';
 import { fullPoll } from '../../lib/poller';
@@ -124,8 +125,9 @@ export async function fetchOperations(req, res) {
     try {
         let { id: userId } = req.user;
         let access = req.preloaded.access;
+        let bank = bankVendorByUuid(access.bank);
 
-        if (!access.enabled) {
+        if (!access.enabled || bank.isDeprecated) {
             let errcode = getErrorCode('DISABLED_ACCESS');
             throw new KError('disabled access', 403, errcode);
         }
@@ -150,8 +152,9 @@ export async function fetchAccounts(req, res) {
     try {
         let { id: userId } = req.user;
         let access = req.preloaded.access;
+        let bank = bankVendorByUuid(access.bank);
 
-        if (!access.enabled) {
+        if (!access.enabled || bank.isDeprecated) {
             let errcode = getErrorCode('DISABLED_ACCESS');
             throw new KError('disabled access', 403, errcode);
         }

diff --git a/server/lib/poller.js b/server/lib/poller.js
@@ -77,6 +77,13 @@ export async function fullPoll(userId) {
                 await accountManager.retrieveOperationsByAccess(userId, access);
             } else {
                 let { bank, enabled, login } = access;
+                let staticBank = bankVendorByUuid(bank);
+                if (staticBank && staticBank.isDeprecated) {
+                    log.info(
+                        `Won't poll, module for bank ${bank} with login ${login} is deprecated.`
+                    );
+                    continue;
+                }
                 if (!enabled) {
                     log.info(
                         `Won't poll, access from bank ${bank} with login ${login} is disabled.`