taxtank-core 0.28.67 → 0.28.68

package/fesm2015/taxtank-core.js

@@ -15,11 +15,11 @@ import first from 'lodash/first';
 import last from 'lodash/last';
 import uniqBy from 'lodash/uniqBy';
 import concat from 'lodash/concat';
-import { throwError as throwError$1 } from 'rxjs/internal/observable/throwError';
 import { __decorate, __awaiter } from 'tslib';
 import * as moment$1 from 'moment';
 import { DateRange, extendMoment } from 'moment-range';
 import cloneDeep$1 from 'lodash/cloneDeep';
+import { throwError as throwError$1 } from 'rxjs/internal/observable/throwError';
 import { EventSourcePolyfill } from 'event-source-polyfill/src/eventsource.min.js';
 import compact from 'lodash/compact';
 import differenceBy from 'lodash/differenceBy';
@@ -207,64 +207,65 @@ var AppEventTypeEnum;
     AppEventTypeEnum[AppEventTypeEnum["BASIQ_CONSENT_UPDATED"] = 7] = "BASIQ_CONSENT_UPDATED";
     AppEventTypeEnum[AppEventTypeEnum["BASIQ_CONNECTION_UPDATED"] = 8] = "BASIQ_CONNECTION_UPDATED";
     AppEventTypeEnum[AppEventTypeEnum["BASIQ_JOB_CREATED"] = 9] = "BASIQ_JOB_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["BASIQ_LOGIN_FINISHED"] = 10] = "BASIQ_LOGIN_FINISHED";
