diff --git a/lib/features/login/data/datasource/authentication_oidc_datasource.dart b/lib/features/login/data/datasource/authentication_oidc_datasource.dart index 7024c2a66..92bcc54e9 100644 --- a/lib/features/login/data/datasource/authentication_oidc_datasource.dart +++ b/lib/features/login/data/datasource/authentication_oidc_datasource.dart @@ -4,7 +4,7 @@ import 'package:model/model.dart'; abstract class AuthenticationOIDCDataSource { Future checkOIDCIsAvailable(OIDCRequest oidcRequest); - Future getOIDCConfiguration(Uri baseUri, OIDCResponse oidcResponse); + Future getOIDCConfiguration(OIDCResponse oidcResponse); Future getTokenOIDC(String clientId, String redirectUrl, String discoveryUrl, List scopes); diff --git a/lib/features/login/data/datasource_impl/authentication_oidc_datasource_impl.dart b/lib/features/login/data/datasource_impl/authentication_oidc_datasource_impl.dart index 6ffaf33ca..79c19cf14 100644 --- a/lib/features/login/data/datasource_impl/authentication_oidc_datasource_impl.dart +++ b/lib/features/login/data/datasource_impl/authentication_oidc_datasource_impl.dart @@ -26,9 +26,9 @@ class AuthenticationOIDCDataSourceImpl extends AuthenticationOIDCDataSource { } @override - Future getOIDCConfiguration(Uri baseUri, OIDCResponse oidcResponse) { + Future getOIDCConfiguration(OIDCResponse oidcResponse) { return Future.sync(() async { - return await _oidcHttpClient.getOIDCConfiguration(baseUri, oidcResponse); + return await _oidcHttpClient.getOIDCConfiguration(oidcResponse); }).catchError((error) { throw error; }); diff --git a/lib/features/login/data/network/oidc_http_client.dart b/lib/features/login/data/network/oidc_http_client.dart index 0a96a3fc6..2ec658b13 100644 --- a/lib/features/login/data/network/oidc_http_client.dart +++ b/lib/features/login/data/network/oidc_http_client.dart @@ -43,7 +43,7 @@ class OIDCHttpClient { } } - Future getOIDCConfiguration(Uri baseUri, OIDCResponse oidcResponse) async { + Future getOIDCConfiguration(OIDCResponse oidcResponse) async { if (oidcResponse.links.isEmpty) { throw CanNotFoundOIDCAuthority(); } diff --git a/lib/features/login/data/repository/authentication_oidc_repository_impl.dart b/lib/features/login/data/repository/authentication_oidc_repository_impl.dart index 6f2cdf827..2e9be164b 100644 --- a/lib/features/login/data/repository/authentication_oidc_repository_impl.dart +++ b/lib/features/login/data/repository/authentication_oidc_repository_impl.dart @@ -17,8 +17,8 @@ class AuthenticationOIDCRepositoryImpl extends AuthenticationOIDCRepository { } @override - Future getOIDCConfiguration(Uri baseUri, OIDCResponse oidcResponse) { - return _oidcDataSource.getOIDCConfiguration(baseUri, oidcResponse); + Future getOIDCConfiguration(OIDCResponse oidcResponse) { + return _oidcDataSource.getOIDCConfiguration(oidcResponse); } @override diff --git a/lib/features/login/domain/repository/authentication_oidc_repository.dart b/lib/features/login/domain/repository/authentication_oidc_repository.dart index 4a36864e3..226aeee3f 100644 --- a/lib/features/login/domain/repository/authentication_oidc_repository.dart +++ b/lib/features/login/domain/repository/authentication_oidc_repository.dart @@ -4,7 +4,7 @@ import 'package:model/model.dart'; abstract class AuthenticationOIDCRepository { Future checkOIDCIsAvailable(OIDCRequest oidcRequest); - Future getOIDCConfiguration(Uri baseUri, OIDCResponse oidcResponse); + Future getOIDCConfiguration(OIDCResponse oidcResponse); Future getTokenOIDC(String clientId, String redirectUrl, String discoveryUrl, List scopes); diff --git a/lib/features/login/domain/usecases/get_oidc_configuration_interactor.dart b/lib/features/login/domain/usecases/get_oidc_configuration_interactor.dart index 12d1645bf..c2eccf810 100644 --- a/lib/features/login/domain/usecases/get_oidc_configuration_interactor.dart +++ b/lib/features/login/domain/usecases/get_oidc_configuration_interactor.dart @@ -9,9 +9,9 @@ class GetOIDCConfigurationInteractor { GetOIDCConfigurationInteractor(this._oidcRepository); - Future> execute(Uri baseUri, OIDCResponse oidcResponse) async { + Future> execute(OIDCResponse oidcResponse) async { try { - final oidcConfiguration = await _oidcRepository.getOIDCConfiguration(baseUri, oidcResponse); + final oidcConfiguration = await _oidcRepository.getOIDCConfiguration(oidcResponse); log('GetOIDCConfigurationInteractor::execute(): oidcConfiguration: $oidcConfiguration'); return Right(GetOIDCConfigurationSuccess(oidcConfiguration)); } catch (e) { diff --git a/lib/features/login/presentation/login_controller.dart b/lib/features/login/presentation/login_controller.dart index 2bbea9622..9144bedac 100644 --- a/lib/features/login/presentation/login_controller.dart +++ b/lib/features/login/presentation/login_controller.dart @@ -106,12 +106,7 @@ class LoginController extends GetxController { void handleLoginPressed() { log('LoginController::handleLoginPressed(): ${loginFormType.value}'); if (loginFormType.value == LoginFormType.ssoForm) { - final baseUri = kIsWeb ? _parseUri(AppConfig.baseUrl) : _parseUri(_urlText); - if (baseUri != null) { - _getOIDCConfiguration(baseUri); - } else { - loginState.value = LoginState(Left(LoginMissUrlAction())); - } + _getOIDCConfiguration(); } else { final baseUri = kIsWeb ? _parseUri(AppConfig.baseUrl) : _parseUri(_urlText); final userName = _parseUserName(_userNameText); @@ -128,10 +123,10 @@ class LoginController extends GetxController { } } - void _getOIDCConfiguration(Uri baseUri) async { + void _getOIDCConfiguration() async { loginState.value = LoginState(Right(LoginLoadingAction())); if (_oidcResponse != null) { - await _getOIDCConfigurationInteractor.execute(baseUri, _oidcResponse!) + await _getOIDCConfigurationInteractor.execute(_oidcResponse!) .then((response) => response.fold( (failure) { if (failure is GetOIDCConfigurationFailure) {