App directs user to Login page if not logged in

This commit is contained in:
Aaron Sun 2020-10-21 11:52:20 -07:00
parent ff14f59ddd
commit 8dd2f33b42
6 changed files with 17 additions and 4 deletions

View File

@ -60,6 +60,10 @@ public class AuthManager {
return authSession.getUserPoolTokens().getValue().getIdToken(); return authSession.getUserPoolTokens().getValue().getIdToken();
} }
public String getEmail() {
return email;
}
public String getPassword() { public String getPassword() {
return password; return password;
} }

View File

@ -21,6 +21,7 @@ import com.example.listify.data.Item;
import com.example.listify.data.ItemSearch; import com.example.listify.data.ItemSearch;
import com.example.listify.data.List; import com.example.listify.data.List;
import com.example.listify.data.ListEntry; import com.example.listify.data.ListEntry;
import com.example.listify.ui.LoginPage;
import com.google.android.material.navigation.NavigationView; import com.google.android.material.navigation.NavigationView;
import static com.example.listify.SplashActivity.showSplash; import static com.example.listify.SplashActivity.showSplash;
@ -52,6 +53,11 @@ public class MainActivity extends AppCompatActivity implements CreateListDialogF
}, 1); }, 1);
} }
if(am.getEmail() == null) {
Intent intent = new Intent(MainActivity.this, LoginPage.class);
startActivity(intent);
}
//------------------------------Auth Testing---------------------------------------------// //------------------------------Auth Testing---------------------------------------------//

View File

@ -76,7 +76,7 @@ public class SignupPage extends AppCompatActivity implements CodePage.CodeDialog
if(!cancel) { if(!cancel) {
try { try {
am.confirmSignUp(code); am.confirmSignUp(code);
Intent intent = new Intent(SignupPage.this, MainActivity.class); Intent intent = new Intent(SignupPage.this, LoginPage.class);
startActivity(intent); startActivity(intent);
} }
catch (Exception e) { catch (Exception e) {

View File

@ -68,6 +68,9 @@ public class HomeFragment extends Fragment {
} }
Requestor requestor = new Requestor(am, configs.getProperty("apiKey")); Requestor requestor = new Requestor(am, configs.getProperty("apiKey"));
am.deleteUser(requestor); am.deleteUser(requestor);
Intent intent = new Intent(getActivity(), com.example.listify.ui.LoginPage.class);
startActivity(intent);
} }
catch (Exception e) { catch (Exception e) {
Log.i("Authentication", e.toString()); Log.i("Authentication", e.toString());

View File

@ -11,8 +11,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:ems="10" android:ems="10"
android:hint="Code" android:hint=""
android:inputType="textPersonName" android:inputType="textPassword"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

View File

@ -33,7 +33,7 @@
android:layout_marginTop="23dp" android:layout_marginTop="23dp"
android:ems="10" android:ems="10"
android:hint="Password" android:hint="Password"
android:inputType="textPersonName" android:inputType="textPassword"
app:layout_constraintStart_toStartOf="@+id/editTextTextEmailAddress" app:layout_constraintStart_toStartOf="@+id/editTextTextEmailAddress"
app:layout_constraintTop_toBottomOf="@+id/editTextTextEmailAddress" /> app:layout_constraintTop_toBottomOf="@+id/editTextTextEmailAddress" />