-    AppEventTypeEnum[AppEventTypeEnum["CLIENT_INVITE_ACCEPTED"] = 11] = "CLIENT_INVITE_ACCEPTED";
-    AppEventTypeEnum[AppEventTypeEnum["CLIENT_OPEN_CHAT"] = 12] = "CLIENT_OPEN_CHAT";
-    AppEventTypeEnum[AppEventTypeEnum["CLIENT_TRANSFER_TO_OTHER_EMPLOYEE"] = 13] = "CLIENT_TRANSFER_TO_OTHER_EMPLOYEE";
-    AppEventTypeEnum[AppEventTypeEnum["CURRENT_USER_GET_FAILED"] = 14] = "CURRENT_USER_GET_FAILED";
-    AppEventTypeEnum[AppEventTypeEnum["DEPRECIATION_DELETED"] = 15] = "DEPRECIATION_DELETED";
-    AppEventTypeEnum[AppEventTypeEnum["DEPRECIATIONS_CREATED"] = 16] = "DEPRECIATIONS_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["DEPRECIATION_UPDATED_WITH_RECEIPT"] = 17] = "DEPRECIATION_UPDATED_WITH_RECEIPT";
-    AppEventTypeEnum[AppEventTypeEnum["DEPRECIATION_UPDATED_WITH_DELETED_RECEIPT"] = 18] = "DEPRECIATION_UPDATED_WITH_DELETED_RECEIPT";
-    AppEventTypeEnum[AppEventTypeEnum["DEPRECIATION_RECEIPT_CREATED"] = 19] = "DEPRECIATION_RECEIPT_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["DEPRECIATION_RECEIPT_DELETED"] = 20] = "DEPRECIATION_RECEIPT_DELETED";
-    AppEventTypeEnum[AppEventTypeEnum["INCOME_SOURCES_CREATED"] = 21] = "INCOME_SOURCES_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["INCOME_SOURCES_UPDATED"] = 22] = "INCOME_SOURCES_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["INCOME_SOURCES_FORECASTS_CREATED"] = 23] = "INCOME_SOURCES_FORECASTS_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["INCOME_SOURCES_FORECASTS_UPDATED"] = 24] = "INCOME_SOURCES_FORECASTS_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["LOAN_UPDATED"] = 25] = "LOAN_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["LOAN_PAYOUT_UPDATED"] = 26] = "LOAN_PAYOUT_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["MESSAGE_CREATED"] = 27] = "MESSAGE_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["MESSAGE_FILE_CREATED"] = 28] = "MESSAGE_FILE_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["MESSAGE_FILE_DELETED"] = 29] = "MESSAGE_FILE_DELETED";
-    AppEventTypeEnum[AppEventTypeEnum["NOTIFICATION_ADDED"] = 30] = "NOTIFICATION_ADDED";
-    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_DEPRECIATION_CALCULATION_UPDATED"] = 31] = "PROPERTY_DEPRECIATION_CALCULATION_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_UPDATED"] = 32] = "PROPERTY_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_UPDATED_WITH_DOCUMENT"] = 33] = "PROPERTY_UPDATED_WITH_DOCUMENT";
-    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_DOCUMENT_ADDED"] = 34] = "PROPERTY_DOCUMENT_ADDED";
-    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_MOVEMENT_CREATED"] = 35] = "PROPERTY_MOVEMENT_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_MOVEMENT_UPDATED"] = 36] = "PROPERTY_MOVEMENT_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_MOVEMENT_DELETED"] = 37] = "PROPERTY_MOVEMENT_DELETED";
-    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SHARE_UPDATED"] = 38] = "PROPERTY_SHARE_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SALE_ADDED"] = 39] = "PROPERTY_SALE_ADDED";
-    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SALE_DELETED"] = 40] = "PROPERTY_SALE_DELETED";
-    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SUBSCRIPTION_ADDED"] = 41] = "PROPERTY_SUBSCRIPTION_ADDED";
-    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SUBSCRIPTION_DELETED"] = 42] = "PROPERTY_SUBSCRIPTION_DELETED";
-    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_VALUATION_DOCUMENT_CREATED"] = 43] = "PROPERTY_VALUATION_DOCUMENT_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["SERVICE_SUBSCRIPTION_UPDATED"] = 44] = "SERVICE_SUBSCRIPTION_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["SOLE_BUSINESS_CREATED"] = 45] = "SOLE_BUSINESS_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["SOLE_DEPRECIATION_METHOD_UPDATED"] = 46] = "SOLE_DEPRECIATION_METHOD_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["SOLE_DETAILS_CREATED"] = 47] = "SOLE_DETAILS_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["SOLE_DETAILS_UPDATED"] = 48] = "SOLE_DETAILS_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["SOLE_INVOICE_PUBLISHED"] = 49] = "SOLE_INVOICE_PUBLISHED";
-    AppEventTypeEnum[AppEventTypeEnum["TAX_REVIEW_UPDATED"] = 50] = "TAX_REVIEW_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_CREATED"] = 51] = "TRANSACTION_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_DELETED"] = 52] = "TRANSACTION_DELETED";
-    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED"] = 53] = "TRANSACTION_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED_WITH_RECEIPT"] = 54] = "TRANSACTION_UPDATED_WITH_RECEIPT";
-    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED_WITH_DELETED_RECEIPT"] = 55] = "TRANSACTION_UPDATED_WITH_DELETED_RECEIPT";
-    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_RECEIPT_CREATED"] = 56] = "TRANSACTION_RECEIPT_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_RECEIPT_DELETED"] = 57] = "TRANSACTION_RECEIPT_DELETED";
-    AppEventTypeEnum[AppEventTypeEnum["TRANSACTIONS_CREATED"] = 58] = "TRANSACTIONS_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["USER_UPDATED"] = 59] = "USER_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_UPDATED"] = 60] = "VEHICLE_CLAIM_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_CREATED"] = 61] = "VEHICLE_CLAIM_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_DETAILS_UPDATED"] = 62] = "VEHICLE_CLAIM_DETAILS_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_DETAILS_CREATED"] = 63] = "VEHICLE_CLAIM_DETAILS_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_CREATED"] = 64] = "VEHICLE_LOGBOOK_CREATED";
-    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_UPDATED"] = 65] = "VEHICLE_LOGBOOK_UPDATED";
-    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_DELETED"] = 66] = "VEHICLE_LOGBOOK_DELETED";
-    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED"] = 67] = "VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["BASIQ_LOGIN_SUCCESS"] = 10] = "BASIQ_LOGIN_SUCCESS";
+    AppEventTypeEnum[AppEventTypeEnum["BASIQ_LOGIN_FAILED"] = 11] = "BASIQ_LOGIN_FAILED";
+    AppEventTypeEnum[AppEventTypeEnum["CLIENT_INVITE_ACCEPTED"] = 12] = "CLIENT_INVITE_ACCEPTED";
+    AppEventTypeEnum[AppEventTypeEnum["CLIENT_OPEN_CHAT"] = 13] = "CLIENT_OPEN_CHAT";
+    AppEventTypeEnum[AppEventTypeEnum["CLIENT_TRANSFER_TO_OTHER_EMPLOYEE"] = 14] = "CLIENT_TRANSFER_TO_OTHER_EMPLOYEE";
+    AppEventTypeEnum[AppEventTypeEnum["CURRENT_USER_GET_FAILED"] = 15] = "CURRENT_USER_GET_FAILED";
+    AppEventTypeEnum[AppEventTypeEnum["DEPRECIATION_DELETED"] = 16] = "DEPRECIATION_DELETED";
+    AppEventTypeEnum[AppEventTypeEnum["DEPRECIATIONS_CREATED"] = 17] = "DEPRECIATIONS_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["DEPRECIATION_UPDATED_WITH_RECEIPT"] = 18] = "DEPRECIATION_UPDATED_WITH_RECEIPT";
+    AppEventTypeEnum[AppEventTypeEnum["DEPRECIATION_UPDATED_WITH_DELETED_RECEIPT"] = 19] = "DEPRECIATION_UPDATED_WITH_DELETED_RECEIPT";
+    AppEventTypeEnum[AppEventTypeEnum["DEPRECIATION_RECEIPT_CREATED"] = 20] = "DEPRECIATION_RECEIPT_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["DEPRECIATION_RECEIPT_DELETED"] = 21] = "DEPRECIATION_RECEIPT_DELETED";
+    AppEventTypeEnum[AppEventTypeEnum["INCOME_SOURCES_CREATED"] = 22] = "INCOME_SOURCES_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["INCOME_SOURCES_UPDATED"] = 23] = "INCOME_SOURCES_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["INCOME_SOURCES_FORECASTS_CREATED"] = 24] = "INCOME_SOURCES_FORECASTS_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["INCOME_SOURCES_FORECASTS_UPDATED"] = 25] = "INCOME_SOURCES_FORECASTS_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["LOAN_UPDATED"] = 26] = "LOAN_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["LOAN_PAYOUT_UPDATED"] = 27] = "LOAN_PAYOUT_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["MESSAGE_CREATED"] = 28] = "MESSAGE_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["MESSAGE_FILE_CREATED"] = 29] = "MESSAGE_FILE_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["MESSAGE_FILE_DELETED"] = 30] = "MESSAGE_FILE_DELETED";
+    AppEventTypeEnum[AppEventTypeEnum["NOTIFICATION_ADDED"] = 31] = "NOTIFICATION_ADDED";
+    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_DEPRECIATION_CALCULATION_UPDATED"] = 32] = "PROPERTY_DEPRECIATION_CALCULATION_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_UPDATED"] = 33] = "PROPERTY_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_UPDATED_WITH_DOCUMENT"] = 34] = "PROPERTY_UPDATED_WITH_DOCUMENT";
+    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_DOCUMENT_ADDED"] = 35] = "PROPERTY_DOCUMENT_ADDED";
+    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_MOVEMENT_CREATED"] = 36] = "PROPERTY_MOVEMENT_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_MOVEMENT_UPDATED"] = 37] = "PROPERTY_MOVEMENT_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_MOVEMENT_DELETED"] = 38] = "PROPERTY_MOVEMENT_DELETED";
+    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SHARE_UPDATED"] = 39] = "PROPERTY_SHARE_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SALE_ADDED"] = 40] = "PROPERTY_SALE_ADDED";
+    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SALE_DELETED"] = 41] = "PROPERTY_SALE_DELETED";
+    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SUBSCRIPTION_ADDED"] = 42] = "PROPERTY_SUBSCRIPTION_ADDED";
+    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SUBSCRIPTION_DELETED"] = 43] = "PROPERTY_SUBSCRIPTION_DELETED";
+    AppEventTypeEnum[AppEventTypeEnum["PROPERTY_VALUATION_DOCUMENT_CREATED"] = 44] = "PROPERTY_VALUATION_DOCUMENT_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["SERVICE_SUBSCRIPTION_UPDATED"] = 45] = "SERVICE_SUBSCRIPTION_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["SOLE_BUSINESS_CREATED"] = 46] = "SOLE_BUSINESS_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["SOLE_DEPRECIATION_METHOD_UPDATED"] = 47] = "SOLE_DEPRECIATION_METHOD_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["SOLE_DETAILS_CREATED"] = 48] = "SOLE_DETAILS_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["SOLE_DETAILS_UPDATED"] = 49] = "SOLE_DETAILS_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["SOLE_INVOICE_PUBLISHED"] = 50] = "SOLE_INVOICE_PUBLISHED";
+    AppEventTypeEnum[AppEventTypeEnum["TAX_REVIEW_UPDATED"] = 51] = "TAX_REVIEW_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_CREATED"] = 52] = "TRANSACTION_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_DELETED"] = 53] = "TRANSACTION_DELETED";
+    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED"] = 54] = "TRANSACTION_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED_WITH_RECEIPT"] = 55] = "TRANSACTION_UPDATED_WITH_RECEIPT";
+    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED_WITH_DELETED_RECEIPT"] = 56] = "TRANSACTION_UPDATED_WITH_DELETED_RECEIPT";
+    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_RECEIPT_CREATED"] = 57] = "TRANSACTION_RECEIPT_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_RECEIPT_DELETED"] = 58] = "TRANSACTION_RECEIPT_DELETED";
+    AppEventTypeEnum[AppEventTypeEnum["TRANSACTIONS_CREATED"] = 59] = "TRANSACTIONS_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["USER_UPDATED"] = 60] = "USER_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_UPDATED"] = 61] = "VEHICLE_CLAIM_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_CREATED"] = 62] = "VEHICLE_CLAIM_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_DETAILS_UPDATED"] = 63] = "VEHICLE_CLAIM_DETAILS_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_DETAILS_CREATED"] = 64] = "VEHICLE_CLAIM_DETAILS_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_CREATED"] = 65] = "VEHICLE_LOGBOOK_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_UPDATED"] = 66] = "VEHICLE_LOGBOOK_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_DELETED"] = 67] = "VEHICLE_LOGBOOK_DELETED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED"] = 68] = "VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED";
 })(AppEventTypeEnum || (AppEventTypeEnum = {}));
 
 class EventDispatcherService {
@@ -5232,8 +5233,18 @@ class BankConnectionService extends RestService {
                     this.cacheSubject.next(cloneDeep$1(this.cache));
                 }
             }
