taxtank-core 0.30.67 → 0.30.69

package/lib/models/bank/basiq/basiq-job-response.d.ts

@@ -3,4 +3,5 @@ export declare class BasiqJobResponse {
     id: string;
     steps: BasiqJobStep[];
     getVerifyCredentialsStep(): BasiqJobStep;
+    getRetrieveAccountsStep(): BasiqJobStep;
 }

package/lib/models/bank/basiq/basiq-job-step.d.ts

@@ -2,6 +2,8 @@ export declare class BasiqJobStep {
     title: 'verify-credentials' | 'retrieve-accounts' | 'retrieve-transactions';
     status: 'pending' | 'in-progress' | 'failed' | 'success';
     isVerifyCredentials(): boolean;
+    isRetrieveAccounts(): boolean;
     isInProgress(): boolean;
     isSuccess(): boolean;
+    isFailed(): boolean;
 }

package/lib/models/event/app-event-type.enum.d.ts

@@ -9,63 +9,64 @@ export declare enum AppEventTypeEnum {
     BASIQ_JOB_CREATED = 7,
     BASIQ_LOGIN_SUCCESS = 8,
     BASIQ_LOGIN_FAILED = 9,
-    CLIENT_INVITE_ACCEPTED = 10,
-    CLIENT_OPEN_CHAT = 11,
-    CLIENT_TRANSFER_TO_OTHER_EMPLOYEE = 12,
-    CURRENT_USER_GET_FAILED = 13,
-    DEPRECIATION_DELETED = 14,
-    DEPRECIATIONS_CREATED = 15,
-    DEPRECIATION_UPDATED_WITH_RECEIPT = 16,
-    DEPRECIATION_UPDATED_WITH_DELETED_RECEIPT = 17,
-    DEPRECIATION_RECEIPT_CREATED = 18,
-    DEPRECIATION_RECEIPT_DELETED = 19,
-    INCOME_SOURCES_CREATED = 20,
-    INCOME_SOURCES_UPDATED = 21,
-    INCOME_SOURCES_FORECASTS_CREATED = 22,
-    INCOME_SOURCES_FORECASTS_UPDATED = 23,
-    LOAN_UPDATED = 24,
-    LOAN_PAYOUT_UPDATED = 25,
-    MESSAGE_CREATED = 26,
-    MESSAGE_FILE_CREATED = 27,
-    MESSAGE_FILE_DELETED = 28,
-    NOTIFICATION_ADDED = 29,
-    PROPERTY_DEPRECIATION_CALCULATION_UPDATED = 30,
-    PROPERTY_UPDATED = 31,
-    PROPERTY_UPDATED_WITH_DOCUMENT = 32,
-    PROPERTY_DOCUMENT_ADDED = 33,
-    PROPERTY_MOVEMENT_CREATED = 34,
-    PROPERTY_MOVEMENT_UPDATED = 35,
-    PROPERTY_MOVEMENT_DELETED = 36,
-    PROPERTY_SHARE_UPDATED = 37,
-    PROPERTY_SALE_ADDED = 38,
-    PROPERTY_SALE_DELETED = 39,
-    PROPERTY_SUBSCRIPTION_ADDED = 40,
-    PROPERTY_SUBSCRIPTION_DELETED = 41,
-    PROPERTY_VALUATION_DOCUMENT_CREATED = 42,
-    SERVICE_SUBSCRIPTION_UPDATED = 43,
-    SOLE_BUSINESS_CREATED = 44,
-    SOLE_DEPRECIATION_METHOD_UPDATED = 45,
-    SOLE_DETAILS_CREATED = 46,
-    SOLE_DETAILS_UPDATED = 47,
-    SOLE_INVOICE_PUBLISHED = 48,
-    TAX_REVIEW_UPDATED = 49,
-    TRANSACTION_ALLOCATION_CREATED = 50,
-    TRANSACTION_ALLOCATION_DELETED = 51,
-    TRANSACTION_CREATED = 52,
-    TRANSACTION_DELETED = 53,
-    TRANSACTION_UPDATED = 54,
-    TRANSACTION_UPDATED_WITH_RECEIPT = 55,
-    TRANSACTION_UPDATED_WITH_DELETED_RECEIPT = 56,
-    TRANSACTION_RECEIPT_CREATED = 57,
-    TRANSACTION_RECEIPT_DELETED = 58,
-    TRANSACTIONS_CREATED = 59,
-    USER_UPDATED = 60,
-    VEHICLE_CLAIM_UPDATED = 61,
-    VEHICLE_CLAIM_CREATED = 62,
-    VEHICLE_CLAIM_DETAILS_UPDATED = 63,
-    VEHICLE_CLAIM_DETAILS_CREATED = 64,
-    VEHICLE_LOGBOOK_CREATED = 65,
-    VEHICLE_LOGBOOK_UPDATED = 66,
-    VEHICLE_LOGBOOK_DELETED = 67,
-    VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED = 68
+    BASIQ_ACCOUNTS_RETRIEVED = 10,
+    CLIENT_INVITE_ACCEPTED = 11,
+    CLIENT_OPEN_CHAT = 12,
+    CLIENT_TRANSFER_TO_OTHER_EMPLOYEE = 13,
+    CURRENT_USER_GET_FAILED = 14,
+    DEPRECIATION_DELETED = 15,
+    DEPRECIATIONS_CREATED = 16,
+    DEPRECIATION_UPDATED_WITH_RECEIPT = 17,
+    DEPRECIATION_UPDATED_WITH_DELETED_RECEIPT = 18,
+    DEPRECIATION_RECEIPT_CREATED = 19,
+    DEPRECIATION_RECEIPT_DELETED = 20,
+    INCOME_SOURCES_CREATED = 21,
+    INCOME_SOURCES_UPDATED = 22,
+    INCOME_SOURCES_FORECASTS_CREATED = 23,
+    INCOME_SOURCES_FORECASTS_UPDATED = 24,
+    LOAN_UPDATED = 25,
+    LOAN_PAYOUT_UPDATED = 26,
+    MESSAGE_CREATED = 27,
+    MESSAGE_FILE_CREATED = 28,
+    MESSAGE_FILE_DELETED = 29,
+    NOTIFICATION_ADDED = 30,
+    PROPERTY_DEPRECIATION_CALCULATION_UPDATED = 31,
+    PROPERTY_UPDATED = 32,
+    PROPERTY_UPDATED_WITH_DOCUMENT = 33,
+    PROPERTY_DOCUMENT_ADDED = 34,
+    PROPERTY_MOVEMENT_CREATED = 35,
+    PROPERTY_MOVEMENT_UPDATED = 36,
+    PROPERTY_MOVEMENT_DELETED = 37,
+    PROPERTY_SHARE_UPDATED = 38,
+    PROPERTY_SALE_ADDED = 39,
+    PROPERTY_SALE_DELETED = 40,
+    PROPERTY_SUBSCRIPTION_ADDED = 41,
+    PROPERTY_SUBSCRIPTION_DELETED = 42,
+    PROPERTY_VALUATION_DOCUMENT_CREATED = 43,
+    SERVICE_SUBSCRIPTION_UPDATED = 44,
+    SOLE_BUSINESS_CREATED = 45,
+    SOLE_DEPRECIATION_METHOD_UPDATED = 46,
+    SOLE_DETAILS_CREATED = 47,
+    SOLE_DETAILS_UPDATED = 48,
+    SOLE_INVOICE_PUBLISHED = 49,
+    TAX_REVIEW_UPDATED = 50,
+    TRANSACTION_ALLOCATION_CREATED = 51,
+    TRANSACTION_ALLOCATION_DELETED = 52,
+    TRANSACTION_CREATED = 53,
+    TRANSACTION_DELETED = 54,
+    TRANSACTION_UPDATED = 55,
+    TRANSACTION_UPDATED_WITH_RECEIPT = 56,
+    TRANSACTION_UPDATED_WITH_DELETED_RECEIPT = 57,
+    TRANSACTION_RECEIPT_CREATED = 58,
+    TRANSACTION_RECEIPT_DELETED = 59,
+    TRANSACTIONS_CREATED = 60,
+    USER_UPDATED = 61,
+    VEHICLE_CLAIM_UPDATED = 62,
+    VEHICLE_CLAIM_CREATED = 63,
+    VEHICLE_CLAIM_DETAILS_UPDATED = 64,
+    VEHICLE_CLAIM_DETAILS_CREATED = 65,
+    VEHICLE_LOGBOOK_CREATED = 66,
+    VEHICLE_LOGBOOK_UPDATED = 67,
+    VEHICLE_LOGBOOK_DELETED = 68,
+    VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED = 69
 }

