eduvia/workavia-mail-front
11
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

If no refreshToken return, maybe the old refreshToken still available

Browse Source 
(cherry picked from commit ad0806651d671b350a1dda952e399c9557c2c4d7)
This commit is contained in:
Dat PHAM HOANG
2023-07-26 11:10:30 +07:00
committed by Dat Vu
parent d48c5313bf
commit c16613eb69
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/login/data/extensions/token_response_extension.dart
+2 -2
View File
@@ -4,11 +4,11 @@ import 'package:model/model.dart';
extension TokenResponseExtension on TokenResponse { extension TokenResponseExtension on TokenResponse {
TokenOIDC toTokenOIDC() { TokenOIDC toTokenOIDC({String? maybeAvailableRefreshToken}) {
return TokenOIDC( return TokenOIDC(
accessToken ?? '', accessToken ?? '',
TokenId(idToken ?? ''), TokenId(idToken ?? ''),
refreshToken ?? '', refreshToken ?? maybeAvailableRefreshToken ?? '',
expiredTime: accessTokenExpirationDateTime ?? DateTime.now()); expiredTime: accessTokenExpirationDateTime ?? DateTime.now());
} }
} }
lib/features/login/data/network/authentication_client/authentication_client_mobile.dart
+2 -2
View File
@@ -7,10 +7,10 @@ import 'package:model/oidc/response/oidc_discovery_response.dart';
import 'package:model/oidc/token_id.dart'; import 'package:model/oidc/token_id.dart';
import 'package:model/oidc/token_oidc.dart'; import 'package:model/oidc/token_oidc.dart';
import 'package:tmail_ui_user/features/login/data/extensions/authentication_token_extension.dart'; import 'package:tmail_ui_user/features/login/data/extensions/authentication_token_extension.dart';
import 'package:tmail_ui_user/features/login/domain/extensions/oidc_configuration_extensions.dart';
import 'package:tmail_ui_user/features/login/data/extensions/token_response_extension.dart'; import 'package:tmail_ui_user/features/login/data/extensions/token_response_extension.dart';
import 'package:tmail_ui_user/features/login/data/network/authentication_client/authentication_client_base.dart'; import 'package:tmail_ui_user/features/login/data/network/authentication_client/authentication_client_base.dart';
import 'package:tmail_ui_user/features/login/domain/exceptions/authentication_exception.dart'; import 'package:tmail_ui_user/features/login/domain/exceptions/authentication_exception.dart';
import 'package:tmail_ui_user/features/login/domain/extensions/oidc_configuration_extensions.dart';
class AuthenticationClientMobile implements AuthenticationClientBase { class AuthenticationClientMobile implements AuthenticationClientBase {
@@ -75,7 +75,7 @@ class AuthenticationClientMobile implements AuthenticationClientBase {
log('AuthenticationClientMobile::refreshingTokensOIDC(): refreshToken: ${tokenResponse?.accessToken}'); log('AuthenticationClientMobile::refreshingTokensOIDC(): refreshToken: ${tokenResponse?.accessToken}');
if (tokenResponse != null) { if (tokenResponse != null) {
final tokenOIDC = tokenResponse.toTokenOIDC(); final tokenOIDC = tokenResponse.toTokenOIDC(maybeAvailableRefreshToken: refreshToken);
if (tokenOIDC.isTokenValid()) { if (tokenOIDC.isTokenValid()) {
return tokenOIDC; return tokenOIDC;
} else { } else {
lib/features/login/data/network/authentication_client/authentication_client_web.dart
+7 -7
View File
@@ -1,19 +1,19 @@
import 'package:core/utils/app_logger.dart'; import 'package:core/utils/app_logger.dart';
import 'package:flutter_appauth_platform_interface/flutter_appauth_platform_interface.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:model/oidc/oidc_configuration.dart';
import 'package:model/oidc/response/oidc_discovery_response.dart'; import 'package:model/oidc/response/oidc_discovery_response.dart';
import 'package:model/oidc/token_id.dart';
import 'package:model/oidc/token_oidc.dart';
import 'package:tmail_ui_user/features/login/data/extensions/authentication_token_extension.dart'; import 'package:tmail_ui_user/features/login/data/extensions/authentication_token_extension.dart';
import 'package:tmail_ui_user/features/login/domain/extensions/oidc_configuration_extensions.dart';
import 'package:tmail_ui_user/features/login/data/extensions/token_response_extension.dart'; import 'package:tmail_ui_user/features/login/data/extensions/token_response_extension.dart';
import 'package:tmail_ui_user/features/login/data/network/authentication_client/authentication_client_base.dart';
import 'package:tmail_ui_user/features/login/data/network/config/oidc_constant.dart'; import 'package:tmail_ui_user/features/login/data/network/config/oidc_constant.dart';
import 'package:tmail_ui_user/features/login/data/utils/library_platform/app_auth_plugin/app_auth_plugin.dart'; import 'package:tmail_ui_user/features/login/data/utils/library_platform/app_auth_plugin/app_auth_plugin.dart';
import 'package:tmail_ui_user/features/login/domain/exceptions/authentication_exception.dart'; import 'package:tmail_ui_user/features/login/domain/exceptions/authentication_exception.dart';
import 'package:tmail_ui_user/features/login/domain/extensions/oidc_configuration_extensions.dart';
import 'package:universal_html/html.dart' as html; import 'package:universal_html/html.dart' as html;
import 'package:tmail_ui_user/features/login/data/network/authentication_client/authentication_client_base.dart';
import 'package:flutter_appauth_platform_interface/flutter_appauth_platform_interface.dart';
import 'package:model/oidc/oidc_configuration.dart';
import 'package:model/oidc/token_id.dart';
import 'package:model/oidc/token_oidc.dart';
class AuthenticationClientWeb implements AuthenticationClientBase { class AuthenticationClientWeb implements AuthenticationClientBase {
@@ -74,7 +74,7 @@ class AuthenticationClientWeb implements AuthenticationClientBase {
scopes: scopes)); scopes: scopes));
if (tokenResponse != null) { if (tokenResponse != null) {
final tokenOIDC = tokenResponse.toTokenOIDC(); final tokenOIDC = tokenResponse.toTokenOIDC(maybeAvailableRefreshToken: refreshToken);
if (tokenOIDC.isTokenValid()) { if (tokenOIDC.isTokenValid()) {
return tokenOIDC; return tokenOIDC;
} else { } else {