EC-134 Fix api token refresh (#749)

* Fix apikey token refresh

* Refactor: use class for TokenRequestTwoFactor

node/src/cli/commands/login.command.ts

@@ -24,7 +24,7 @@ import {
   PasswordLogInCredentials,
   SsoLogInCredentials,
 } from "jslib-common/models/domain/logInCredentials";
-import { TokenRequestTwoFactor } from "jslib-common/models/request/identityToken/tokenRequest";
+import { TokenRequestTwoFactor } from "jslib-common/models/request/identityToken/tokenRequestTwoFactor";
 import { TwoFactorEmailRequest } from "jslib-common/models/request/twoFactorEmailRequest";
 import { UpdateTempPasswordRequest } from "jslib-common/models/request/updateTempPasswordRequest";
 import { ErrorResponse } from "jslib-common/models/response/errorResponse";
@@ -150,11 +150,7 @@ export class LoginCommand {
     const twoFactor =
       twoFactorToken == null
         ? null
-        : {
-            provider: twoFactorMethod,
-            token: twoFactorToken,
-            remember: false,
-          };
+        : new TokenRequestTwoFactor(twoFactorMethod, twoFactorToken, false);
 
     try {
       if (this.validatedParams != null) {
@@ -258,21 +254,13 @@ export class LoginCommand {
         }
 
         response = await this.authService.logInTwoFactor(
-          {
-            provider: selectedProvider.type,
-            token: twoFactorToken,
-            remember: false,
-          },
+          new TokenRequestTwoFactor(selectedProvider.type, twoFactorToken),
           null
         );
       }
 
       if (response.captchaSiteKey) {
-        const twoFactorRequest: TokenRequestTwoFactor = {
-          provider: selectedProvider.type,
-          token: twoFactorToken,
-          remember: false,
-        };
+        const twoFactorRequest = new TokenRequestTwoFactor(selectedProvider.type, twoFactorToken);
         const handledResponse = await this.handleCaptchaRequired(twoFactorRequest);
 
         // Error Response

node/src/services/nodeApi.service.ts

@@ -2,6 +2,7 @@ import * as FormData from "form-data";
 import { HttpsProxyAgent } from "https-proxy-agent";
 import * as fe from "node-fetch";
 
+import { AppIdService } from "jslib-common/abstractions/appId.service";
 import { EnvironmentService } from "jslib-common/abstractions/environment.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { TokenService } from "jslib-common/abstractions/token.service";
@@ -18,12 +19,18 @@ export class NodeApiService extends ApiService {
     tokenService: TokenService,
     platformUtilsService: PlatformUtilsService,
     environmentService: EnvironmentService,
+    appIdService: AppIdService,
     logoutCallback: (expired: boolean) => Promise<void>,
-    customUserAgent: string = null,
-    apiKeyRefresh: (clientId: string, clientSecret: string) => Promise<any>
+    customUserAgent: string = null
   ) {
-    super(tokenService, platformUtilsService, environmentService, logoutCallback, customUserAgent);
-    this.apiKeyRefresh = apiKeyRefresh;
+    super(
+      tokenService,
+      platformUtilsService,
+      environmentService,
+      appIdService,
+      logoutCallback,
+      customUserAgent
+    );
   }
 
   nativeFetch(request: Request): Promise<Response> {