[#31] fix can not get token

Author: nkhanh44

lib/api/data_sources/token_data_source.dart

@@ -45,8 +45,8 @@ class TokenDataSourceImpl extends TokenDataSource {
       return apiToken;
     }
 
-    return await _secureStorage.getValue(key: SecureStorageKey.apiToken)
-        as ApiToken;
+    return await _secureStorage.getValue<ApiToken>(
+        key: SecureStorageKey.apiToken);
   }
 
   @override

lib/api/interceptor/auth_interceptor.dart

@@ -20,9 +20,7 @@ class AuthInterceptor extends Interceptor {
     RequestOptions options,
     RequestInterceptorHandler handler,
   ) async {
-    print("@@@ get 1");
     final token = await _tokenDataSource.getToken();
-    print("@@@ get here $token");
     options.headers.putIfAbsent(
         _headerAuthorization, () => "${token.tokenType} ${token.accessToken}");
     super.onRequest(options, handler);

lib/di/interceptor/app_interceptor.dart

@@ -1,17 +1,15 @@
 import 'dart:io';
 
 import 'package:dio/dio.dart';
-import 'package:survey_flutter/model/api_token.dart';
-import 'package:survey_flutter/storage/secure_storage.dart';
-
-const String _headerAuthorization = 'Authorization';
 
 class AppInterceptor extends Interceptor {
   final bool _requireAuthenticate;
   final Dio _dio;
-  final SecureStorage? _secureStorage;
 
-  AppInterceptor(this._requireAuthenticate, this._dio, this._secureStorage);
+  AppInterceptor(
+    this._requireAuthenticate,
+    this._dio,
+  );
 
   @override
   Future onRequest(

lib/di/provider/dio_provider.dart

@@ -27,6 +27,7 @@ class DioProvider {
 
   Dio _createDio({bool requireAuthentication = false}) {
     final dio = Dio();
+
     final interceptors = <Interceptor>[];
     if (requireAuthentication) {
       final authInterceptor = AuthInterceptor(

lib/repositories/authentication_repository.dart

@@ -47,7 +47,6 @@ class AuthenticationRepositoryImpl extends AuthenticationRepository {
         grantType: _grantType,
       ));
       await _tokenDataSource.setToken(response.toApiToken());
-      print("@@@ settoken ${response.toApiToken()}");
       return response.toLoginModel();
     } catch (exception) {
       throw NetworkExceptions.fromDioException(exception);

lib/screens/home/home_screen.dart

@@ -41,7 +41,6 @@ class _HomeScreenState extends ConsumerState<HomeScreen> {
   @override
   Widget build(BuildContext context) {
     return ref.watch(homeViewModelProvider).when(
-          init: () => _buildHomeScreen(isLoading: true),
           loading: () => _buildHomeScreen(isLoading: true),
           error: () => _buildHomeScreen(),
           loadCachedSurveysSuccess: () => _buildHomeScreen(),

lib/screens/home/home_state.dart

@@ -4,8 +4,6 @@ part 'home_state.freezed.dart';
 
 @freezed
 class HomeState with _$HomeState {
-  const factory HomeState.init() = _Init;
-
   const factory HomeState.loading() = _Loading;
 
   const factory HomeState.loadCachedSurveysSuccess() =

lib/screens/home/home_view_model.dart

@@ -7,6 +7,7 @@ import 'package:survey_flutter/usecases/base/base_use_case.dart';
 import 'package:survey_flutter/usecases/get_cached_surveys_use_case.dart';
 import 'package:survey_flutter/usecases/get_surveys_use_case.dart';
 
+// TODO: Integrate load more
 const _pageNumber = 1;
 const _pageSize = 10;
 
@@ -30,7 +31,7 @@ class HomeViewModel extends StateNotifier<HomeState> {
     required GetCachedSurveysUseCase getCachedSurveysUseCase,
   })  : _getSurveysUseCase = getSurveysUseCase,
         _getCachedSurveysUseCase = getCachedSurveysUseCase,
-        super(const HomeState.init());
+        super(const HomeState.loading());
 
   final _surveys = StreamController<List<SurveyModel>>();
   Stream<List<SurveyModel>> get surveys => _surveys.stream;

lib/storage/secure_storage_impl.dart

@@ -2,6 +2,7 @@ import 'dart:convert';
 
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:survey_flutter/model/api_token.dart';
 import 'package:survey_flutter/storage/secure_storage.dart';
 
 import '../di/provider/flutter_secure_storage.dart';
@@ -21,8 +22,13 @@ class SecureStorageImpl extends SecureStorage {
     if (rawValue == null) {
       throw SecureStorageError.failToGetValue;
     }
+    final jsonValue = await jsonDecode(rawValue);
 
-    return await jsonDecode(rawValue);
+    if (M == ApiToken) {
+      return ApiToken.fromJson(jsonValue) as M;
+    } else {
+      throw ArgumentError('Invalid SecureStorageModel type');
+    }
   }
 
   @override

test/api/repositories/survey_repository_test.dart

@@ -16,8 +16,8 @@ void main() {
     setUp(() {
       mockSurveyApiService = MockSurveyApiService();
       mockSurveyStorage = MockSurveyStorage();
-      surveyRepository = SurveyRepositoryImpl(
-          mockSurveyApiService, mockSurveyStorage);
+      surveyRepository =
+          SurveyRepositoryImpl(mockSurveyApiService, mockSurveyStorage);
     });
 
     test('when getting surveys is successful returns SurveysContainerModel',