-            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.BANK_CONNECTION_ADDED, null));
+            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.BANK_CONNECTION_ADDED, connection));
             return plainToClass(BankConnection, connection);
+        }), catchError((error) => {
+            // Show error when user provided wrong login data
+            if (error.status === 401) {
+                this.toastService.error('Invalid credentials');
+            }
+            // Show error when user provided another login (not login he used before)
+            if (error.status === 400) {
+                this.toastService.error('Please enter the login you used before');
+            }
+            return throwError$1(error);
         }));
     }
     listenToAddedBankAccounts() {
@@ -5256,9 +5267,18 @@ class BankConnectionService extends RestService {
             }
         });
     }
+    /**
+     * Create/reconnect bank connection when user successfully logged in to basiq
+     */
     listenBasiqLogin() {
-        this.eventDispatcherService.on(AppEventTypeEnum.BASIQ_LOGIN_FINISHED).subscribe(() => {
-            this.resetCache();
+        this.eventDispatcherService.on(AppEventTypeEnum.BASIQ_LOGIN_SUCCESS).subscribe((data) => {
+            this.add(plainToClass(BankConnection, { id: data.connectionId, basiqJob: { externalId: data.jobId } }))
+                .subscribe(() => { }, 
+            // When user already has some bank accounts in handling connection and trying to login with different credentials, backend can not save this connection.
+            // So we should handle this case as failed login
+            () => {
+                this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.BASIQ_LOGIN_FAILED, null));
+            });
         });
     }
 }
