feat(#660): refactor lab class

hpi-dhc · Nov 8, 2024 · 5966e70 · 5966e70
1 parent cfef67d
commit 5966e70
Show file tree

Hide file tree

Showing 14 changed files with 137 additions and 147 deletions.
diff --git a/app/generate_screendocs/sequence_utils.dart b/app/generate_screendocs/sequence_utils.dart
@@ -8,7 +8,7 @@ import 'package:provider/provider.dart';
 Future<void> loadApp(WidgetTester tester) async {
   // Part before runApp in lib/main.dart
   await initServices();
-  await updateGenotypeResults();
+  await maybeUpdateGenotypeResults();
   // Load the app
   await tester.pumpWidget(
     ChangeNotifierProvider(

diff --git a/app/integration_test/login_test.dart b/app/integration_test/login_test.dart
@@ -1,5 +1,4 @@
 import 'package:app/common/module.dart';
-import 'package:app/login/models/lab.dart';
 import 'package:app/login/module.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_test/flutter_test.dart';

diff --git a/app/lib/common/constants.dart b/app/lib/common/constants.dart
@@ -2,10 +2,6 @@ import 'package:url_launcher/url_launcher.dart';
 
 Uri anniUrl([String slug = '']) =>
     Uri.http('vm-slosarek01.dhclab.i.hpi.de:8000', 'api/v1/$slug');
-Uri labServerUrl([String slug = '']) =>
-    Uri.http('vm-slosarek01.dhclab.i.hpi.de:8081', 'api/v1/$slug');
-Uri keycloakUrl([String slug = '']) =>
-    Uri.http('vm-slosarek01.dhclab.i.hpi.de:28080', slug);
 
 final geneticInformationUrl = Uri.https(
   'medlineplus.gov',

diff --git a/app/lib/common/models/userdata/lab_result.dart b/app/lib/common/models/userdata/lab_result.dart
@@ -1,8 +1,5 @@
-import 'dart:convert';
-
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:hive/hive.dart';
-import 'package:http/http.dart';
 import 'genotype.dart';
 
 part 'lab_result.g.dart';
@@ -35,9 +32,3 @@ class LabResult implements Genotype {
   @HiveField(3)
   String allelesTested;
 }
-
-// assumes http reponse from lab server
-List<LabResult> labDataFromHTTPResponse(Response resp) {
-  final json = jsonDecode(resp.body)['diplotypes'] as List<dynamic>;
-  return json.map<LabResult>(LabResult.fromJson).toList();
-}
diff --git a/app/lib/common/models/userdata/userdata.dart b/app/lib/common/models/userdata/userdata.dart
@@ -1,8 +1,4 @@
-import 'dart:convert';
-
 import 'package:hive/hive.dart';
-import 'package:http/http.dart';
-
 import '../../module.dart';
 import '../../utilities/hive_utils.dart';
 
@@ -136,13 +132,3 @@ Future<void> initUserData() async {
   final userData = Hive.box<UserData>(_boxName);
   UserData._instance = userData.get('data') ?? UserData();
 }
-
-// assumes http response from lab server
-List<String> activeDrugsFromHTTPResponse(Response resp) {
-  var activeDrugs = <String>[];
-  final json = jsonDecode(resp.body) as Map<String, dynamic>;
-  if (json.containsKey('medications')) {
-    activeDrugs = List<String>.from(json['medications']);
-  }
-  return activeDrugs;
-}
diff --git a/app/lib/common/utilities/drug_utils.dart b/app/lib/common/utilities/drug_utils.dart
@@ -4,7 +4,7 @@ import 'package:http/http.dart';
 import '../../app.dart';
 import '../module.dart';
 
-Future<void> updateDrugsWithGuidelines() async {
+Future<void> maybeUpdateDrugsWithGuidelines() async {
   final isOnline = await hasConnectionTo(anniUrl().host);
   if (!isOnline && DrugsWithGuidelines.instance.version == null) {
     throw Exception();
@@ -22,7 +22,7 @@ Future<void> updateDrugsWithGuidelines() async {
   DrugsWithGuidelines.instance.drugs = data.drugs;
   DrugsWithGuidelines.instance.version = data.version;
   await DrugsWithGuidelines.save();
-  await updateGenotypeResults();
+  await maybeUpdateGenotypeResults();
   if (previousVersion != null) {
     final context = PharMeApp.navigatorKey.currentContext;
     if (context != null) {

diff --git a/app/lib/common/utilities/genome_data.dart b/app/lib/common/utilities/genome_data.dart
@@ -5,30 +5,11 @@ import 'package:http/http.dart';
 
 import '../module.dart';
 
-Future<void> fetchAndSaveDiplotypesAndActiveDrugs(
-  String token, String url, ActiveDrugs activeDrugs) async {
-  if (!shouldFetchDiplotypes()) return;
-  final response = await getDiplotypes(token, url);
-  if (response.statusCode == 200) {
-    await _saveDiplotypeAndActiveDrugsResponse(response, activeDrugs);
-  } else {
-    throw Exception();
-  }
-}
-
-Future<Response> getDiplotypes(String? token, String url) async {
-  return get(Uri.parse(url), headers: {'Authorization': 'Bearer $token'});
-}
-
-Future<void> _saveDiplotypeAndActiveDrugsResponse(
-  Response response,
+Future<void> saveDiplotypesAndActiveDrugs(
+  List<LabResult> labData,
+  List<String> activeDrugList,
   ActiveDrugs activeDrugs,
 ) async {
-  // parse response to list of user's labData
-  final labData =
-      labDataFromHTTPResponse(response);
-  final activeDrugList = activeDrugsFromHTTPResponse(response);
-
   UserData.instance.labData = labData;
   await UserData.save();
   await activeDrugs.setList(activeDrugList);
@@ -63,7 +44,7 @@ Map<String, GenotypeResult> initializeGenotypeResultKeys() {
   return emptyGenotypeResults;
 }
 
-Future<void> updateGenotypeResults() async {
+Future<void> maybeUpdateGenotypeResults() async {
   final skipUpdate = !shouldUpdateGenotypeResults();
   if (skipUpdate) return;
 

diff --git a/app/lib/common/widgets/drug_list/cubit.dart b/app/lib/common/widgets/drug_list/cubit.dart
@@ -62,7 +62,7 @@ class DrugListCubit extends Cubit<DrugListState> {
 
     emit(DrugListState.loading());
     try {
-      await updateDrugsWithGuidelines();
+      await maybeUpdateDrugsWithGuidelines();
       await loadDrugs(updateIfNull: false, filter: filter);
     } catch (error) {
       emit(DrugListState.error());

diff --git a/app/lib/l10n/app_en.arb b/app/lib/l10n/app_en.arb
@@ -40,7 +40,7 @@
   "drug_list_subheader_all_drugs": "All medications",
   "drug_list_subheader_other_drugs": "Other medications",
 
-  "err_could_not_retrieve_access_token": "An unexpected error occurred while retrieving the access token",
+  "err_could_not_retrieve_access_token": "An unexpected error occurred while logging in",
   "err_fetch_user_data_failed": "An error occurred while getting data, please try again later",
   "err_generic": "Error",
 
@@ -137,7 +137,7 @@
       }
   },
   "drugs_page_tooltip_guideline_present": "{source} guidelines are used to inform the content on this page. These guidelines provide recommendations on which drugs to use based on your DNA.",
-  "@drugs_page_tooltip_guideline": {
+  "@drugs_page_tooltip_guideline_present": {
     "placeholders": {
       "source": {
         "type": "String",

diff --git a/app/lib/login/cubit.dart b/app/lib/login/cubit.dart
@@ -1,9 +1,4 @@
-import 'dart:convert' show jsonDecode;
-
-import 'package:flutter/services.dart';
-import 'package:flutter_web_auth/flutter_web_auth.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:http/http.dart' as http;
 
 import '../../common/module.dart';
 import 'models/lab.dart';
@@ -21,23 +16,12 @@ class LoginCubit extends Cubit<LoginState> {
   // genomic data from it's endpoint.
   Future<void> signInAndLoadUserData(BuildContext context, Lab lab) async {
     emit(LoginState.loadingUserData(null));
-
-    // authenticate
-    String? token;
     try {
-      token = await _getAccessToken(
-        context,
-        authUrl: lab.authUrl,
-        tokenUrl: lab.tokenUrl,
-      );
-    } on PlatformException catch (e) {
-      if (e.code == 'CANCELED') {
-        revertToInitialState();
-        return;
-      }
-    }
-
-    if (token == null) {
+      await lab.authenticate();
+    } on LabAuthenticationCanceled {
+      revertToInitialState();
+      return;
+    } on LabAuthenticationError {
       emit(LoginState.error(
         // ignore: use_build_context_synchronously
         context.l10n.err_could_not_retrieve_access_token,
@@ -46,24 +30,22 @@ class LoginCubit extends Cubit<LoginState> {
     }
 
     try {
-      final needNewDataLoad =
-        shouldFetchDiplotypes() || shouldUpdateGenotypeResults();
-      // get data
-      if (needNewDataLoad) {
+      final loadingMessage = shouldFetchDiplotypes()
         // ignore: use_build_context_synchronously
-        emit(LoginState.loadingUserData(context.l10n.auth_loading_data));
-      }
-      await fetchAndSaveDiplotypesAndActiveDrugs(
-        token, lab.starAllelesUrl.toString(), activeDrugs);
-      await updateGenotypeResults();
-
-      if (!needNewDataLoad) {
+        ? context.l10n.auth_loading_data
         // ignore: use_build_context_synchronously
-        emit(LoginState.loadingUserData(context.l10n.auth_updating_data));
+        : context.l10n.auth_updating_data;
+      emit(LoginState.loadingUserData(loadingMessage));
+      if (shouldFetchDiplotypes()) {
+        final (labData, activeDrugList) = await lab.loadData();
+        await saveDiplotypesAndActiveDrugs(
+          labData,
+          activeDrugList,
+          activeDrugs,
+        );
       }
-      await updateDrugsWithGuidelines();
-
-      // login + fetching of data successful
+      await maybeUpdateGenotypeResults();
+      await maybeUpdateDrugsWithGuidelines();
       MetaData.instance.isLoggedIn = true;
       await MetaData.save();
       emit(LoginState.loadedUserData());
@@ -72,43 +54,6 @@ class LoginCubit extends Cubit<LoginState> {
       emit(LoginState.error(context.l10n.err_fetch_user_data_failed));
     }
   }
-
-  Future<String> _getAccessToken(
-    BuildContext context, {
-    required Uri authUrl,
-    required Uri tokenUrl,
-  }) async {
-    const clientId = 'pharme-app';
-    const callbackUrlScheme = 'localhost';
-
-    // Construct the url
-    final url = authUrl.replace(queryParameters: {
-      'response_type': 'code',
-      'client_id': clientId,
-      'redirect_uri': '$callbackUrlScheme:/',
-      'scope': 'openid profile',
-    });
-
-    // Present the dialog to the user
-    final result = await FlutterWebAuth.authenticate(
-      url: url.toString(),
-      callbackUrlScheme: callbackUrlScheme,
-    );
-
-    // Extract code from resulting url
-    final code = Uri.parse(result).queryParameters['code'];
-
-    // Use this code to get an access token
-    final response = await http.post(tokenUrl, body: {
-      'client_id': clientId,
-      'redirect_uri': '$callbackUrlScheme:/',
-      'grant_type': 'authorization_code',
-      'code': code,
-    });
-
-    // Get the access token from the response
-    return jsonDecode(response.body)['access_token'] as String;
-  }
 }
 
 @freezed

diff --git a/app/lib/login/models/lab.dart b/app/lib/login/models/lab.dart
@@ -1,24 +1,38 @@
+import 'dart:convert';
+
+import 'package:http/http.dart';
+
 import '../../common/module.dart';
 
+class LabAuthenticationCanceled implements Exception {
+  LabAuthenticationCanceled();
+}
+
+class LabAuthenticationError implements Exception {
+  LabAuthenticationError();
+}
+
 class Lab {
   Lab({
     required this.name,
-    required this.authUrl,
-    required this.tokenUrl,
-    required this.starAllelesUrl,
   });
 
   String name;
-  Uri authUrl;
-  Uri tokenUrl;
-  Uri starAllelesUrl;
-}
+
+  Future<void> authenticate() async {}
+  Future<(List<LabResult>, List<String>)> loadData() async {
+    throw UnimplementedError();
+  }
 
-final labs = [
-  Lab(
-    name: 'Mount Sinai Health System',
-    authUrl: keycloakUrl('realms/pharme/protocol/openid-connect/auth'),
-    tokenUrl: keycloakUrl('realms/pharme/protocol/openid-connect/token'),
-    starAllelesUrl: labServerUrl('star-alleles'),
-  )
-];
+  (List<LabResult>, List<String>) labDataFromHTTPResponse(Response response) {
+    final json = jsonDecode(response.body) as Map<String, dynamic>;
+    final labData = json['diplotypes'].map<LabResult>(
+      LabResult.fromJson
+    ).toList();
+    var activeDrugs = <String>[];
+    if (json.containsKey('medications')) {
+      activeDrugs = List<String>.from(json['medications']);
+    }
+    return (labData, activeDrugs);
+  }
+}