Add register and sign up with supertokens

2024-07-23 11:39:21 +02:00
parent b2d5369387
commit 5dd6a70329
24 changed files with 846 additions and 228 deletions
--- a/Frontend/patient_manager/lib/pages/home.dart
+++ b/Frontend/patient_manager/lib/pages/home.dart
@@ -1,8 +1,12 @@
+import 'dart:convert';
+
 import 'package:flutter/material.dart';
-import 'package:patient_manager/main.dart';
+import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/components/homeTileGrid.dart';
 import 'package:patient_manager/components/myAppBar.dart';
 import 'package:patient_manager/components/homeAppDrawer.dart';
+import 'package:supertokens_flutter/supertokens.dart';
+import 'package:supertokens_flutter/http.dart' as http;

 class Home extends StatefulWidget {
  const Home({
@@ -15,13 +19,14 @@ class Home extends StatefulWidget {

 class _HomeState extends State<Home> {
  String useremail = "";
+  final baseAPI = AppEnviroment.baseApiUrl;

  Future<void> getUserEmail() async {
-    final res = await client.auth.getUser();
-    if (res.user!.email != null) {
-      //print("emai not null");
-      useremail = res.user!.email!;
-      //print("Home Page: $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"];
    }
  }

--- a/Frontend/patient_manager/lib/pages/patientAdd.dart
+++ b/Frontend/patient_manager/lib/pages/patientAdd.dart
@@ -50,7 +50,7 @@ class _AddPatientState extends State<AddPatient> {
      var decodedData = jsonDecode(body);
      AppUser u = AppUser.fromJson(decodedData as Map<String, dynamic>);
      setState(() {
-        futureDocOfficeId = u.docOffice_id;
+        futureDocOfficeId = u.docOffice_ID;
        //print(futureDocOfficeId);
      });
    } else {
--- a/Frontend/patient_manager/lib/pages/patientEdit.dart
+++ b/Frontend/patient_manager/lib/pages/patientEdit.dart
@@ -57,7 +57,7 @@ class _EditPatientState extends State<EditPatient> {
      var decodedData = jsonDecode(body);
      AppUser u = AppUser.fromJson(decodedData as Map<String, dynamic>);
      setState(() {
-        futureDocOfficeId = u.docOffice_id;
+        futureDocOfficeId = u.docOffice_ID;
        //print(futureDocOfficeId);
      });
    } else {
--- a/Frontend/patient_manager/lib/pages/patientManager.dart
+++ b/Frontend/patient_manager/lib/pages/patientManager.dart
@@ -240,27 +240,24 @@ class _PatientManagerState extends State<PatientManager> {
    return Scaffold(
      appBar: const MyAppBar(barTitle: "Patient Manager"),
      drawer: PatManAppDrawer(userEmail: widget.userEmail),
-      floatingActionButtonLocation: FloatingActionButtonLocation.endTop,
-      floatingActionButton: Padding(
-        padding: const EdgeInsets.only(top: 65, right: 5),
-        child: FloatingActionButton.extended(
-          label: Text(
-            "Add Patient",
-            style: TextStyle(
-              fontWeight: FontWeight.bold,
-              color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
-            ),
-          ),
-          //backgroundColor: Colors.blueAccent,
-          onPressed: () {
-            Navigator.of(context)
-                .pushNamed('/patient-manager/add', arguments: widget.userEmail);
-          },
-          icon: Icon(
-            Icons.add,
+      //floatingActionButtonLocation: FloatingActionButtonLocation.,
+      floatingActionButton: FloatingActionButton.extended(
+        label: Text(
+          "Add Patient",
+          style: TextStyle(
+            fontWeight: FontWeight.bold,
            color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
          ),
        ),
+        //backgroundColor: Colors.blueAccent,
+        onPressed: () {
+          Navigator.of(context)
+              .pushNamed('/patient-manager/add', arguments: widget.userEmail);
+        },
+        icon: Icon(
+          Icons.add,
+          color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+        ),
      ),
      body: patientSearch(screenWidth, screenHeight),
    );
--- a/Frontend/patient_manager/lib/pages/register.dart
+++ b/Frontend/patient_manager/lib/pages/register.dart
@@ -1,9 +1,19 @@
+import 'dart:convert';
+
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:patient_manager/components/myErrorMessage.dart';
 import 'package:patient_manager/components/myPassInput.dart';
+import 'package:patient_manager/components/mySuccessMessage.dart';
 import 'package:patient_manager/components/myTextInput.dart';
 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/sessionST.dart';
 import 'package:supabase_auth_ui/supabase_auth_ui.dart';
+//import 'package:supertokens_flutter/supertokens.dart';
+import 'package:supertokens_flutter/http.dart' as http;
+import 'package:supertokens_flutter/supertokens.dart';

 class Register extends StatefulWidget {
  final Function()? onTap;
@@ -18,20 +28,125 @@ class _RegisterState extends State<Register> {
  final passwordController = TextEditingController();
  final confirmPasswordController = TextEditingController();
  final officeID = TextEditingController();
-
+  final baseAPI = AppEnviroment.baseApiUrl;
+  final FocusNode _focusNode = FocusNode();
  bool _obscureText = true;
+
+  bool successfulSignUp = false;
+
+  Future<void> addUserAPICall(String email, String uid) async {
+    //await getOfficeIdByUser(docOfficeIdApiUrl + widget.userEmail);
+    //print(futureDocOfficeId.toString());
+    var response = await http.post(
+      Uri.parse("$baseAPI/user/insert/"),
+      headers: <String, String>{
+        "Content-Type": "application/json; charset=UTF-8"
+      },
+      body: jsonEncode(<String, dynamic>{
+        "email": email,
+        "app_id": uid,
+      }),
+    );
+    if (response.statusCode == 201) {
+      Navigator.of(context).pushNamed('/home');
+      signUpSuccess();
+      setState(() {
+        successfulSignUp = true;
+      });
+    } else {
+      internetConnectionPopUp();
+    }
+  }
+
+  void internetConnectionPopUp() {
+    showDialog(
+      context: context,
+      builder: (context) {
+        return const MyErrorMessage(errorType: "Internet Connection");
+      },
+    );
+  }
+
  //sign user in
  Future<void> signUserUp() async {
    if (passwordController.text != confirmPasswordController.text) {
-      loginError("Passwords do not match");
+      passwordError();
    } else {
+      var _backgroundColor = Colors.transparent;
+
+      showDialog(
+        context: context,
+        barrierColor: _backgroundColor,
+        builder: (BuildContext dialogContext) {
+          return AlertDialog(
+            backgroundColor: _backgroundColor,
+            content: Container(
+              child: Center(
+                child: MzanziInnovationHub.of(context)!
+                    .theme
+                    .loadingImage(), // Put your gif into the assets folder
+              ),
+            ),
+          );
+        },
+      );
      try {
-        final response = await client.auth.signUp(
-          email: emailController.text,
-          password: passwordController.text,
-        );
-        if (response.session != null) {
-          Navigator.of(context).pushNamed('/homme');
+        Uri uri = Uri.parse(
+            "$baseAPI/auth/emailpassword/email/exists?email=${emailController.text}");
+        //print("Here");
+        var response = await http.get(uri);
+        //print(response.body);
+        //print("response 1: ${response.statusCode}");
+        if (response.statusCode == 200) {
+          var userExists = jsonDecode(response.body);
+          if (userExists["exists"]) {
+            signUpError();
+          } else {
+            var response2 = await http.post(
+              Uri.parse("$baseAPI/auth/signup"),
+              body:
+                  '{"formFields": [{"id": "email","value": "${emailController.text}"}, {"id": "password","value": "${passwordController.text}"}]}',
+              headers: {
+                'Content-type': 'application/json',
+                'Accept': 'application/json',
+                "Authorization": "leatucczyixqwkqqdrhayiwzeofkltds"
+              },
+            );
+            //print("response 2: ${response2.statusCode}");
+            if (response2.statusCode == 200) {
+              //print(response2.body);
+              var userCreated = jsonDecode(response2.body);
+              //print(userCreated);
+              if (userCreated["status"] == "OK") {
+                //print("Here");
+                //Creat user in db
+                var response2 = await http.post(
+                  Uri.parse("$baseAPI/auth/signup"),
+                  body:
+                      '{"formFields": [{"id": "email","value": "${emailController.text}"}, {"id": "password","value": "${passwordController.text}"}]}',
+                  headers: {
+                    'Content-type': 'application/json',
+                    'Accept': 'application/json',
+                    "Authorization": "leatucczyixqwkqqdrhayiwzeofkltds"
+                  },
+                );
+                String uid = await SuperTokens.getUserId();
+                if (response2.statusCode == 200) {
+                  addUserAPICall(emailController.text, uid);
+                } else {
+                  internetConnectionPopUp();
+                }
+              }
+            }
+          }
+          Navigator.of(context).pop();
+          // final response = await client.auth.signUp(
+          //   email: emailController.text,
+          //   password: passwordController.text,
+          // );
+          // if (response.session != null) {
+          //   Navigator.of(context).pushNamed('/homme');
+          // }
        }
      } on AuthException catch (error) {
        loginError(error.message);
@@ -42,6 +157,36 @@ class _RegisterState extends State<Register> {
    }
  }

+  void signUpSuccess() {
+    showDialog(
+      context: context,
+      builder: (context) {
+        return const MySuccessMessage(
+            successType: "Success",
+            successMessage:
+                "Congratulations! Your account has been created successfully. You are log in and start exploring.");
+      },
+    );
+  }
+
+  void signUpError() {
+    showDialog(
+      context: context,
+      builder: (context) {
+        return const MyErrorMessage(errorType: "User Exists");
+      },
+    );
+  }
+
+  void passwordError() {
+    showDialog(
+      context: context,
+      builder: (context) {
+        return const MyErrorMessage(errorType: "Password");
+      },
+    );
+  }
+
  void loginError(error) {
    showDialog(
      context: context,
@@ -61,126 +206,154 @@ class _RegisterState extends State<Register> {

  @override
  Widget build(BuildContext context) {
-    return Scaffold(
-      //backgroundColor: Colors.white,
-      body: SafeArea(
-        child: Center(
-          child: SingleChildScrollView(
-            physics: const BouncingScrollPhysics(),
-            child: Column(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                //logo
-                Icon(
-                  Icons.lock,
-                  size: 100,
-                  color:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-                ),
-                //spacer
-                const SizedBox(height: 10),
-                //Heading
-                Text(
-                  'Register',
-                  style: TextStyle(
-                    fontSize: 25,
-                    fontWeight: FontWeight.bold,
+    return KeyboardListener(
+      focusNode: _focusNode,
+      autofocus: true,
+      onKeyEvent: (event) async {
+        if (event is KeyDownEvent &&
+            event.logicalKey == LogicalKeyboardKey.enter) {
+          if (emailController.text.isEmpty || passwordController.text.isEmpty) {
+            showDialog(
+              context: context,
+              builder: (context) {
+                return const MyErrorMessage(errorType: "Input Error");
+              },
+            );
+          } else {
+            await signUserUp();
+            if (successfulSignUp) {
+              Navigator.of(context).pushNamed('/home');
+            }
+          }
+        }
+      },
+      child: Scaffold(
+        //backgroundColor: Colors.white,
+        body: SafeArea(
+          child: Center(
+            child: SingleChildScrollView(
+              physics: const BouncingScrollPhysics(),
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  //logo
+                  Icon(
+                    Icons.lock,
+                    size: 100,
                    color:
                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
                  ),
-                ),
-                //spacer
-                const SizedBox(height: 25),
-                //email input
-                SizedBox(
-                  width: 500.0,
-                  child: MyTextField(
-                    controller: officeID,
-                    hintText: 'OfficeID',
-                    editable: true,
-                    required: true,
+                  //spacer
+                  const SizedBox(height: 10),
+                  //Heading
+                  Text(
+                    'Register',
+                    style: TextStyle(
+                      fontSize: 25,
+                      fontWeight: FontWeight.bold,
+                      color: MzanziInnovationHub.of(context)!
+                          .theme
+                          .secondaryColor(),
+                    ),
                  ),
-                ),
-                //spacer
-                const SizedBox(height: 25),
-                //email input
-                SizedBox(
-                  width: 500.0,
-                  child: MyTextField(
-                    controller: emailController,
-                    hintText: 'Email',
-                    editable: true,
-                    required: true,
+                  //spacer
+                  const SizedBox(height: 25),
+                  //email input
+                  SizedBox(
+                    width: 500.0,
+                    child: MyTextField(
+                      controller: emailController,
+                      hintText: 'Email',
+                      editable: true,
+                      required: true,
+                    ),
                  ),
-                ),
-                //spacer
-                const SizedBox(height: 25),
-                //password input
-                SizedBox(
-                  width: 500.0,
-                  child: MyPassField(
-                    controller: passwordController,
-                    hintText: 'Password',
-                    required: true,
+                  //spacer
+                  const SizedBox(height: 25),
+                  //password input
+                  SizedBox(
+                    width: 500.0,
+                    child: MyPassField(
+                      controller: passwordController,
+                      hintText: 'Password',
+                      required: true,
+                    ),
                  ),
-                ),
-                //spacer
-                const SizedBox(height: 25),
-                //password input
-                SizedBox(
-                  width: 500.0,
-                  child: MyPassField(
-                    controller: confirmPasswordController,
-                    hintText: 'Confirm Password',
-                    required: true,
+                  //spacer
+                  const SizedBox(height: 25),
+                  //password input
+                  SizedBox(
+                    width: 500.0,
+                    child: MyPassField(
+                      controller: confirmPasswordController,
+                      hintText: 'Confirm Password',
+                      required: true,
+                    ),
                  ),
-                ),
-                //spacer
-                const SizedBox(height: 10),
-                // sign up button
-                SizedBox(
-                  width: 500.0,
-                  height: 100.0,
-                  child: MyButton(
-                    onTap: () {},
-                    buttonText: "Sign Up",
-                    buttonColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-                    textColor:
-                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                  //spacer
+                  const SizedBox(height: 10),
+                  // sign up button
+                  SizedBox(
+                    width: 500.0,
+                    height: 100.0,
+                    child: MyButton(
+                      buttonText: "Sign Up",
+                      buttonColor: MzanziInnovationHub.of(context)!
+                          .theme
+                          .secondaryColor(),
+                      textColor:
+                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                      onTap: () async {
+                        if (emailController.text.isEmpty ||
+                            passwordController.text.isEmpty) {
+                          showDialog(
+                            context: context,
+                            builder: (context) {
+                              return const MyErrorMessage(
+                                  errorType: "Input Error");
+                            },
+                          );
+                        } else {
+                          await signUserUp();
+                          if (successfulSignUp) {
+                            Navigator.of(context).pushNamed('/homme');
+                          }
+                        }
+                      },
+                    ),
                  ),
-                ),
-                //register text
-                SizedBox(
-                  width: 450.0,
-                  height: 100.0,
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.end,
-                    children: [
-                      const Text(
-                        'Already a User?',
-                        style: TextStyle(fontSize: 18, color: Colors.grey),
-                      ),
-                      const SizedBox(
-                        width: 6,
-                      ),
-                      GestureDetector(
-                        onTap: widget.onTap,
-                        child: Text(
-                          'Sign In',
-                          style: TextStyle(
-                            fontSize: 18,
-                            color: MzanziInnovationHub.of(context)!
-                                .theme
-                                .secondaryColor(),
-                            fontWeight: FontWeight.bold,
-                          ),
+                  //register text
+                  SizedBox(
+                    width: 450.0,
+                    height: 100.0,
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.end,
+                      children: [
+                        const Text(
+                          'Already a User?',
+                          style: TextStyle(fontSize: 18, color: Colors.grey),
                        ),
-                      )
-                    ],
-                  ),
-                )
-              ],
+                        const SizedBox(
+                          width: 6,
+                        ),
+                        GestureDetector(
+                          onTap: widget.onTap,
+                          child: Text(
+                            'Sign In',
+                            style: TextStyle(
+                              fontSize: 18,
+                              color: MzanziInnovationHub.of(context)!
+                                  .theme
+                                  .secondaryColor(),
+                              fontWeight: FontWeight.bold,
+                            ),
+                          ),
+                        )
+                      ],
+                    ),
+                  )
+                ],
+              ),
            ),
          ),
        ),
--- a/Frontend/patient_manager/lib/pages/signin.dart
+++ b/Frontend/patient_manager/lib/pages/signin.dart
@@ -1,11 +1,15 @@
+import 'dart:convert';
+
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:patient_manager/components/myErrorMessage.dart';
 import 'package:patient_manager/components/myPassInput.dart';
 import 'package:patient_manager/components/myTextInput.dart';
 import 'package:patient_manager/components/mybutton.dart';
+import 'package:patient_manager/env/env.dart';
 import 'package:patient_manager/main.dart';
 import 'package:supabase_auth_ui/supabase_auth_ui.dart';
+import 'package:supertokens_flutter/http.dart' as http;

 class SignIn extends StatefulWidget {
  final Function()? onTap;
@@ -23,24 +27,54 @@ class _SignInState extends State<SignIn> {
  // focus node to capture keyboard events
  final FocusNode _focusNode = FocusNode();

+  final baseAPI = AppEnviroment.baseApiUrl;
+
  //sign user in
  Future<void> signUserIn() async {
+    var _backgroundColor = Colors.transparent;
+
+    showDialog(
+      context: context,
+      barrierColor: _backgroundColor,
+      builder: (BuildContext dialogContext) {
+        return AlertDialog(
+          backgroundColor: _backgroundColor,
+          content: Container(
+            child: Center(
+              child: MzanziInnovationHub.of(context)!
+                  .theme
+                  .loadingImage(), // Put your gif into the assets folder
+            ),
+          ),
+        );
+      },
+    );
    try {
-      final response = await client.auth.signInWithPassword(
-        email: emailController.text,
-        password: passwordController.text,
+      var response = await http.post(
+        Uri.parse("$baseAPI/auth/signin"),
+        body:
+            '{"formFields": [{"id": "email","value": "${emailController.text}"}, {"id": "password","value": "${passwordController.text}"}]}',
+        headers: {
+          'Content-type': 'application/json',
+          'Accept': 'application/json',
+          "Authorization": "leatucczyixqwkqqdrhayiwzeofkltds"
+        },
      );
-      if (response.session != null) {
-        setState(() {
-          successfulSignIn = true;
-        });
-        //Navigator.of(context).pushNamed('/homme');
+      if (response.statusCode == 200) {
+        var userSignedin = jsonDecode(response.body);
+        if (userSignedin["status"] == "OK") {
+          setState(() {
+            successfulSignIn = true;
+          });
+        } else {
+          loginError();
+        }
      }
    } on AuthException {
      loginError();
-      //emailController.clear();
      passwordController.clear();
    }
+    Navigator.of(context).pop();
  }

  void loginError() {
@@ -57,7 +91,7 @@ class _SignInState extends State<SignIn> {
    return KeyboardListener(
      focusNode: _focusNode,
      autofocus: true,
-      onKeyEvent: (event) {
+      onKeyEvent: (event) async {
        if (event is KeyDownEvent &&
            event.logicalKey == LogicalKeyboardKey.enter) {
          if (emailController.text.isEmpty || passwordController.text.isEmpty) {
@@ -68,11 +102,10 @@ class _SignInState extends State<SignIn> {
              },
            );
          } else {
-            signUserIn();
-          }
-
-          if (successfulSignIn) {
-            Navigator.of(context).pushNamed('/homme');
+            await signUserIn();
+            if (successfulSignIn) {
+              Navigator.of(context).pushNamed('/home');
+            }
          }
        }
      },
@@ -141,7 +174,7 @@ class _SignInState extends State<SignIn> {
                          .secondaryColor(),
                      textColor:
                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
-                      onTap: () {
+                      onTap: () async {
                        if (emailController.text.isEmpty ||
                            passwordController.text.isEmpty) {
                          showDialog(
@@ -152,11 +185,11 @@ class _SignInState extends State<SignIn> {
                            },
                          );
                        } else {
-                          signUserIn();
-                        }
-
-                        if (successfulSignIn) {
-                          Navigator.of(context).pushNamed('/homme');
+                          await signUserIn();
+                          //print(successfulSignIn);
+                          if (successfulSignIn) {
+                            Navigator.of(context).pushNamed('/home');
+                          }
                        }
                      },
                    ),