6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit 9b1970f6
Changed files
.../authentication/authentication_repository.dart | 8 ++---- comwell_key_app/lib/login/login_page.dart | 2 -- comwell_key_app/lib/routing/app_router.dart | 1 - .../interceptors/response_handle_interceptor.dart | 33 ---------------------- 4 files changed, 2 insertions(+), 42 deletions(-)
Diff
diff --git a/comwell_key_app/lib/authentication/authentication_repository.dart b/comwell_key_app/lib/authentication/authentication_repository.dart
index d2776d55..8951e0e9 100644
--- a/comwell_key_app/lib/authentication/authentication_repository.dart
+++ b/comwell_key_app/lib/authentication/authentication_repository.dart
@@ -124,14 +124,10 @@ class AuthenticationRepository {
Future<void> openAuth(Prompt prompt) async {
try {
final token = await msAuth.acquireToken(scopes: scopes, prompt: prompt);
- print('token.accessToken ${token}');
+
await loginWithCode(token.accessToken);
} catch (e) {
- final accounts = await msAuth.getAccounts();
- if (accounts.isNotEmpty) {
- print("qqq accounts=${accounts.map((e) => e.id).join(", ")}");
- }
- print("qqq e=$e");
+ debugPrint("qqq e=$e");
}
}
diff --git a/comwell_key_app/lib/login/login_page.dart b/comwell_key_app/lib/login/login_page.dart
index 77c2342b..1c83e3e9 100644
--- a/comwell_key_app/lib/login/login_page.dart
+++ b/comwell_key_app/lib/login/login_page.dart
@@ -1,10 +1,8 @@
-import 'package:comwell_key_app/login/auth.dart';
import 'package:comwell_key_app/login/components/create_user_button.dart';
import 'package:comwell_key_app/login/components/forced_logout_banner.dart';
import 'package:comwell_key_app/login/components/login_button.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:url_launcher/url_launcher.dart';
import 'cubit/login_cubit.dart';
diff --git a/comwell_key_app/lib/routing/app_router.dart b/comwell_key_app/lib/routing/app_router.dart
index a5aafbd0..34c20019 100644
--- a/comwell_key_app/lib/routing/app_router.dart
+++ b/comwell_key_app/lib/routing/app_router.dart
@@ -121,7 +121,6 @@ GoRouter goRouter() {
}
// Redirect to the overview page if the user is authenticated
else if (isAuthenticated && state.matchedLocation.contains("/login")) {
- print("qqq redirecting to overview");
return "/${AppRoutes.overview.name}";
}
return null;
diff --git a/comwell_key_app/lib/services/interceptors/response_handle_interceptor.dart b/comwell_key_app/lib/services/interceptors/response_handle_interceptor.dart
index 976a222d..12691194 100644
--- a/comwell_key_app/lib/services/interceptors/response_handle_interceptor.dart
+++ b/comwell_key_app/lib/services/interceptors/response_handle_interceptor.dart
@@ -7,7 +7,6 @@ import 'package:flutter_secure_storage/flutter_secure_storage.dart';
import 'package:comwell_key_app/common/const.dart' as constants;
import 'package:go_router/go_router.dart';
import 'package:flutter/material.dart';
-import 'package:msal_auth/msal_auth.dart';
class ResponseHandleInterceptor extends Interceptor {
final Dio _dio;
@@ -137,36 +136,4 @@ class ResponseHandleInterceptor extends Interceptor {
return handler.next(response);
}
- Future<String?> _refreshToken() async {
- final String? refreshToken =
- await _secureStorageService.read(key: constants.accessToken);
-
- if (refreshToken == null) {
- return null;
- }
-
- final Dio refreshDio =
- Dio(BaseOptions(baseUrl: dotenv.env['AAD_B2C_TOKEN_ENDPOINT']!));
- final response = await refreshDio.post<dynamic>('',
- data: {
- 'grant_type': 'refresh_token',
- 'refresh_token': refreshToken,
- },
- options: Options(headers: {
- 'Content-Type': 'application/x-www-form-urlencoded',
- }));
-
- if (response.statusCode == 200) {
- final newAccessToken = response.data['id_token'] as String;
- final newRefreshToken = response.data['refresh_token'] as String;
-
- await _secureStorageService.write(
- key: constants.accessToken, value: newAccessToken);
- await _secureStorageService.write(
- key: constants.refreshToken, value: newRefreshToken);
-
- return newAccessToken;
- }
- return null;
- }
}