Merge pull request #118 from chornerman/release/0.3.0

Release - 0.3.0

Author: chornerman

assets/color/colors.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="chinese_black">#15151A</color>
+    <color name="eerie_black_90">#E61E1E1E</color>
+    <color name="raisin_black">#252525</color>
 </resources>

assets/images/2.0x/bg_login.png renamed to assets/images/2.0x/bg_onboarding.png

@@ -2,15 +2,30 @@ import 'package:injectable/injectable.dart';
 import 'package:survey/api/exception/network_exceptions.dart';
 import 'package:survey/api/grant_type.dart';
 import 'package:survey/api/request/login_request.dart';
+import 'package:survey/api/request/logout_request.dart';
+import 'package:survey/api/request/refresh_token_request.dart';
+import 'package:survey/api/request/reset_password_request.dart';
 import 'package:survey/api/service/auth_service.dart';
 import 'package:survey/env_variables.dart';
-import 'package:survey/model/login_model.dart';
+import 'package:survey/model/token_model.dart';
 
 abstract class AuthRepository {
-  Future<LoginModel> login({
+  Future<TokenModel> login({
     required String email,
     required String password,
   });
+
+  Future<void> logout({
+    required String token,
+  });
+
+  Future<TokenModel> refreshToken({
+    required String refreshToken,
+  });
+
+  Future<void> resetPassword({
+    required String email,
+  });
 }
 
 @Singleton(as: AuthRepository)
@@ -20,7 +35,7 @@ class AuthRepositoryImpl extends AuthRepository {
   AuthRepositoryImpl(this._authService);
 
   @override
-  Future<LoginModel> login({
+  Future<TokenModel> login({
     required String email,
     required String password,
   }) async {
@@ -34,7 +49,54 @@ class AuthRepositoryImpl extends AuthRepository {
           clientSecret: EnvVariables.clientSecret,
         ),
       );
-      return LoginModel.fromResponse(response);
+      return TokenModel.fromResponse(response);
+    } catch (exception) {
+      throw NetworkExceptions.fromDioException(exception);
+    }
+  }
+
+  @override
+  Future<void> logout({required String token}) async {
+    try {
+      await _authService.logout(
+        LogoutRequest(
+          token: token,
+          clientId: EnvVariables.clientId,
+          clientSecret: EnvVariables.clientSecret,
+        ),
+      );
+    } catch (exception) {
+      throw NetworkExceptions.fromDioException(exception);
+    }
+  }
+
+  @override
+  Future<TokenModel> refreshToken({required String refreshToken}) async {
+    try {
+      final response = await _authService.refreshToken(
+        RefreshTokenRequest(
+          grantType: GrantType.refreshToken.value,
+          clientId: EnvVariables.clientId,
+          clientSecret: EnvVariables.clientSecret,
+          refreshToken: refreshToken,
+        ),
+      );
+      return TokenModel.fromResponse(response);
+    } catch (exception) {
+      throw NetworkExceptions.fromDioException(exception);
+    }
+  }
+
+  @override
+  Future<void> resetPassword({required String email}) async {
+    try {
+      await _authService.resetPassword(
+        ResetPasswordRequest(
+          user: ResetPasswordUserRequest(email: email),
+          clientId: EnvVariables.clientId,
+          clientSecret: EnvVariables.clientSecret,
+        ),
+      );
     } catch (exception) {
       throw NetworkExceptions.fromDioException(exception);
     }

assets/images/bg_login.png renamed to assets/images/bg_onboarding.png

@@ -0,0 +1,21 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'logout_request.g.dart';
+
+@JsonSerializable()
+class LogoutRequest {
+  final String token;
+  final String clientId;
+  final String clientSecret;
+
+  LogoutRequest({
+    required this.token,
+    required this.clientId,
+    required this.clientSecret,
+  });
+
+  factory LogoutRequest.fromJson(Map<String, dynamic> json) =>
+      _$LogoutRequestFromJson(json);
+
+  Map<String, dynamic> toJson() => _$LogoutRequestToJson(this);
+}

assets/images/ic_arrow_back.svg

@@ -0,0 +1,23 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'refresh_token_request.g.dart';
+
+@JsonSerializable()
+class RefreshTokenRequest {
+  final String grantType;
+  final String clientId;
+  final String clientSecret;
+  final String refreshToken;
+
+  RefreshTokenRequest({
+    required this.grantType,
+    required this.clientId,
+    required this.clientSecret,
+    required this.refreshToken,
+  });
+
+  factory RefreshTokenRequest.fromJson(Map<String, dynamic> json) =>
+      _$RefreshTokenRequestFromJson(json);
+
+  Map<String, dynamic> toJson() => _$RefreshTokenRequestToJson(this);
+}

assets/images/ic_arrow_right.svg renamed to assets/images/ic_arrow_next.svg

@@ -0,0 +1,35 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'reset_password_request.g.dart';
+
+@JsonSerializable()
+class ResetPasswordRequest {
+  final ResetPasswordUserRequest user;
+  final String clientId;
+  final String clientSecret;
+
+  ResetPasswordRequest({
+    required this.user,
+    required this.clientId,
+    required this.clientSecret,
+  });
+
+  factory ResetPasswordRequest.fromJson(Map<String, dynamic> json) =>
+      _$ResetPasswordRequestFromJson(json);
+
+  Map<String, dynamic> toJson() => _$ResetPasswordRequestToJson(this);
+}
+
+@JsonSerializable()
+class ResetPasswordUserRequest {
+  final String email;
+
+  ResetPasswordUserRequest({
+    required this.email,
+  });
+
+  factory ResetPasswordUserRequest.fromJson(Map<String, dynamic> json) =>
+      _$ResetPasswordUserRequestFromJson(json);
+
+  Map<String, dynamic> toJson() => _$ResetPasswordUserRequestToJson(this);
+}

assets/images/ic_notification.svg

@@ -1,24 +1,24 @@
 import 'package:json_annotation/json_annotation.dart';
 import 'package:survey/api/response/converter/response_converter.dart';
 
-part 'login_response.g.dart';
+part 'token_response.g.dart';
 
 @JsonSerializable()
-class LoginResponse {
+class TokenResponse {
   final String accessToken;
   final String tokenType;
   final int expiresIn;
   final String refreshToken;
   final int createdAt;
 
-  LoginResponse({
+  TokenResponse({
     required this.accessToken,
     required this.tokenType,
     required this.expiresIn,
     required this.refreshToken,
     required this.createdAt,
   });
 
-  factory LoginResponse.fromJson(Map<String, dynamic> json) =>
-      _$LoginResponseFromJson(fromDataJsonApi(json));
+  factory TokenResponse.fromJson(Map<String, dynamic> json) =>
+      _$TokenResponseFromJson(fromDataJsonApi(json));
 }

lib/api/repository/auth_repository.dart

@@ -1,7 +1,10 @@
 import 'package:dio/dio.dart';
 import 'package:retrofit/retrofit.dart';
 import 'package:survey/api/request/login_request.dart';
-import 'package:survey/api/response/login_response.dart';
+import 'package:survey/api/request/logout_request.dart';
+import 'package:survey/api/request/refresh_token_request.dart';
+import 'package:survey/api/request/reset_password_request.dart';
+import 'package:survey/api/response/token_response.dart';
 
 part 'auth_service.g.dart';
 
@@ -10,7 +13,22 @@ abstract class AuthService {
   factory AuthService(Dio dio, {String baseUrl}) = _AuthService;
 
   @POST('/api/v1/oauth/token')
-  Future<LoginResponse> login(
+  Future<TokenResponse> login(
     @Body() LoginRequest body,
   );
+
+  @POST('/api/v1/oauth/revoke')
+  Future<void> logout(
+    @Body() LogoutRequest body,
+  );
+
+  @POST('/api/v1/oauth/token')
+  Future<TokenResponse> refreshToken(
+    @Body() RefreshTokenRequest body,
+  );
+
+  @POST('/api/v1/passwords')
+  Future<void> resetPassword(
+    @Body() ResetPasswordRequest body,
+  );
 }

lib/api/request/logout_request.dart

@@ -14,11 +14,15 @@ abstract class SharedPreferencesUtils {
 
   String get authToken;
 
+  bool get isLoggedIn;
+
   void saveAccessToken(String accessToken);
 
   void saveTokenType(String tokenType);
 
   void saveRefreshToken(String refreshToken);
+
+  void clear();
 }
 
 @Singleton(as: SharedPreferencesUtils)
@@ -40,6 +44,11 @@ class SharedPreferencesUtilsImpl extends SharedPreferencesUtils {
   @override
   String get authToken => '$tokenType $accessToken';
 
+  @override
+  bool get isLoggedIn =>
+      _sharedPreferences.containsKey(_accessTokenKey) &&
+      _sharedPreferences.containsKey(_tokenTypeKey);
+
   @override
   void saveAccessToken(String accessToken) async {
     await _sharedPreferences.setString(_accessTokenKey, accessToken);
@@ -54,4 +63,9 @@ class SharedPreferencesUtilsImpl extends SharedPreferencesUtils {
   void saveRefreshToken(String refreshToken) async {
     await _sharedPreferences.setString(_refreshTokenKey, refreshToken);
   }
+
+  @override
+  void clear() async {
+    await _sharedPreferences.clear();
+  }
 }

lib/api/request/refresh_token_request.dart

@@ -1,15 +1,23 @@
+import 'dart:io';
+
 import 'package:dio/dio.dart';
 import 'package:survey/database/shared_preferences_utils.dart';
+import 'package:survey/di/di.dart';
+import 'package:survey/model/token_model.dart';
+import 'package:survey/usecase/base/base_use_case.dart';
+import 'package:survey/usecase/refresh_token_use_case.dart';
 
 const String _authorizationHeader = 'Authorization';
 
-class AppInterceptor extends Interceptor {
+class AppInterceptor extends QueuedInterceptor {
   final bool requireAuthentication;
   final SharedPreferencesUtils sharedPreferencesUtils;
+  final Dio dio;
 
   AppInterceptor({
     required this.requireAuthentication,
     required this.sharedPreferencesUtils,
+    required this.dio,
   });
 
   @override
@@ -21,4 +29,52 @@ class AppInterceptor extends Interceptor {
     }
     return super.onRequest(options, handler);
   }
+
+  @override
+  void onError(DioError error, ErrorInterceptorHandler handler) {
+    final statusCode = error.response?.statusCode;
+    if ((statusCode == HttpStatus.forbidden ||
+            statusCode == HttpStatus.unauthorized) &&
+        requireAuthentication) {
+      _refreshToken(error, handler);
+    } else {
+      handler.next(error);
+    }
+  }
+
+  void _refreshToken(
+    DioError error,
+    ErrorInterceptorHandler handler,
+  ) async {
+    try {
+      final refreshTokenUseCase = getIt<RefreshTokenUseCase>();
+      final result = await refreshTokenUseCase.call();
+      if (result is Success<TokenModel>) {
+        // Update new token header
+        final newAuthToken = sharedPreferencesUtils.authToken;
+        error.requestOptions.headers[_authorizationHeader] = newAuthToken;
+
+        // Create request with new access token
+        final options = Options(
+          method: error.requestOptions.method,
+          headers: error.requestOptions.headers,
+        );
+        final newRequest = await dio.request(
+          "${error.requestOptions.baseUrl}${error.requestOptions.path}",
+          options: options,
+          data: error.requestOptions.data,
+          queryParameters: error.requestOptions.queryParameters,
+        );
+        handler.resolve(newRequest);
+      } else {
+        handler.next(error);
+      }
+    } catch (exception) {
+      if (exception is DioError) {
+        handler.next(exception);
+      } else {
+        handler.next(error);
+      }
+    }
+  }
 }

lib/api/request/reset_password_request.dart

@@ -32,6 +32,7 @@ class DioProvider {
     final appInterceptor = AppInterceptor(
       requireAuthentication: requireAuthentication,
       sharedPreferencesUtils: _sharedPreferencesUtils,
+      dio: dio,
     );
     final interceptors = <Interceptor>[];
     interceptors.add(appInterceptor);