diff --git a/src/models/account.model.ts b/src/models/account.model.ts index e58d7871f322b702cbfea4163f66c24f95b8c810..e6f87335cd458822a6aac2606f2797b2cfc3240c 100644 --- a/src/models/account.model.ts +++ b/src/models/account.model.ts @@ -1,6 +1,6 @@ export interface Account extends AccountAttributes { _id: string - id: string + id?: string _rev?: string _type?: string cozyMetadata?: Record<string, any> @@ -8,8 +8,9 @@ export interface Account extends AccountAttributes { export interface AccountAttributes { account_type: string - auth: AccountAuthData | AccountOAuthData - identifier: string + auth?: AccountAuthData + oauth?: AccountOAuthData + identifier?: string state?: string | null } @@ -22,5 +23,4 @@ export interface AccountAuthData { export interface AccountOAuthData { access_token: string refresh_token: string - scope: string | null } diff --git a/src/services/account.service.spec.ts b/src/services/account.service.spec.ts index 5c9dc6b0e58edb7fe376eae38923abd740d3e227..350fc96c706abd3127636fd54b2c83eb62bcfeae 100644 --- a/src/services/account.service.spec.ts +++ b/src/services/account.service.spec.ts @@ -2,6 +2,7 @@ import { Client, QueryResult } from 'cozy-client' import { AccountAuthData, Konnector, Account } from 'models' import AccountService from './account.service' import accountData from './__mocks__/accountsData.json' +import konnectorData from './__mocks__/konnectorsData.json' const mockClient = ({ query: jest.fn(), @@ -24,18 +25,12 @@ describe('Account service', () => { describe('createAccount method', () => { it('should return created account for login type', async () => { mockHavestLibAccounts.createAccount.mockResolvedValueOnce(mockAccounts[2]) - const mockKonnector: Konnector = { - _id: 'io.cozy.konnectors/eglgrandlyon', - name: 'EGL', - slug: 'eglgrandlyon', - state: 'ready', - } const mockAuthData: AccountAuthData = { login: 'login', password: 'password', } const result = await accountService.createAccount( - mockKonnector, + konnectorData[2], mockAuthData ) expect(result).toEqual(mockAccounts[2])