[#11] Update creating ApiToken from LoginResponse

Author: Thieurom

lib/model/api_token.dart

@@ -1,5 +1,4 @@
 import 'package:json_annotation/json_annotation.dart';
-import 'package:survey_flutter/model/response/login_response.dart';
 import 'package:survey_flutter/storage/secure_storage.dart';
 
 part 'api_token.g.dart';
@@ -24,12 +23,6 @@ class ApiToken extends SecureStorageModel {
 
   Map<String, dynamic> toJson() => _$ApiTokenToJson(this);
 
-  static ApiToken from(LoginResponse loginResponse) => ApiToken(
-        accessToken: loginResponse.accessToken,
-        refreshToken: loginResponse.refreshToken,
-        tokenType: loginResponse.tokenType,
-      );
-
   @override
   bool operator ==(Object other) =>
       other is ApiToken &&

lib/model/response/login_response.dart

@@ -1,5 +1,6 @@
 import 'package:json_annotation/json_annotation.dart';
 import 'package:survey_flutter/api/response_decoder.dart';
+import 'package:survey_flutter/model/api_token.dart';
 import 'package:survey_flutter/model/login_model.dart';
 
 part 'login_response.g.dart';
@@ -32,6 +33,12 @@ class LoginResponse {
         refreshToken: refreshToken,
       );
 
+  ApiToken toApiToken() => ApiToken(
+        accessToken: accessToken,
+        refreshToken: refreshToken,
+        tokenType: tokenType,
+      );
+
   static LoginResponse dummy() {
     return LoginResponse(
       id: "",

lib/repositories/authentication_repository.dart

@@ -3,7 +3,6 @@ import 'package:survey_flutter/api/authentication_api_service.dart';
 import 'package:survey_flutter/api/exception/network_exceptions.dart';
 import 'package:survey_flutter/di/provider/dio_provider.dart';
 import 'package:survey_flutter/env.dart';
-import 'package:survey_flutter/model/api_token.dart';
 import 'package:survey_flutter/model/login_model.dart';
 import 'package:survey_flutter/model/request/login_request.dart';
 import 'package:survey_flutter/storage/secure_storage.dart';
@@ -49,7 +48,7 @@ class AuthenticationRepositoryImpl extends AuthenticationRepository {
         grantType: _grantType,
       ));
       await _secureStorage.save(
-        value: ApiToken.from(response),
+        value: response.toApiToken(),
         key: SecureStorageKey.apiToken,
       );
       return response.toLoginModel();

test/api/repositories/authentication_repository_test.dart

@@ -2,7 +2,6 @@ import 'package:flutter_config/flutter_config.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 import 'package:survey_flutter/api/exception/network_exceptions.dart';
-import 'package:survey_flutter/model/api_token.dart';
 import 'package:survey_flutter/model/response/login_response.dart';
 import 'package:survey_flutter/repositories/authentication_repository.dart';
 import 'package:survey_flutter/storage/secure_storage.dart';
@@ -46,7 +45,7 @@ void main() {
       expect(result, loginResponse.toLoginModel());
       verify(
         mockSecureStorage.save(
-          value: ApiToken.from(loginResponse),
+          value: loginResponse.toApiToken(),
           key: SecureStorageKey.apiToken,
         ),
       ).called(1);