From 8dd2f33b422e12f4a50dfd9158e580eb0e1dee99 Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Wed, 21 Oct 2020 11:52:20 -0700
Subject: [PATCH] App directs user to Login page if not logged in

---
 .../app/src/main/java/com/example/listify/AuthManager.java  | 4 ++++
 .../app/src/main/java/com/example/listify/MainActivity.java | 6 ++++++
 .../src/main/java/com/example/listify/ui/SignupPage.java    | 2 +-
 .../main/java/com/example/listify/ui/home/HomeFragment.java | 3 +++
 Listify/app/src/main/res/layout/activity_code.xml           | 4 ++--
 Listify/app/src/main/res/layout/activity_signup.xml         | 2 +-
 6 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/Listify/app/src/main/java/com/example/listify/AuthManager.java b/Listify/app/src/main/java/com/example/listify/AuthManager.java
index 74096fe..bc3164c 100644
--- a/Listify/app/src/main/java/com/example/listify/AuthManager.java
+++ b/Listify/app/src/main/java/com/example/listify/AuthManager.java
@@ -60,6 +60,10 @@ public class AuthManager {
         return authSession.getUserPoolTokens().getValue().getIdToken();
     }
 
+    public String getEmail() {
+        return email;
+    }
+
     public String getPassword() {
         return password;
     }
diff --git a/Listify/app/src/main/java/com/example/listify/MainActivity.java b/Listify/app/src/main/java/com/example/listify/MainActivity.java
index d56bbee..d18c4f1 100644
--- a/Listify/app/src/main/java/com/example/listify/MainActivity.java
+++ b/Listify/app/src/main/java/com/example/listify/MainActivity.java
@@ -21,6 +21,7 @@ import com.example.listify.data.Item;
 import com.example.listify.data.ItemSearch;
 import com.example.listify.data.List;
 import com.example.listify.data.ListEntry;
+import com.example.listify.ui.LoginPage;
 import com.google.android.material.navigation.NavigationView;
 import static com.example.listify.SplashActivity.showSplash;
 
@@ -52,6 +53,11 @@ public class MainActivity extends AppCompatActivity implements CreateListDialogF
             }, 1);
         }
 
+        if(am.getEmail() == null) {
+            Intent intent = new Intent(MainActivity.this, LoginPage.class);
+            startActivity(intent);
+        }
+
 
         //------------------------------Auth Testing---------------------------------------------//
 
diff --git a/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java b/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java
index c3a691a..a35e678 100644
--- a/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java
+++ b/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java
@@ -76,7 +76,7 @@ public class SignupPage extends AppCompatActivity implements CodePage.CodeDialog
         if(!cancel) {
             try {
                 am.confirmSignUp(code);
-                Intent intent = new Intent(SignupPage.this, MainActivity.class);
+                Intent intent = new Intent(SignupPage.this, LoginPage.class);
                 startActivity(intent);
             }
             catch (Exception e) {
diff --git a/Listify/app/src/main/java/com/example/listify/ui/home/HomeFragment.java b/Listify/app/src/main/java/com/example/listify/ui/home/HomeFragment.java
index 5565af8..fcca309 100644
--- a/Listify/app/src/main/java/com/example/listify/ui/home/HomeFragment.java
+++ b/Listify/app/src/main/java/com/example/listify/ui/home/HomeFragment.java
@@ -68,6 +68,9 @@ public class HomeFragment extends Fragment {
                                 }
                                 Requestor requestor = new Requestor(am, configs.getProperty("apiKey"));
                                 am.deleteUser(requestor);
+
+                                Intent intent = new Intent(getActivity(), com.example.listify.ui.LoginPage.class);
+                                startActivity(intent);
                             }
                             catch (Exception e) {
                                 Log.i("Authentication", e.toString());
diff --git a/Listify/app/src/main/res/layout/activity_code.xml b/Listify/app/src/main/res/layout/activity_code.xml
index 2c06f6a..7b8bd91 100644
--- a/Listify/app/src/main/res/layout/activity_code.xml
+++ b/Listify/app/src/main/res/layout/activity_code.xml
@@ -11,8 +11,8 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:ems="10"
-        android:hint="Code"
-        android:inputType="textPersonName"
+        android:hint=""
+        android:inputType="textPassword"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/Listify/app/src/main/res/layout/activity_signup.xml b/Listify/app/src/main/res/layout/activity_signup.xml
index 6af1bfd..1671732 100644
--- a/Listify/app/src/main/res/layout/activity_signup.xml
+++ b/Listify/app/src/main/res/layout/activity_signup.xml
@@ -33,7 +33,7 @@
         android:layout_marginTop="23dp"
         android:ems="10"
         android:hint="Password"
-        android:inputType="textPersonName"
+        android:inputType="textPassword"
         app:layout_constraintStart_toStartOf="@+id/editTextTextEmailAddress"
         app:layout_constraintTop_toBottomOf="@+id/editTextTextEmailAddress" />