@@ -5280,7 +5300,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImpo
  * service is responsible for fetching bank related information
  */
 class BasiqService extends RestService {
-    constructor(http, eventDispatcherService, environment, toastService, bankConnectionService) {
+    constructor(http, eventDispatcherService, environment, toastService, 
+    // this inject required to init bank connection service and listen basiq login event
+    bankConnectionService) {
         super(http, eventDispatcherService, environment, toastService);
         this.http = http;
         this.eventDispatcherService = eventDispatcherService;
@@ -5295,56 +5317,24 @@ class BasiqService extends RestService {
      */
     listenEvents() {
         this.listenNotifications();
-        this.listenJobs();
+        this.listenJobCreated();
     }
     /**
-     * Create a new Bank connection based on Basiq job.
-     * Here we have nested requests because we need to get a job id before we create a bank connection.
-     * There is no way to use event dispatcher because we expect some errors from bank-connections API, but in components
-     * we interact with basiq service.
+     * Start basiq login process.
+     * Create a basiq job, which contain credentials verifying status.
+     * We can not see login result immediately, because it may take some time (average 10-20 sec)
      */
-    createConnection(loginData, userId) {
-        // Send login data to basiq API to create a basiq job
-        return this.http.post(`${BasiqService.basiqApiUrl}/users/${userId}/connections`, loginData)
-            .pipe(mergeMap((response) => {
-            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.BASIQ_JOB_CREATED, response.id));
-            // Create bank connection based on basiq job
-            return this.bankConnectionService.add(plainToClass(BankConnection, { basiqJob: { externalId: response.id } }));
-        }), catchError((error) => {
-            // Show error when user provided wrong login data
-            if (error.status === 401) {
-                this.toastService.error('Invalid credentials');
-            }
-            return throwError$1(error);
-        }));
-    }
-    /**
-     * Update disconnected bank connection
-     * Here we have nested requests because we need to get a job id before we create a bank connection.
-     * There is no way to use event dispatcher because we expect some errors from bank-connections API, but in components
-     * we interact with basiq service.
-     */
-    updateConnection(data, userId, connection) {
-        // Send login data and connection id to basiq API to create a basiq job
-        return this.http.post(`${BasiqService.basiqApiUrl}/users/${userId}/connections`, Object.assign(data, { id: connection.externalId }))
-            .pipe(mergeMap((response) => {
-            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.BASIQ_JOB_CREATED, response.id));
-            // Create bank connection based on basiq job
-            return this.bankConnectionService.add(plainToClass(BankConnection, {
-                id: connection.id,
-                basiqJob: { externalId: response.id }
-            }));
-        }), catchError((error) => {
-            // Show error when user provided wrong login data
-            if (error.status === 401) {
-                this.toastService.error('Invalid credentials');
-            }
-            // Show error when user provided another login (not login he used before)
-            if (error.status === 400) {
-                this.toastService.error('Please enter the login you used before');
-            }
-            return throwError$1(error);
-        }));
+    login(loginData, userId) {
+        this.http.post(`${BasiqService.basiqApiUrl}/users/${userId}/connections`, loginData)
+            .subscribe((response) => {
+            // we need jobId to check credentials verifying statis from Basiq API
+            // we need connectionId to know if we are creating a new connection or reconnecting existing invalid connection
+            const data = {
+                jobId: response.id,
+                connectionId: loginData.id
+            };
+            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.BASIQ_JOB_CREATED, data));
+        });
     }
     getByConnection(connection) {
         return this.get().pipe(map((bankAccounts) => {
@@ -5357,31 +5347,37 @@ class BasiqService extends RestService {
         }));
     }
     /**
-     * Get status of credentials verifying. Expected statuses: 'in-progress', 'failed' or 'success'
-     * We send this request by interval until basiq return success or failed
-     * @TODO Alex (TT-2431): check logic and try to remove subscribe, use pipes instead
-     * @TODO Alex (TT-2431): implement some limit and handle (message or something) if basiq stuck
-     * @TODO Alex (TT-2431): check logic and handle case when user cancelled loading
-     */
-    checkBankCredentials(jobId) {
-        this.http.get(`${BasiqService.basiqApiUrl}/jobs/${jobId}`)
+    * Get status of credentials verifying. Expected statuses: 'in-progress', 'failed' or 'success'
+    * We send this request by interval until basiq return success or failed.
+    *
+    * Because of Basiq login may take a long time (10-20sec) we have to check job status until it seccess or failed.
+    *
+    * @TODO Alex (TT-2431): check logic and try to remove subscribe, use pipes instead
+    * @TODO Alex (TT-2431): implement some limit and handle (message or something) if basiq stuck
+    * @TODO Alex (TT-2431): check logic and handle case when user cancelled loading
+    */
+    checkLoginStatus(data) {
+        this.http.get(`${BasiqService.basiqApiUrl}/jobs/${data.jobId}`)
             .pipe(
-        // unsubscribe after each request to avoid wrong requests (example: user cancelled too long login and login to another bank, then we will send 2 different requests)
-        take(1), 
         // get verify-credentials step from basiq job
-        map((response) => plainToClass(BasiqJobResponse, response).getVerifyCredentialsStep()), 
+        map((response) => plainToClass(BasiqJobResponse, response)), 
         // check credentials status again if not finished
-        filter((step) => {
-            if (!step.isInProgress()) {
+        filter((response) => {
+            if (!response.getVerifyCredentialsStep().isInProgress()) {
                 return true;
             }
             setTimeout(() => {
-                this.checkBankCredentials(jobId);
+                this.checkLoginStatus(data);
             }, BasiqService.bankCredintialsCheckInterval);
             return false;
         }))
-            .subscribe((step) => {
-            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.BASIQ_LOGIN_FINISHED, step.isSuccess()));
+            .subscribe((response) => {
+            if (response.getVerifyCredentialsStep().isSuccess()) {
+                this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.BASIQ_LOGIN_SUCCESS, data));
+            }
+            else {
+                this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.BASIQ_LOGIN_FAILED, null));
+            }
         });
     }
     /**
@@ -5395,11 +5391,11 @@ class BasiqService extends RestService {
         });
     }
     /**
-     * Listen Basiq job created to check its verify credentials status
+     * Start check job credential status when it created
      */
-    listenJobs() {
-        this.eventDispatcherService.on(AppEventTypeEnum.BASIQ_JOB_CREATED).subscribe((jobId) => {
-            this.checkBankCredentials(jobId);
+    listenJobCreated() {
+        this.eventDispatcherService.on(AppEventTypeEnum.BASIQ_JOB_CREATED).subscribe((data) => {
+            this.checkLoginStatus(data);
         });
     }
 }