From 5ece0f7ed1dbe40ec3850696434e84d99c91f0af Mon Sep 17 00:00:00 2001
From: Yoan VALLET <ext.sopra.yvallet@grandlyon.com>
Date: Fri, 13 Nov 2020 09:42:25 +0100
Subject: [PATCH] feat: review account service test

---
 src/models/account.model.ts          | 8 ++++----
 src/services/account.service.spec.ts | 9 ++-------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/models/account.model.ts b/src/models/account.model.ts
index e58d7871f..e6f87335c 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 5c9dc6b0e..350fc96c7 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])
-- 
GitLab