package/lib/models/sole/sole-invoice-item.d.ts

@@ -1,7 +1,7 @@
 import { SoleInvoiceItem as SoleInvoiceItemBase } from '../../db/Models/sole/sole-invoice-item';
 import { SoleInvoice } from './sole-invoice';
-import { ChartAccounts } from '../chart-accounts/chart-accounts';
-import { Transaction } from '../transaction/transaction';
+import { ChartAccounts } from '../chart-accounts';
+import { Transaction } from '../transaction';
 export declare class SoleInvoiceItem extends SoleInvoiceItemBase {
     invoice: SoleInvoice;
     chartAccounts: ChartAccounts;

package/lib/services/account-setup/account-setup.service.d.ts

@@ -56,6 +56,10 @@ export declare class AccountSetupService {
      * Show logbook item when user has at least 1 vehicle transaction
      */
     private getLogbookItem;
+    /**
+     * Show bank feeds item when user has only holding tank
+     */
+    private getBankFeedsItem;
     static ɵfac: i0.ɵɵFactoryDeclaration<AccountSetupService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<AccountSetupService>;
 }

package/lib/services/http/bank/bank-connection/bank-connection.service.d.ts

@@ -33,10 +33,6 @@ export declare class BankConnectionService extends RestService<BankConnectionBas
      * Update cache when basiq accounts were retrieved or login to basic was failed to get actual connections statuses
      */
     listenNotifications(): void;
-    /**
-     * Create/reconnect bank connection when user successfully logged in to basiq
-     */
-    listenBasiqLogin(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<BankConnectionService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<BankConnectionService>;
 }

package/lib/services/http/bank/basiq/basiq.service.d.ts

@@ -5,7 +5,8 @@ import { HttpClient } from '@angular/common/http';
 import { EventDispatcherService } from '../../../event';
 import { BankConnectionService } from '../bank-connection';
 import { BankAccountCollection } from '../../../../collections';
-import { BankAccount, BankLoginData } from '../../../../models';
+import { BankAccount, BasiqJobResponse } from '../../../../models';
+import { Observable } from 'rxjs';
 import * as i0 from "@angular/core";
 /**
  * basiq is a middleman between bank and user
@@ -17,10 +18,24 @@ export declare class BasiqService extends RestService<BankAccountBase, BankAccou
     protected environment: any;
     private bankConnectionService;
     static basiqApiUrl: string;
+    static basiqConsentUrl: string;
     /**
      * Basiq does not provide a hook, so we have to check job status manually every x seconds
      */
-    static bankCredintialsCheckInterval: number;
+    static retrieveAccountsCheckInterval: number;
+    /**
+     * How long we will wait accounts retrieving, break after timeout if not retireved
+     */
+    static retrieveAccountsTimeout: number;
+    /**
+     * Flag shows retrieve accounts time is out
+     */
+    isRetrieveAccountsTimeOut: boolean;
+    /**
+     * Timeout for retrieve accounts status checking.
+     * Stop watch retrieve accounts status when time is out.
+     */
+    retrieveAccountsTimer: any;
     protected endpointUri: string;
     collectionClass: typeof BankAccountCollection;
     modelClass: typeof BankAccount;
@@ -31,30 +46,30 @@ export declare class BasiqService extends RestService<BankAccountBase, BankAccou
      */
     listenEvents(): void;
     /**
-     * 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)
+     * Open basiq consent ui to allow user to log in to bank
+     * @param token User's basiq token
+     * @param bankId External id of selected bank
+     * @param action 'connect' - for the 1st connection, 'update' - for reconnect, null - for new not 1st connection
      */
-    login(loginData: BankLoginData, userId: string): void;
+    redirectToBasiqConsent(token: string, bankId: string, action?: null | 'connect' | 'update'): void;
     /**
-    * 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
-    */
-    private checkLoginStatus;
+     * Get Basiq job result
+     */
+    retrieveJob(jobId: string): Observable<BasiqJobResponse>;
     /**
-     * listen to notifications to update basiq accounts list
+     * Recoursive method, watch basiq job retrieve accounts status
+     * @param jobId id of basiq job to check
+     * @returns observable boolean. True - accounts retrieved, false - accounts not retrieved (time is out)
      */
-    private listenNotifications;
+    watchBankAccountsRetrieved(jobId: string): Observable<boolean>;
+    /**
+     * Ask backend to update user's basiq consent flag
+     */
+    updateBasiqConsentAgreement(): void;
     /**
-     * Start check job credential status when it created
+     * listen to notifications to update basiq accounts list
      */
-    private listenJobCreated;
+    private listenNotifications;
     static ɵfac: i0.ɵɵFactoryDeclaration<BasiqService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<BasiqService>;
 }

package/lib/services/http/rest/rest.service.d.ts

@@ -36,6 +36,10 @@ export declare abstract class RestService<BaseModel, Model extends AbstractModel
      * @TODO Alex: add and handle enabled methods too
      */
     disabledMethods: RestMethod[];
+    /**
+     * Flag show data is fetching from backend
+     */
+    isPending: boolean;
     constructor(http: HttpClient, eventDispatcherService: EventDispatcherService, environment: any);
     protected get apiUrl(): string;
     get(): Observable<CollectionModel>;

package/lib/services/http/user/user.service.d.ts

@@ -79,6 +79,10 @@ export declare class UserService implements IEventListener {
      * Update cache when user's service subscription is updated
      */
     private listenServiceSubscriptionUpdated;
+    /**
+     * Update cache when user's basiq consent flag is updated
+     */
+    private listenBasiqConsentUpdated;
     /**
      * @TODO remove when the class refactored on RestService
      * Subscribe to http events and run callback.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taxtank-core",
-  "version": "0.30.67",
+  "version": "0.30.69",
   "private": false,
   "peerDependencies": {
     "@angular/compiler": "^15.1.5",