diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
index 72af026..610b1ea 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
@@ -135,6 +135,7 @@ public abstract class BaseActivity
userListFragment = new UsersListFragment();
isTutor = PrefUtils.getIsTutor(getApplicationContext());
+
if (!isTutor) {
navigationView.findViewById(R.id.nav_profile).setVisibility(View.GONE);
}
diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/LoginActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/LoginActivity.java
index 53eb050..301c6fa 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/LoginActivity.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/LoginActivity.java
@@ -33,6 +33,7 @@ import com.uam.wmi.findmytutor.service.UserService;
import com.uam.wmi.findmytutor.utils.PrefUtils;
import com.uam.wmi.findmytutor.utils.RestApiHelper;
+import java.util.Objects;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -72,12 +73,6 @@ public class LoginActivity extends AppCompatActivity {
return false;
});
- Switch tutorLogin = findViewById(R.id.tutor_login_switch);
-
- tutorLogin.setOnCheckedChangeListener((buttonView, isChecked) -> {
- PrefUtils.storeIsTutor(getApplicationContext(), isChecked);
- });
-
Button mEmailSignInButton = findViewById(R.id.email_sign_in_button);
mEmailSignInButton.setOnClickListener(view -> attemptLogin());
@@ -158,17 +153,9 @@ public class LoginActivity extends AppCompatActivity {
private void loginProcess(String email, String password) {
- Log.e("LOGIN", String.valueOf(PrefUtils.getIsTutor(getApplicationContext())));
+ ValidateUser user = new ValidateUser(email, password);
- //Fake validate
- LdapUser user = new LdapUser(email, password, "admin", (PrefUtils.getIsTutor(getApplicationContext())) ? "Tutor" : "Student", "ImiÄ™", "Nazwisko", email);
-
- // ValidateUser user = new ValidateUser(email, password);
-
- // LDAP logging
- // disposable.add(ldapService.validate(user)
-
- disposable.add(ldapService.fakeValidate(user)
+ disposable.add(ldapService.validate(user)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(this::handleResponse, this::handleError));
@@ -192,13 +179,20 @@ public class LoginActivity extends AppCompatActivity {
String token = jwtToken.getToken();
JWT jwt = new JWT(token);
- Claim role = jwt.getClaim("nameid");
+ Claim userId = jwt.getClaim("nameid");
+ Claim role = jwt.getClaim("http://schemas.microsoft.com/ws/2008/06/identity/claims/role");
+
+ if(Objects.requireNonNull(role.asString()).equals("Student")){
+ PrefUtils.storeIsTutor(getApplicationContext(), false);
+ }
+
+ Log.e("LOGOWANIE",role.asString());
PrefUtils.storeIsLoggedIn(getApplicationContext(), true);
PrefUtils.storeApiKey(getApplicationContext(), token);
- PrefUtils.storeUserId(getApplicationContext(), role.asString());
+ PrefUtils.storeUserId(getApplicationContext(), userId.asString());
- getUserProfile(role.asString());
+ getUserProfile(userId.asString());
Intent data = new Intent();
String txt = "Main Activity";
diff --git a/app/src/main/java/com/uam/wmi/findmytutor/utils/PrefUtils.java b/app/src/main/java/com/uam/wmi/findmytutor/utils/PrefUtils.java
index 0982f5a..88a31a4 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/utils/PrefUtils.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/utils/PrefUtils.java
@@ -134,7 +134,7 @@ public class PrefUtils {
}
public static String getLocale(Context context) {
- return getSharedPreferences(context).getString("LOCALE", "pl");
+ return getSharedPreferences(context).getString("LOCALE", "en");
}
public static Boolean isBackgroundLocationServiceRunning(Context context) {
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 0c0e1fe..3b298de 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -72,11 +72,6 @@
-