TF-1606 Store jmapUrl on memory

(cherry picked from commit 5e7e0f0cfb34510b5c341417044b8057cde2ca35)
This commit is contained in:
dab246
2023-03-20 16:59:41 +07:00
committed by Dat Vu
parent 6bd48aef7b
commit 29219eb14e
5 changed files with 16 additions and 2 deletions
+1
View File
@@ -3,6 +3,7 @@ library core;
// Extensions // Extensions
export 'presentation/extensions/color_extension.dart'; export 'presentation/extensions/color_extension.dart';
export 'presentation/extensions/url_extension.dart'; export 'presentation/extensions/url_extension.dart';
export 'presentation/extensions/uri_extension.dart';
export 'presentation/extensions/capitalize_extension.dart'; export 'presentation/extensions/capitalize_extension.dart';
export 'presentation/extensions/list_extensions.dart'; export 'presentation/extensions/list_extensions.dart';
export 'domain/extensions/datetime_extension.dart'; export 'domain/extensions/datetime_extension.dart';
@@ -1,12 +1,19 @@
import 'package:dio/dio.dart'; import 'package:dio/dio.dart';
class DynamicUrlInterceptors extends InterceptorsWrapper { class DynamicUrlInterceptors extends InterceptorsWrapper {
String? _jmapUrl;
String? _baseUrl; String? _baseUrl;
void changeBaseUrl(String? url) { void changeBaseUrl(String? url) {
_baseUrl = url; _baseUrl = url;
} }
void setJmapUrl(String? url) {
_jmapUrl = url;
}
String? get jmapUrl => _jmapUrl;
String? get baseUrl => _baseUrl; String? get baseUrl => _baseUrl;
@override @override
@@ -72,6 +72,7 @@ abstract class ReloadableController extends BaseController {
} }
void _setUpInterceptors(GetCredentialViewState credentialViewState) { void _setUpInterceptors(GetCredentialViewState credentialViewState) {
_dynamicUrlInterceptors.setJmapUrl(credentialViewState.baseUrl.origin);
_dynamicUrlInterceptors.changeBaseUrl(credentialViewState.baseUrl.origin); _dynamicUrlInterceptors.changeBaseUrl(credentialViewState.baseUrl.origin);
authorizationInterceptors.setBasicAuthorization( authorizationInterceptors.setBasicAuthorization(
credentialViewState.userName.userName, credentialViewState.userName.userName,
@@ -126,6 +127,7 @@ abstract class ReloadableController extends BaseController {
} }
void _setUpInterceptorsOidc(GetStoredTokenOidcSuccess tokenOidcSuccess) { void _setUpInterceptorsOidc(GetStoredTokenOidcSuccess tokenOidcSuccess) {
_dynamicUrlInterceptors.setJmapUrl(tokenOidcSuccess.baseUrl.toString());
_dynamicUrlInterceptors.changeBaseUrl(tokenOidcSuccess.baseUrl.toString()); _dynamicUrlInterceptors.changeBaseUrl(tokenOidcSuccess.baseUrl.toString());
authorizationInterceptors.setTokenAndAuthorityOidc( authorizationInterceptors.setTokenAndAuthorityOidc(
newToken: tokenOidcSuccess.tokenOidc.toToken(), newToken: tokenOidcSuccess.tokenOidc.toToken(),
@@ -183,6 +183,7 @@ class HomeController extends BaseController {
} }
void _goToSessionWithTokenOidc(GetStoredTokenOidcSuccess storedTokenOidcSuccess) { void _goToSessionWithTokenOidc(GetStoredTokenOidcSuccess storedTokenOidcSuccess) {
_dynamicUrlInterceptors.setJmapUrl(storedTokenOidcSuccess.baseUrl.toString());
_dynamicUrlInterceptors.changeBaseUrl(storedTokenOidcSuccess.baseUrl.toString()); _dynamicUrlInterceptors.changeBaseUrl(storedTokenOidcSuccess.baseUrl.toString());
authorizationInterceptors.setTokenAndAuthorityOidc( authorizationInterceptors.setTokenAndAuthorityOidc(
newToken: storedTokenOidcSuccess.tokenOidc.toToken(), newToken: storedTokenOidcSuccess.tokenOidc.toToken(),
@@ -194,6 +195,7 @@ class HomeController extends BaseController {
} }
void _goToSessionWithBasicAuth(GetCredentialViewState credentialViewState) { void _goToSessionWithBasicAuth(GetCredentialViewState credentialViewState) {
_dynamicUrlInterceptors.setJmapUrl(credentialViewState.baseUrl.origin);
_dynamicUrlInterceptors.changeBaseUrl(credentialViewState.baseUrl.origin); _dynamicUrlInterceptors.changeBaseUrl(credentialViewState.baseUrl.origin);
authorizationInterceptors.setBasicAuthorization( authorizationInterceptors.setBasicAuthorization(
credentialViewState.userName.userName, credentialViewState.userName.userName,
@@ -306,7 +306,8 @@ class LoginController extends ReloadableController {
void _getTokenOIDCSuccess(GetTokenOIDCSuccess success) { void _getTokenOIDCSuccess(GetTokenOIDCSuccess success) {
log('LoginController::_getTokenOIDCSuccess(): ${success.tokenOIDC.toString()}'); log('LoginController::_getTokenOIDCSuccess(): ${success.tokenOIDC.toString()}');
loginState.value = LoginState(Right(success)); loginState.value = LoginState(Right(success));
_dynamicUrlInterceptors.changeBaseUrl(kIsWeb ? AppConfig.baseUrl : _urlText); _dynamicUrlInterceptors.setJmapUrl(BuildUtils.isWeb ? AppConfig.baseUrl : _urlText);
_dynamicUrlInterceptors.changeBaseUrl(BuildUtils.isWeb ? AppConfig.baseUrl : _urlText);
authorizationInterceptors.setTokenAndAuthorityOidc( authorizationInterceptors.setTokenAndAuthorityOidc(
newToken: success.tokenOIDC.toToken(), newToken: success.tokenOIDC.toToken(),
newConfig: success.configuration); newConfig: success.configuration);
@@ -322,7 +323,8 @@ class LoginController extends ReloadableController {
void _loginSuccessAction(AuthenticationUserSuccess success) { void _loginSuccessAction(AuthenticationUserSuccess success) {
loginState.value = LoginState(Right(success)); loginState.value = LoginState(Right(success));
_dynamicUrlInterceptors.changeBaseUrl(kIsWeb ? AppConfig.baseUrl : _urlText); _dynamicUrlInterceptors.setJmapUrl(BuildUtils.isWeb ? AppConfig.baseUrl : _urlText);
_dynamicUrlInterceptors.changeBaseUrl(BuildUtils.isWeb ? AppConfig.baseUrl : _urlText);
authorizationInterceptors.setBasicAuthorization(_userNameText, _passwordText); authorizationInterceptors.setBasicAuthorization(_userNameText, _passwordText);
authorizationIsolateInterceptors.setBasicAuthorization(_userNameText, _passwordText); authorizationIsolateInterceptors.setBasicAuthorization(_userNameText, _passwordText);
pushAndPop(AppRoutes.session, arguments: _dynamicUrlInterceptors.baseUrl); pushAndPop(AppRoutes.session, arguments: _dynamicUrlInterceptors.baseUrl);