diff --git a/common/src/services/api.service.ts b/common/src/services/api.service.ts index 18e742dc..21329b7f 100644 --- a/common/src/services/api.service.ts +++ b/common/src/services/api.service.ts @@ -28,6 +28,7 @@ import { EventRequest } from "../models/request/eventRequest"; import { FolderRequest } from "../models/request/folderRequest"; import { GroupRequest } from "../models/request/groupRequest"; import { IapCheckRequest } from "../models/request/iapCheckRequest"; +import { TokenRequest } from "../models/request/identityToken/tokenRequest"; import { ImportCiphersRequest } from "../models/request/importCiphersRequest"; import { ImportDirectoryRequest } from "../models/request/importDirectoryRequest"; import { ImportOrganizationCiphersRequest } from "../models/request/importOrganizationCiphersRequest"; @@ -76,7 +77,6 @@ import { SendRequest } from "../models/request/sendRequest"; import { SetPasswordRequest } from "../models/request/setPasswordRequest"; import { StorageRequest } from "../models/request/storageRequest"; import { TaxInfoUpdateRequest } from "../models/request/taxInfoUpdateRequest"; -import { TokenRequest } from "../models/request/identityToken/tokenRequest"; import { TwoFactorEmailRequest } from "../models/request/twoFactorEmailRequest"; import { TwoFactorProviderRequest } from "../models/request/twoFactorProviderRequest"; import { TwoFactorRecoveryRequest } from "../models/request/twoFactorRecoveryRequest"; diff --git a/spec/common/services/auth.service.spec.ts b/spec/common/services/auth.service.spec.ts index 476aa691..7c1618df 100644 --- a/spec/common/services/auth.service.spec.ts +++ b/spec/common/services/auth.service.spec.ts @@ -24,8 +24,8 @@ import { IdentityTokenResponse } from "jslib-common/models/response/identityToke import { TwoFactorService } from "jslib-common/abstractions/twoFactor.service"; import { HashPurpose } from "jslib-common/enums/hashPurpose"; import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType"; -import { PasswordTokenRequest } from "jslib-common/models/request/identityToken/passwordTokenRequest"; import { DeviceRequest } from "jslib-common/models/request/deviceRequest"; +import { PasswordTokenRequest } from "jslib-common/models/request/identityToken/passwordTokenRequest"; describe("Cipher Service", () => { let cryptoService: SubstituteOf; @@ -110,7 +110,6 @@ describe("Cipher Service", () => { appIdService.getAppId().resolves(deviceId); tokenService.decodeToken(accessToken).resolves(decodedToken); - console.log('foo'); }); describe("Master Password authentication", () => { @@ -383,9 +382,9 @@ describe("Cipher Service", () => { passwordTokenRequest.email === email && passwordTokenRequest.masterPasswordHash === hashedPassword && passwordTokenRequest.device.identifier === deviceId && - passwordTokenRequest.twoFactor.provider == TwoFactorProviderType.Remember && - passwordTokenRequest.twoFactor.token == twoFactorToken && - passwordTokenRequest.twoFactor.remember == false && + passwordTokenRequest.twoFactor.provider === TwoFactorProviderType.Remember && + passwordTokenRequest.twoFactor.token === twoFactorToken && + passwordTokenRequest.twoFactor.remember === false && passwordTokenRequest.captchaResponse == null ); }) @@ -408,9 +407,9 @@ describe("Cipher Service", () => { passwordTokenRequest.email === email && passwordTokenRequest.masterPasswordHash === hashedPassword && passwordTokenRequest.device.identifier === deviceId && - passwordTokenRequest.twoFactor.provider == twoFactorProviderType && - passwordTokenRequest.twoFactor.token == twoFactorToken && - passwordTokenRequest.twoFactor.remember == twoFactorRemember && + passwordTokenRequest.twoFactor.provider === twoFactorProviderType && + passwordTokenRequest.twoFactor.token === twoFactorToken && + passwordTokenRequest.twoFactor.remember === twoFactorRemember && passwordTokenRequest.captchaResponse == null ); }) @@ -435,9 +434,9 @@ describe("Cipher Service", () => { passwordTokenRequest.email === email && passwordTokenRequest.masterPasswordHash === hashedPassword && passwordTokenRequest.device.identifier === deviceId && - passwordTokenRequest.twoFactor.provider == twoFactorProviderType && - passwordTokenRequest.twoFactor.token == twoFactorToken && - passwordTokenRequest.twoFactor.remember == twoFactorRemember && + passwordTokenRequest.twoFactor.provider === twoFactorProviderType && + passwordTokenRequest.twoFactor.token === twoFactorToken && + passwordTokenRequest.twoFactor.remember === twoFactorRemember && passwordTokenRequest.captchaResponse == null ); })