From 6c770e6334ca1d7c8dc7f4fb00d018eb6f66094f Mon Sep 17 00:00:00 2001 From: yaso-meth Date: Wed, 24 Jul 2024 09:32:26 +0200 Subject: [PATCH] Remove supabase reference from the app --- .../lib/Authentication/authCheck.dart | 22 ------------------- .../lib/components/medicineSearch.dart | 2 +- .../lib/components/patManAppDrawer.dart | 2 +- .../lib/components/patientNotes.dart | 2 +- .../patient_manager/lib/pages/patientAdd.dart | 2 +- .../lib/pages/patientEdit.dart | 20 ++++++++++------- .../lib/pages/patientManager.dart | 1 - 7 files changed, 16 insertions(+), 35 deletions(-) diff --git a/Frontend/patient_manager/lib/Authentication/authCheck.dart b/Frontend/patient_manager/lib/Authentication/authCheck.dart index 191ce15a..0402da8c 100644 --- a/Frontend/patient_manager/lib/Authentication/authCheck.dart +++ b/Frontend/patient_manager/lib/Authentication/authCheck.dart @@ -1,8 +1,6 @@ import 'package:flutter/material.dart'; import 'package:patient_manager/components/signInOrRegister.dart'; -//import 'package:patient_manager/main.dart'; import 'package:patient_manager/pages/home.dart'; -//import 'package:supabase_flutter/supabase_flutter.dart'; import 'package:supertokens_flutter/supertokens.dart'; class AuthCheck extends StatelessWidget { @@ -23,25 +21,5 @@ class AuthCheck extends StatelessWidget { return const SignInOrRegister(); } }); - // return StreamBuilder( - // stream: client.auth.onAuthStateChange.distinct(), - // builder: (context, snapshot) { - // if (snapshot.connectionState == ConnectionState.active) { - // final user = snapshot.data?.session; - // if (user == null) { - // // User not authenticated, show login screen - // return const SignInOrRegister(); - // //Navigator.of(context).pushNamed('/signin'); - // } else { - // // User authenticated, show home screen - // return const Home(); - // //Navigator.of(context).pushNamed('/homme'); - // } - // } - - // // Connection state not active, show loading indicator - // return const CircularProgressIndicator(); - // }, - // ); } } diff --git a/Frontend/patient_manager/lib/components/medicineSearch.dart b/Frontend/patient_manager/lib/components/medicineSearch.dart index 48e1d9d2..eb5f5339 100644 --- a/Frontend/patient_manager/lib/components/medicineSearch.dart +++ b/Frontend/patient_manager/lib/components/medicineSearch.dart @@ -6,7 +6,7 @@ import 'package:patient_manager/components/myErrorMessage.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/medicine.dart'; -import 'package:http/http.dart' as http; +import 'package:supertokens_flutter/http.dart' as http; class MedicineSearch extends StatefulWidget { final TextEditingController searchVlaue; diff --git a/Frontend/patient_manager/lib/components/patManAppDrawer.dart b/Frontend/patient_manager/lib/components/patManAppDrawer.dart index 7c00342f..58b2fd52 100644 --- a/Frontend/patient_manager/lib/components/patManAppDrawer.dart +++ b/Frontend/patient_manager/lib/components/patManAppDrawer.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; -import 'package:http/http.dart' as http; +import 'package:supertokens_flutter/http.dart' as http; import 'package:patient_manager/objects/appUser.dart'; import 'package:supertokens_flutter/supertokens.dart'; diff --git a/Frontend/patient_manager/lib/components/patientNotes.dart b/Frontend/patient_manager/lib/components/patientNotes.dart index 81a8a263..28ab06a6 100644 --- a/Frontend/patient_manager/lib/components/patientNotes.dart +++ b/Frontend/patient_manager/lib/components/patientNotes.dart @@ -10,7 +10,7 @@ import 'package:patient_manager/components/mybutton.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/notes.dart'; -import 'package:http/http.dart' as http; +import 'package:supertokens_flutter/http.dart' as http; class PatientNotes extends StatefulWidget { final int patientIndex; diff --git a/Frontend/patient_manager/lib/pages/patientAdd.dart b/Frontend/patient_manager/lib/pages/patientAdd.dart index a42f2bb1..cb610a28 100644 --- a/Frontend/patient_manager/lib/pages/patientAdd.dart +++ b/Frontend/patient_manager/lib/pages/patientAdd.dart @@ -10,7 +10,7 @@ import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/appUser.dart'; import '../components/myAppBar.dart'; -import 'package:http/http.dart' as http; +import 'package:supertokens_flutter/http.dart' as http; class AddPatient extends StatefulWidget { final String userEmail; diff --git a/Frontend/patient_manager/lib/pages/patientEdit.dart b/Frontend/patient_manager/lib/pages/patientEdit.dart index eb744586..ba8340a7 100644 --- a/Frontend/patient_manager/lib/pages/patientEdit.dart +++ b/Frontend/patient_manager/lib/pages/patientEdit.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'package:flutter/material.dart'; +import 'package:patient_manager/components/myAppBar.dart'; import 'package:patient_manager/components/myDropdownInput.dart'; import 'package:patient_manager/components/myErrorMessage.dart'; import 'package:patient_manager/components/mySuccessMessage.dart'; @@ -9,10 +10,9 @@ import 'package:patient_manager/components/mybutton.dart'; import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/appUser.dart'; -import 'package:supabase_flutter/supabase_flutter.dart'; -import '../components/myAppBar.dart'; -import 'package:http/http.dart' as http; -import '../objects/patients.dart'; +import 'package:patient_manager/objects/patients.dart'; +import 'package:supertokens_flutter/supertokens.dart'; +import 'package:supertokens_flutter/http.dart' as http; class EditPatient extends StatefulWidget { final Patient selectedPatient; @@ -39,10 +39,11 @@ class _EditPatientState extends State { final medAidController = TextEditingController(); final medMainMemController = TextEditingController(); final medAidCodeController = TextEditingController(); - + final baseAPI = AppEnviroment.baseApiUrl; final docOfficeIdApiUrl = "${AppEnviroment.baseApiUrl}/users/profile/"; final apiUrlEdit = "${AppEnviroment.baseApiUrl}/patients/update/"; final apiUrlDelete = "${AppEnviroment.baseApiUrl}/patients/delete/"; + late int futureDocOfficeId; late String userEmail; late bool medRequired; @@ -139,9 +140,12 @@ class _EditPatientState extends State { } Future getLoginUserEmail() async { - userEmail = - (await Supabase.instance.client.auth.currentUser?.email.toString())!; - //print(userEmail); + var uid = await SuperTokens.getUserId(); + var response = await http.get(Uri.parse("$baseAPI/user/$uid")); + if (response.statusCode == 200) { + var user = jsonDecode(response.body); + userEmail = user["email"]; + } } void messagePopUp(error) { diff --git a/Frontend/patient_manager/lib/pages/patientManager.dart b/Frontend/patient_manager/lib/pages/patientManager.dart index fe040353..2ae9e37e 100644 --- a/Frontend/patient_manager/lib/pages/patientManager.dart +++ b/Frontend/patient_manager/lib/pages/patientManager.dart @@ -5,7 +5,6 @@ import 'package:flutter/material.dart'; import 'package:patient_manager/components/buildPatientList.dart'; import 'package:patient_manager/components/myAppBar.dart'; import 'package:supertokens_flutter/http.dart' as http; -//import 'package:http/http.dart' as http; import 'package:patient_manager/components/mySearchInput.dart'; import 'package:patient_manager/components/patManAppDrawer.dart'; import 'package:patient_manager/env/env.dart';