[SLO] Implement for discoverOIDC method
(cherry picked from commit 76ee41a238ad3e626148f3a236f20c6cd370df3a)
This commit is contained in:
@@ -37,6 +37,13 @@ class AuthenticationOIDCDataSourceImpl extends AuthenticationOIDCDataSource {
|
|||||||
}).catchError(_exceptionThrower.throwException);
|
}).catchError(_exceptionThrower.throwException);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<OIDCDiscoveryResponse> discoverOIDC(OIDCConfiguration oidcConfiguration) {
|
||||||
|
return Future.sync(() async {
|
||||||
|
return await _oidcHttpClient.discoverOIDC(oidcConfiguration);
|
||||||
|
}).catchError(_exceptionThrower.throwException);
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<TokenOIDC> getTokenOIDC(String clientId, String redirectUrl, String discoveryUrl, List<String> scopes) {
|
Future<TokenOIDC> getTokenOIDC(String clientId, String redirectUrl, String discoveryUrl, List<String> scopes) {
|
||||||
return Future.sync(() async {
|
return Future.sync(() async {
|
||||||
@@ -91,9 +98,9 @@ class AuthenticationOIDCDataSourceImpl extends AuthenticationOIDCDataSource {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<bool> logout(TokenId tokenId, OIDCConfiguration config) {
|
Future<bool> logout(TokenId tokenId, OIDCConfiguration config, OIDCDiscoveryResponse oidcRescovery) {
|
||||||
return Future.sync(() async {
|
return Future.sync(() async {
|
||||||
return await _authenticationClient.logoutOidc(tokenId, config);
|
return await _authenticationClient.logoutOidc(tokenId, config, oidcRescovery);
|
||||||
}).catchError(_exceptionThrower.throwException);
|
}).catchError(_exceptionThrower.throwException);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+11
-2
@@ -3,6 +3,7 @@ import 'package:core/utils/app_logger.dart';
|
|||||||
import 'package:flutter_appauth/flutter_appauth.dart';
|
import 'package:flutter_appauth/flutter_appauth.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:model/oidc/oidc_configuration.dart';
|
import 'package:model/oidc/oidc_configuration.dart';
|
||||||
|
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';
|
||||||
@@ -43,11 +44,19 @@ class AuthenticationClientMobile implements AuthenticationClientBase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<bool> logoutOidc(TokenId tokenId, OIDCConfiguration config) async {
|
Future<bool> logoutOidc(TokenId tokenId, OIDCConfiguration config, OIDCDiscoveryResponse oidcRescovery) async {
|
||||||
|
final authorizationServiceConfiguration = oidcRescovery.authorizationEndpoint == null || oidcRescovery.tokenEndpoint == null
|
||||||
|
? null
|
||||||
|
: AuthorizationServiceConfiguration(
|
||||||
|
authorizationEndpoint: oidcRescovery.authorizationEndpoint!,
|
||||||
|
tokenEndpoint: oidcRescovery.tokenEndpoint!,
|
||||||
|
endSessionEndpoint: oidcRescovery.endSessionEndpoint);
|
||||||
|
|
||||||
final endSession = await _appAuth.endSession(EndSessionRequest(
|
final endSession = await _appAuth.endSession(EndSessionRequest(
|
||||||
idTokenHint: tokenId.uuid,
|
idTokenHint: tokenId.uuid,
|
||||||
postLogoutRedirectUrl: config.logoutRedirectUrl,
|
postLogoutRedirectUrl: config.logoutRedirectUrl,
|
||||||
discoveryUrl: config.discoveryUrl
|
discoveryUrl: config.discoveryUrl,
|
||||||
|
serviceConfiguration: authorizationServiceConfiguration
|
||||||
));
|
));
|
||||||
log('AuthenticationClientMobile::logoutOidc(): ${endSession?.state}');
|
log('AuthenticationClientMobile::logoutOidc(): ${endSession?.state}');
|
||||||
return endSession?.state?.isNotEmpty == true;
|
return endSession?.state?.isNotEmpty == true;
|
||||||
|
|||||||
+10
-2
@@ -1,6 +1,7 @@
|
|||||||
|
|
||||||
import 'package:core/utils/app_logger.dart';
|
import 'package:core/utils/app_logger.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
|
import 'package:model/oidc/response/oidc_discovery_response.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/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';
|
||||||
@@ -45,11 +46,18 @@ class AuthenticationClientWeb implements AuthenticationClientBase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<bool> logoutOidc(TokenId tokenId, OIDCConfiguration config) async {
|
Future<bool> logoutOidc(TokenId tokenId, OIDCConfiguration config, OIDCDiscoveryResponse oidcRescovery) async {
|
||||||
|
final authorizationServiceConfiguration = oidcRescovery.authorizationEndpoint == null || oidcRescovery.tokenEndpoint == null
|
||||||
|
? null
|
||||||
|
: AuthorizationServiceConfiguration(
|
||||||
|
authorizationEndpoint: oidcRescovery.authorizationEndpoint!,
|
||||||
|
tokenEndpoint: oidcRescovery.tokenEndpoint!,
|
||||||
|
endSessionEndpoint: oidcRescovery.endSessionEndpoint);
|
||||||
final endSession = await _appAuthWeb.endSession(EndSessionRequest(
|
final endSession = await _appAuthWeb.endSession(EndSessionRequest(
|
||||||
idTokenHint: tokenId.uuid,
|
idTokenHint: tokenId.uuid,
|
||||||
postLogoutRedirectUrl: config.logoutRedirectUrl,
|
postLogoutRedirectUrl: config.logoutRedirectUrl,
|
||||||
discoveryUrl: config.discoveryUrl
|
discoveryUrl: config.discoveryUrl,
|
||||||
|
serviceConfiguration: authorizationServiceConfiguration
|
||||||
));
|
));
|
||||||
return endSession != null;
|
return endSession != null;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import 'package:core/utils/app_logger.dart';
|
|||||||
import 'package:model/oidc/oidc_configuration.dart';
|
import 'package:model/oidc/oidc_configuration.dart';
|
||||||
import 'package:model/oidc/request/oidc_request.dart';
|
import 'package:model/oidc/request/oidc_request.dart';
|
||||||
import 'package:model/oidc/response/oidc_response.dart';
|
import 'package:model/oidc/response/oidc_response.dart';
|
||||||
|
import 'package:model/oidc/response/oidc_discovery_response.dart';
|
||||||
import 'package:tmail_ui_user/features/login/data/extensions/service_path_extension.dart';
|
import 'package:tmail_ui_user/features/login/data/extensions/service_path_extension.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/network/endpoint.dart';
|
import 'package:tmail_ui_user/features/login/data/network/endpoint.dart';
|
||||||
@@ -47,4 +48,14 @@ class OIDCHttpClient {
|
|||||||
scopes: OIDCConstant.oidcScope
|
scopes: OIDCConstant.oidcScope
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Future<OIDCDiscoveryResponse> discoverOIDC(OIDCConfiguration configuration) async {
|
||||||
|
final result = await _dioClient.get(configuration.discoveryUrl);
|
||||||
|
log('OIDCHttpClient::discoverOIDC(): RESULT: $result');
|
||||||
|
if (result is Map<String, dynamic>) {
|
||||||
|
return OIDCDiscoveryResponse.fromJson(result);
|
||||||
|
} else {
|
||||||
|
return OIDCDiscoveryResponse.fromJson(jsonDecode(result));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
import 'package:model/oidc/oidc_configuration.dart';
|
import 'package:model/oidc/oidc_configuration.dart';
|
||||||
import 'package:model/oidc/request/oidc_request.dart';
|
import 'package:model/oidc/request/oidc_request.dart';
|
||||||
|
import 'package:model/oidc/response/oidc_discovery_response.dart';
|
||||||
import 'package:model/oidc/response/oidc_response.dart';
|
import 'package:model/oidc/response/oidc_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';
|
||||||
@@ -21,6 +22,12 @@ class AuthenticationOIDCRepositoryImpl extends AuthenticationOIDCRepository {
|
|||||||
return _oidcDataSource.getOIDCConfiguration(oidcResponse);
|
return _oidcDataSource.getOIDCConfiguration(oidcResponse);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<OIDCDiscoveryResponse> discoverOIDC(OIDCConfiguration oidcConfiguration) {
|
||||||
|
return _oidcDataSource.discoverOIDC(oidcConfiguration);
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<TokenOIDC> getTokenOIDC(String clientId, String redirectUrl, String discoveryUrl, List<String> scopes) {
|
Future<TokenOIDC> getTokenOIDC(String clientId, String redirectUrl, String discoveryUrl, List<String> scopes) {
|
||||||
return _oidcDataSource.getTokenOIDC(clientId, redirectUrl, discoveryUrl, scopes);
|
return _oidcDataSource.getTokenOIDC(clientId, redirectUrl, discoveryUrl, scopes);
|
||||||
@@ -63,8 +70,8 @@ class AuthenticationOIDCRepositoryImpl extends AuthenticationOIDCRepository {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<bool> logout(TokenId tokenId, OIDCConfiguration config) {
|
Future<bool> logout(TokenId tokenId, OIDCConfiguration config, OIDCDiscoveryResponse oidcRescovery) {
|
||||||
return _oidcDataSource.logout(tokenId, config);
|
return _oidcDataSource.logout(tokenId, config, oidcRescovery);
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
|
|
||||||
import 'package:core/presentation/state/failure.dart';
|
import 'package:core/presentation/state/failure.dart';
|
||||||
import 'package:core/presentation/state/success.dart';
|
import 'package:core/presentation/state/success.dart';
|
||||||
import 'package:core/utils/app_logger.dart';
|
import 'package:core/utils/app_logger.dart';
|
||||||
import 'package:dartz/dartz.dart';
|
import 'package:dartz/dartz.dart';
|
||||||
import 'package:model/account/authentication_type.dart';
|
import 'package:model/account/authentication_type.dart';
|
||||||
import 'package:model/oidc/oidc_configuration.dart';
|
import 'package:model/oidc/oidc_configuration.dart';
|
||||||
|
import 'package:model/oidc/response/oidc_discovery_response.dart';
|
||||||
import 'package:model/oidc/token_oidc.dart';
|
import 'package:model/oidc/token_oidc.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/repository/account_repository.dart';
|
import 'package:tmail_ui_user/features/login/domain/repository/account_repository.dart';
|
||||||
@@ -12,27 +12,29 @@ import 'package:tmail_ui_user/features/login/domain/repository/authentication_oi
|
|||||||
import 'package:tmail_ui_user/features/manage_account/domain/state/log_out_oidc_state.dart';
|
import 'package:tmail_ui_user/features/manage_account/domain/state/log_out_oidc_state.dart';
|
||||||
|
|
||||||
class LogoutOidcInteractor {
|
class LogoutOidcInteractor {
|
||||||
|
|
||||||
final AccountRepository _accountRepository;
|
final AccountRepository _accountRepository;
|
||||||
final AuthenticationOIDCRepository _authenticationOIDCRepository;
|
final AuthenticationOIDCRepository _authenticationOIDCRepository;
|
||||||
|
|
||||||
LogoutOidcInteractor(this._accountRepository, this._authenticationOIDCRepository);
|
LogoutOidcInteractor(
|
||||||
|
this._accountRepository, this._authenticationOIDCRepository);
|
||||||
|
|
||||||
Stream<Either<Failure, Success>> execute() async* {
|
Stream<Either<Failure, Success>> execute() async* {
|
||||||
try {
|
try {
|
||||||
final currentAccount = await _accountRepository.getCurrentAccount();
|
final currentAccount = await _accountRepository.getCurrentAccount();
|
||||||
log('LogoutOidcInteractor::execute(): currentAccount: $currentAccount');
|
log('LogoutOidcInteractor::execute(): currentAccount: $currentAccount');
|
||||||
if (currentAccount.authenticationType == AuthenticationType.oidc) {
|
if (currentAccount.authenticationType == AuthenticationType.oidc) {
|
||||||
final result = await Future.wait([
|
final result = await _authenticationOIDCRepository.getStoredOidcConfiguration()
|
||||||
_authenticationOIDCRepository.getStoredTokenOIDC(currentAccount.id),
|
.then((oidcConfig) => Future.wait([
|
||||||
_authenticationOIDCRepository.getStoredOidcConfiguration()
|
Future.value(oidcConfig),
|
||||||
]).then((result) async {
|
_authenticationOIDCRepository.getStoredTokenOIDC(currentAccount.id),
|
||||||
final tokenOidc = result.first as TokenOIDC;
|
_authenticationOIDCRepository.discoverOIDC(oidcConfig)
|
||||||
final oidcConfig = result.last as OIDCConfiguration;
|
]))
|
||||||
log('LogoutOidcInteractor::execute(): tokenOidc: ${tokenOidc.tokenId.uuid}');
|
.then((oidcParameters) async {
|
||||||
log('LogoutOidcInteractor::execute(): oidcConfig: $oidcConfig');
|
final oidcConfig = oidcParameters[0] as OIDCConfiguration;
|
||||||
return await _authenticationOIDCRepository.logout(tokenOidc.tokenId, oidcConfig);
|
final tokenOIDC = oidcParameters[1] as TokenOIDC;
|
||||||
});
|
final oidcDiscoveryResponse = oidcParameters[2] as OIDCDiscoveryResponse;
|
||||||
|
return await _authenticationOIDCRepository.logout(tokenOIDC.tokenId, oidcConfig, oidcDiscoveryResponse);
|
||||||
|
});
|
||||||
log('LogoutOidcInteractor::execute(): statusSuccess: $result');
|
log('LogoutOidcInteractor::execute(): statusSuccess: $result');
|
||||||
if (result) {
|
if (result) {
|
||||||
yield Right<Failure, Success>(LogoutOidcSuccess());
|
yield Right<Failure, Success>(LogoutOidcSuccess());
|
||||||
@@ -40,7 +42,8 @@ class LogoutOidcInteractor {
|
|||||||
yield Left<Failure, Success>(LogoutOidcFailure(null));
|
yield Left<Failure, Success>(LogoutOidcFailure(null));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
yield Left<Failure, Success>(LogoutOidcFailure(NotFoundAuthenticatedAccountException()));
|
yield Left<Failure, Success>(
|
||||||
|
LogoutOidcFailure(NotFoundAuthenticatedAccountException()));
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
log('LogoutOidcInteractor::execute(): EXCEPTION: $e');
|
log('LogoutOidcInteractor::execute(): EXCEPTION: $e');
|
||||||
|
|||||||
Reference in New Issue
Block a user