Fix loginActivity - there is possibility to use ordinary validate endpoint
This commit is contained in:
parent
d6710a5406
commit
7191fcf6e7
@ -48,11 +48,6 @@
|
|||||||
android:label="@string/title_activity_sharing"
|
android:label="@string/title_activity_sharing"
|
||||||
android:launchMode="singleTop" />
|
android:launchMode="singleTop" />
|
||||||
|
|
||||||
<activity
|
|
||||||
android:name=".activity.UsersListActivity"
|
|
||||||
android:label="@string/title_activity_sharing"
|
|
||||||
android:launchMode="singleTop" />
|
|
||||||
|
|
||||||
<service
|
<service
|
||||||
android:name=".service.BackgroundLocalizationService"
|
android:name=".service.BackgroundLocalizationService"
|
||||||
android:exported="false"
|
android:exported="false"
|
||||||
@ -61,7 +56,7 @@
|
|||||||
/>
|
/>
|
||||||
|
|
||||||
<activity android:name=".activity.ProfileActivity" />
|
<activity android:name=".activity.ProfileActivity" />
|
||||||
<!--<activity android:name=".activity.MapActivity" />-->
|
|
||||||
</application>
|
</application>
|
||||||
|
|
||||||
</manifest>
|
</manifest>
|
||||||
|
@ -3,33 +3,20 @@ package com.uam.wmi.findmytutor.activity;
|
|||||||
import android.animation.Animator;
|
import android.animation.Animator;
|
||||||
import android.animation.AnimatorListenerAdapter;
|
import android.animation.AnimatorListenerAdapter;
|
||||||
import android.annotation.TargetApi;
|
import android.annotation.TargetApi;
|
||||||
import android.app.LoaderManager.LoaderCallbacks;
|
|
||||||
import android.content.CursorLoader;
|
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.Loader;
|
|
||||||
import android.content.pm.PackageManager;
|
|
||||||
import android.database.Cursor;
|
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.os.AsyncTask;
|
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.provider.ContactsContract;
|
|
||||||
import android.support.annotation.NonNull;
|
|
||||||
import android.support.design.widget.Snackbar;
|
import android.support.design.widget.Snackbar;
|
||||||
import android.support.v7.app.AppCompatActivity;
|
import android.support.v7.app.AppCompatActivity;
|
||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
import android.util.Log;
|
|
||||||
import android.view.KeyEvent;
|
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.View.OnClickListener;
|
|
||||||
import android.view.inputmethod.EditorInfo;
|
import android.view.inputmethod.EditorInfo;
|
||||||
import android.widget.ArrayAdapter;
|
|
||||||
import android.widget.AutoCompleteTextView;
|
import android.widget.AutoCompleteTextView;
|
||||||
import android.widget.Button;
|
import android.widget.Button;
|
||||||
import android.widget.EditText;
|
import android.widget.EditText;
|
||||||
|
import android.widget.ProgressBar;
|
||||||
import android.widget.Switch;
|
import android.widget.Switch;
|
||||||
import android.widget.TextView;
|
|
||||||
import android.widget.ToggleButton;
|
|
||||||
|
|
||||||
import com.auth0.android.jwt.Claim;
|
import com.auth0.android.jwt.Claim;
|
||||||
import com.auth0.android.jwt.JWT;
|
import com.auth0.android.jwt.JWT;
|
||||||
@ -44,202 +31,115 @@ import com.uam.wmi.findmytutor.service.UserService;
|
|||||||
import com.uam.wmi.findmytutor.utils.PrefUtils;
|
import com.uam.wmi.findmytutor.utils.PrefUtils;
|
||||||
import com.uam.wmi.findmytutor.utils.RestApiHelper;
|
import com.uam.wmi.findmytutor.utils.RestApiHelper;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.regex.Matcher;
|
||||||
import java.util.List;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
import io.reactivex.android.schedulers.AndroidSchedulers;
|
import io.reactivex.android.schedulers.AndroidSchedulers;
|
||||||
import io.reactivex.disposables.CompositeDisposable;
|
import io.reactivex.disposables.CompositeDisposable;
|
||||||
import io.reactivex.observers.DisposableSingleObserver;
|
|
||||||
import io.reactivex.schedulers.Schedulers;
|
import io.reactivex.schedulers.Schedulers;
|
||||||
import okhttp3.ResponseBody;
|
import okhttp3.ResponseBody;
|
||||||
|
|
||||||
import static android.Manifest.permission.READ_CONTACTS;
|
public class LoginActivity extends AppCompatActivity {
|
||||||
|
|
||||||
/**
|
|
||||||
* A login screen that offers login via email/password.
|
|
||||||
*/
|
|
||||||
public class LoginActivity extends AppCompatActivity implements LoaderCallbacks<Cursor> {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Id to identity READ_CONTACTS permission request.
|
|
||||||
*/
|
|
||||||
private static final int REQUEST_READ_CONTACTS = 0;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A dummy authentication store containing known user names and passwords.
|
|
||||||
* TODO: remove after connecting to a real authentication system.
|
|
||||||
*/
|
|
||||||
private static final String[] DUMMY_CREDENTIALS = new String[]{
|
|
||||||
"adam@o2.pl:adamadam", "foo@example.com:hello", "bar@example.com:world"
|
|
||||||
};
|
|
||||||
/**
|
|
||||||
* Keep track of the login task to ensure we can cancel it if requested.
|
|
||||||
*/
|
|
||||||
private UserLoginTask mAuthTask = null;
|
|
||||||
|
|
||||||
// UI references.
|
// UI references.
|
||||||
private AutoCompleteTextView mEmailView;
|
private AutoCompleteTextView mLoginNameView;
|
||||||
private EditText mPasswordView;
|
private EditText mPasswordView;
|
||||||
private View mProgressView;
|
private View mProgressView;
|
||||||
private View mLoginFormView;
|
private View mLoginFormView;
|
||||||
private boolean loginOption;
|
private LdapService ldapService;
|
||||||
|
private UserService userService;
|
||||||
|
private CompositeDisposable disposable = new CompositeDisposable();
|
||||||
|
private Boolean isTutor = false;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
setContentView(R.layout.activity_login);
|
setContentView(R.layout.activity_login);
|
||||||
// Set up the login form.
|
mLoginNameView = findViewById(R.id.email);
|
||||||
mEmailView = (AutoCompleteTextView) findViewById(R.id.email);
|
|
||||||
populateAutoComplete();
|
|
||||||
|
|
||||||
mPasswordView = (EditText) findViewById(R.id.password);
|
ldapService = ApiClient.getClient(getApplicationContext())
|
||||||
mPasswordView.setOnEditorActionListener(new TextView.OnEditorActionListener() {
|
.create(LdapService.class);
|
||||||
@Override
|
userService = ApiClient.getClient(getApplicationContext())
|
||||||
public boolean onEditorAction(TextView textView, int id, KeyEvent keyEvent) {
|
.create(UserService.class);
|
||||||
|
|
||||||
|
mPasswordView = findViewById(R.id.password);
|
||||||
|
mPasswordView.setOnEditorActionListener((textView, id, keyEvent) -> {
|
||||||
if (id == EditorInfo.IME_ACTION_DONE || id == EditorInfo.IME_NULL) {
|
if (id == EditorInfo.IME_ACTION_DONE || id == EditorInfo.IME_NULL) {
|
||||||
attemptLogin();
|
attemptLogin();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
Switch tutorLogin = (Switch) findViewById(R.id.tutor_login_switch);
|
Switch tutorLogin = findViewById(R.id.tutor_login_switch);
|
||||||
tutorLogin.setOnClickListener(new OnClickListener() {
|
|
||||||
@Override
|
tutorLogin.setOnCheckedChangeListener((buttonView, isChecked) -> {
|
||||||
public void onClick(View view) {
|
PrefUtils.storeIsTutor(getApplicationContext(), isChecked);
|
||||||
loginOption = tutorLogin.isChecked();
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Button mEmailSignInButton = findViewById(R.id.email_sign_in_button);
|
||||||
Button mEmailSignInButton = (Button) findViewById(R.id.email_sign_in_button);
|
mEmailSignInButton.setOnClickListener(view -> attemptLogin());
|
||||||
mEmailSignInButton.setOnClickListener(new OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(View view) {
|
|
||||||
attemptLogin();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
mLoginFormView = findViewById(R.id.login_form);
|
mLoginFormView = findViewById(R.id.login_form);
|
||||||
mProgressView = findViewById(R.id.login_progress);
|
mProgressView = findViewById(R.id.login_progress);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void populateAutoComplete() {
|
|
||||||
if (!mayRequestContacts()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
getLoaderManager().initLoader(0, null, this);
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean mayRequestContacts() {
|
|
||||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
if (checkSelfPermission(READ_CONTACTS) == PackageManager.PERMISSION_GRANTED) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
if (shouldShowRequestPermissionRationale(READ_CONTACTS)) {
|
|
||||||
Snackbar.make(mEmailView, R.string.permission_rationale, Snackbar.LENGTH_INDEFINITE)
|
|
||||||
.setAction(android.R.string.ok, new View.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
@TargetApi(Build.VERSION_CODES.M)
|
|
||||||
public void onClick(View v) {
|
|
||||||
requestPermissions(new String[]{READ_CONTACTS}, REQUEST_READ_CONTACTS);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
requestPermissions(new String[]{READ_CONTACTS}, REQUEST_READ_CONTACTS);
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Callback received when a permissions request has been completed.
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
|
|
||||||
@NonNull int[] grantResults) {
|
|
||||||
if (requestCode == REQUEST_READ_CONTACTS) {
|
|
||||||
if (grantResults.length == 1 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
|
|
||||||
populateAutoComplete();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Attempts to sign in or register the account specified by the login form.
|
|
||||||
* If there are form errors (invalid email, missing fields, etc.), the
|
|
||||||
* errors are presented and no actual login attempt is made.
|
|
||||||
*/
|
|
||||||
private void attemptLogin() {
|
private void attemptLogin() {
|
||||||
if (mAuthTask != null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Reset errors.
|
// Reset errors.
|
||||||
mEmailView.setError(null);
|
mLoginNameView.setError(null);
|
||||||
mPasswordView.setError(null);
|
mPasswordView.setError(null);
|
||||||
|
|
||||||
// Store values at the time of the login attempt.
|
// Store values at the time of the login attempt.
|
||||||
String email = mEmailView.getText().toString();
|
String loginName = mLoginNameView.getText().toString();
|
||||||
String password = mPasswordView.getText().toString();
|
String password = mPasswordView.getText().toString();
|
||||||
|
|
||||||
boolean cancel = false;
|
boolean cancel = false;
|
||||||
View focusView = null;
|
View focusView = null;
|
||||||
|
|
||||||
// Check for a valid password, if the user entered one.
|
// Check for a valid email address.
|
||||||
if (!TextUtils.isEmpty(password) && !isPasswordValid(password)) {
|
if (TextUtils.isEmpty(loginName)) {
|
||||||
|
mLoginNameView.setError(getString(R.string.error_field_required));
|
||||||
|
focusView = mLoginNameView;
|
||||||
|
cancel = true;
|
||||||
|
} else if (!isEmailValid(loginName)) {
|
||||||
|
mLoginNameView.setError(getString(R.string.error_invalid_login_name));
|
||||||
|
focusView = mLoginNameView;
|
||||||
|
cancel = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check for a valid password address.
|
||||||
|
if (TextUtils.isEmpty(password)) {
|
||||||
|
mPasswordView.setError(getString(R.string.error_field_required));
|
||||||
|
focusView = mPasswordView;
|
||||||
|
cancel = true;
|
||||||
|
} else if (!isPasswordValid(password)) {
|
||||||
mPasswordView.setError(getString(R.string.error_invalid_password));
|
mPasswordView.setError(getString(R.string.error_invalid_password));
|
||||||
focusView = mPasswordView;
|
focusView = mPasswordView;
|
||||||
cancel = true;
|
cancel = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check for a valid email address.
|
|
||||||
if (TextUtils.isEmpty(email)) {
|
|
||||||
mEmailView.setError(getString(R.string.error_field_required));
|
|
||||||
focusView = mEmailView;
|
|
||||||
cancel = true;
|
|
||||||
} else if (!isEmailValid(email)) {
|
|
||||||
mEmailView.setError(getString(R.string.error_invalid_email));
|
|
||||||
focusView = mEmailView;
|
|
||||||
cancel = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (cancel) {
|
if (cancel) {
|
||||||
// There was an error; don't attempt login and focus the first
|
|
||||||
// form field with an error.
|
|
||||||
focusView.requestFocus();
|
focusView.requestFocus();
|
||||||
} else {
|
} else {
|
||||||
// Show a progress spinner, and kick off a background task to
|
|
||||||
// perform the user login attempt.
|
|
||||||
showProgress(true);
|
showProgress(true);
|
||||||
mAuthTask = new UserLoginTask(email, password, loginOption);
|
loginProcess(loginName, password);
|
||||||
mAuthTask.execute((Void) null);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean isEmailValid(String email) {
|
private boolean isEmailValid(String loginName) {
|
||||||
//TODO: Replace this with your own logic
|
Pattern pattern = Pattern.compile("^s\\d+");
|
||||||
return email.contains("@");
|
Matcher matcher = pattern.matcher(loginName);
|
||||||
|
return matcher.find();
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean isPasswordValid(String password) {
|
private boolean isPasswordValid(String password) {
|
||||||
//TODO: Replace this with your own logic
|
|
||||||
return password.length() > 4;
|
return password.length() > 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Shows the progress UI and hides the login form.
|
|
||||||
*/
|
|
||||||
@TargetApi(Build.VERSION_CODES.HONEYCOMB_MR2)
|
@TargetApi(Build.VERSION_CODES.HONEYCOMB_MR2)
|
||||||
private void showProgress(final boolean show) {
|
private void showProgress(final boolean show) {
|
||||||
// On Honeycomb MR2 we have the ViewPropertyAnimator APIs, which allow
|
|
||||||
// for very easy animations. If available, use these APIs to fade-in
|
|
||||||
// the progress spinner.
|
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB_MR2) {
|
|
||||||
int shortAnimTime = getResources().getInteger(android.R.integer.config_shortAnimTime);
|
int shortAnimTime = getResources().getInteger(android.R.integer.config_shortAnimTime);
|
||||||
|
|
||||||
mLoginFormView.setVisibility(show ? View.GONE : View.VISIBLE);
|
mLoginFormView.setVisibility(show ? View.GONE : View.VISIBLE);
|
||||||
@ -259,100 +159,16 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks<
|
|||||||
mProgressView.setVisibility(show ? View.VISIBLE : View.GONE);
|
mProgressView.setVisibility(show ? View.VISIBLE : View.GONE);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} else {
|
|
||||||
// The ViewPropertyAnimator APIs are not available, so simply show
|
|
||||||
// and hide the relevant UI components.
|
|
||||||
mProgressView.setVisibility(show ? View.VISIBLE : View.GONE);
|
|
||||||
mLoginFormView.setVisibility(show ? View.GONE : View.VISIBLE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Loader<Cursor> onCreateLoader(int i, Bundle bundle) {
|
|
||||||
return new CursorLoader(this,
|
|
||||||
// Retrieve data rows for the device user's 'profile' contact.
|
|
||||||
Uri.withAppendedPath(ContactsContract.Profile.CONTENT_URI,
|
|
||||||
ContactsContract.Contacts.Data.CONTENT_DIRECTORY), ProfileQuery.PROJECTION,
|
|
||||||
|
|
||||||
// Select only email addresses.
|
|
||||||
ContactsContract.Contacts.Data.MIMETYPE +
|
|
||||||
" = ?", new String[]{ContactsContract.CommonDataKinds.Email
|
|
||||||
.CONTENT_ITEM_TYPE},
|
|
||||||
|
|
||||||
// Show primary email addresses first. Note that there won't be
|
|
||||||
// a primary email address if the user hasn't specified one.
|
|
||||||
ContactsContract.Contacts.Data.IS_PRIMARY + " DESC");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onLoadFinished(Loader<Cursor> cursorLoader, Cursor cursor) {
|
|
||||||
List<String> emails = new ArrayList<>();
|
|
||||||
cursor.moveToFirst();
|
|
||||||
while (!cursor.isAfterLast()) {
|
|
||||||
emails.add(cursor.getString(ProfileQuery.ADDRESS));
|
|
||||||
cursor.moveToNext();
|
|
||||||
}
|
|
||||||
|
|
||||||
addEmailsToAutoComplete(emails);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onLoaderReset(Loader<Cursor> cursorLoader) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private void addEmailsToAutoComplete(List<String> emailAddressCollection) {
|
|
||||||
//Create adapter to tell the AutoCompleteTextView what to show in its dropdown list.
|
|
||||||
ArrayAdapter<String> adapter =
|
|
||||||
new ArrayAdapter<>(LoginActivity.this,
|
|
||||||
android.R.layout.simple_dropdown_item_1line, emailAddressCollection);
|
|
||||||
|
|
||||||
mEmailView.setAdapter(adapter);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private interface ProfileQuery {
|
private void loginProcess(String email, String password) {
|
||||||
String[] PROJECTION = {
|
LdapUser user = new LdapUser(email, password, "admin", (isTutor) ? "Tutor" : "Student", "string", "string", email);
|
||||||
ContactsContract.CommonDataKinds.Email.ADDRESS,
|
|
||||||
ContactsContract.CommonDataKinds.Email.IS_PRIMARY,
|
|
||||||
};
|
|
||||||
|
|
||||||
int ADDRESS = 0;
|
disposable.add(ldapService.fakeValidate(user)
|
||||||
int IS_PRIMARY = 1;
|
.subscribeOn(Schedulers.io())
|
||||||
}
|
.observeOn(AndroidSchedulers.mainThread())
|
||||||
|
.subscribe(this::handleResponse, this::handleError));
|
||||||
/**
|
|
||||||
* Represents an asynchronous login/registration task used to authenticate
|
|
||||||
* the user.
|
|
||||||
*/
|
|
||||||
public class UserLoginTask extends AsyncTask<Void, Void, Boolean> {
|
|
||||||
|
|
||||||
private final String mEmail;
|
|
||||||
private final String mPassword;
|
|
||||||
private boolean isTutor;
|
|
||||||
private LdapService ldapService;
|
|
||||||
private UserService userService;
|
|
||||||
private CompositeDisposable disposable = new CompositeDisposable();
|
|
||||||
private Boolean isAuthorizate;
|
|
||||||
|
|
||||||
// Constructor
|
|
||||||
UserLoginTask(String email, String password, Boolean loginOption) {
|
|
||||||
mEmail = email;
|
|
||||||
mPassword = password;
|
|
||||||
isTutor = loginOption;
|
|
||||||
isAuthorizate = false;
|
|
||||||
ldapService = ApiClient.getClient(getApplicationContext())
|
|
||||||
.create(LdapService.class);
|
|
||||||
userService = ApiClient.getClient(getApplicationContext())
|
|
||||||
.create(UserService.class);
|
|
||||||
|
|
||||||
PrefUtils.storeIsTutor(getApplicationContext(), this.isTutor);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void saveUserProfileToSharedPreferences(User user){
|
|
||||||
PrefUtils.storeUserFirstName(getApplicationContext(), user.getFirstName());
|
|
||||||
PrefUtils.storeUserLastName(getApplicationContext(), user.getLastName());
|
|
||||||
PrefUtils.storeUserName(getApplicationContext(), user.getUserName());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void getUserProfile(String userId) {
|
private void getUserProfile(String userId) {
|
||||||
@ -361,44 +177,18 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks<
|
|||||||
.getUserByID(userId)
|
.getUserByID(userId)
|
||||||
.subscribeOn(Schedulers.io())
|
.subscribeOn(Schedulers.io())
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
.observeOn(AndroidSchedulers.mainThread())
|
||||||
.subscribeWith(new DisposableSingleObserver<User>() {
|
.subscribe(this::saveUserProfileToSharedPreferences, this::handleError));
|
||||||
@Override
|
|
||||||
public void onSuccess(User user) {
|
|
||||||
Log.e("USER", String.valueOf(user));
|
|
||||||
saveUserProfileToSharedPreferences(user);
|
|
||||||
|
|
||||||
onPostExecute(true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onError(Throwable e) {
|
private void showSnackBarMessage(String message) {
|
||||||
((HttpException) e).code();
|
Snackbar.make(findViewById(R.id.login_form), message, Snackbar.LENGTH_LONG)
|
||||||
Log.e("Login onError", e.getMessage());
|
.show();
|
||||||
|
|
||||||
if (e instanceof HttpException) {
|
|
||||||
ResponseBody responseBody = ((HttpException) e).response().errorBody();
|
|
||||||
Log.e("Login onError", RestApiHelper.getErrorMessage(responseBody));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
private void handleResponse(JwtToken jwtToken) {
|
||||||
}));
|
showProgress(false);
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected Boolean doInBackground(Void... params) {
|
|
||||||
LdapUser user = new LdapUser(mEmail, mPassword, "admin", (isTutor) ? "Tutor" : "Student", "string", "string", mEmail);
|
|
||||||
|
|
||||||
disposable.add(
|
|
||||||
ldapService
|
|
||||||
.fakeValidate(user)
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribeWith(new DisposableSingleObserver<JwtToken>() {
|
|
||||||
@Override
|
|
||||||
public void onSuccess(JwtToken jwtToken) {
|
|
||||||
String token = jwtToken.getToken();
|
String token = jwtToken.getToken();
|
||||||
|
|
||||||
//String token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1laWQiOiIzY2QyMWFlYi00ZGRmLTQ0YTktOWM3OC1kNGE3MjVlN2MwNDkiLCJzdWIiOiJhc2RAYXNkc2FkYWEiLCJqdGkiOiIwMDMzYWZhMy0yNDZhLTQ1YTYtOWZmYi1lNzhiYjg3MDMzMmIiLCJleHAiOjE1NDMxMzUwNjAsImlzcyI6Imh0dHA6Ly9maW5kbXl0dXRvci5jb20iLCJhdWQiOiJodHRwOi8vZmluZG15dHV0b3IuY29tIn0.rzks6-yjvVuYoO0pdiBwAfqDnMg8C8XrM9eA4h692m0";
|
|
||||||
|
|
||||||
JWT jwt = new JWT(token);
|
JWT jwt = new JWT(token);
|
||||||
Claim role = jwt.getClaim("nameid");
|
Claim role = jwt.getClaim("nameid");
|
||||||
|
|
||||||
@ -407,40 +197,31 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks<
|
|||||||
PrefUtils.storeUserId(getApplicationContext(), role.asString());
|
PrefUtils.storeUserId(getApplicationContext(), role.asString());
|
||||||
|
|
||||||
getUserProfile(role.asString());
|
getUserProfile(role.asString());
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onError(Throwable e) {
|
|
||||||
Log.e("LoginError", "onError: " + e.getMessage());
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onPostExecute(final Boolean success) {
|
|
||||||
mAuthTask = null;
|
|
||||||
showProgress(false);
|
|
||||||
|
|
||||||
if (success) {
|
|
||||||
Intent data = new Intent();
|
Intent data = new Intent();
|
||||||
String txt = "Main Activity";
|
String txt = "Main Activity";
|
||||||
data.setData(Uri.parse(txt));
|
data.setData(Uri.parse(txt));
|
||||||
setResult(RESULT_OK, data);
|
setResult(RESULT_OK, data);
|
||||||
finish();
|
finish();
|
||||||
} else {
|
|
||||||
mPasswordView.setError(getString(R.string.error_incorrect_password));
|
|
||||||
mPasswordView.requestFocus();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
private void handleError(Throwable error) {
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onCancelled() {
|
|
||||||
mAuthTask = null;
|
|
||||||
showProgress(false);
|
showProgress(false);
|
||||||
}
|
|
||||||
|
if (error instanceof HttpException) {
|
||||||
|
|
||||||
|
ResponseBody responseBody = ((HttpException) error).response().errorBody();
|
||||||
|
showSnackBarMessage(RestApiHelper.getErrorMessage(responseBody));
|
||||||
|
|
||||||
|
} else {
|
||||||
|
showSnackBarMessage("Network Error !");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void saveUserProfileToSharedPreferences(User user) {
|
||||||
|
PrefUtils.storeUserFirstName(getApplicationContext(), user.getFirstName());
|
||||||
|
PrefUtils.storeUserLastName(getApplicationContext(), user.getLastName());
|
||||||
|
PrefUtils.storeUserName(getApplicationContext(), user.getUserName());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -53,8 +53,7 @@ public class UsersListActivity extends Fragment {
|
|||||||
CoordinatorLayout coordinatorLayout;
|
CoordinatorLayout coordinatorLayout;
|
||||||
@BindView(R.id.recycler_view)
|
@BindView(R.id.recycler_view)
|
||||||
RecyclerView recyclerView;
|
RecyclerView recyclerView;
|
||||||
@BindView(R.id.txt_empty_notes_view)
|
|
||||||
TextView noNotesView;
|
|
||||||
|
|
||||||
private UserService userService;
|
private UserService userService;
|
||||||
private TutorTabApi tutorTabService;
|
private TutorTabApi tutorTabService;
|
||||||
@ -184,7 +183,7 @@ public class UsersListActivity extends Fragment {
|
|||||||
.subscribeWith(new DisposableSingleObserver<List<User>>() {
|
.subscribeWith(new DisposableSingleObserver<List<User>>() {
|
||||||
@Override
|
@Override
|
||||||
public void onSuccess(List<User> users) {
|
public void onSuccess(List<User> users) {
|
||||||
toggleEmptyNotes();
|
//toggleEmptyNotes();
|
||||||
tutorsList.clear();
|
tutorsList.clear();
|
||||||
tutorsList.addAll(users);
|
tutorsList.addAll(users);
|
||||||
mAdapter.notifyDataSetChanged();
|
mAdapter.notifyDataSetChanged();
|
||||||
@ -218,13 +217,13 @@ public class UsersListActivity extends Fragment {
|
|||||||
snackbar.show();
|
snackbar.show();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void toggleEmptyNotes() {
|
/* private void toggleEmptyNotes() {
|
||||||
if (tutorsList.size() > 0) {
|
if (tutorsList.size() > 0) {
|
||||||
noNotesView.setVisibility(View.GONE);
|
noNotesView.setVisibility(View.GONE);
|
||||||
} else {
|
} else {
|
||||||
noNotesView.setVisibility(View.VISIBLE);
|
noNotesView.setVisibility(View.VISIBLE);
|
||||||
}
|
}
|
||||||
}
|
}*/
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onDestroy() {
|
public void onDestroy() {
|
||||||
|
@ -1,10 +1,19 @@
|
|||||||
package com.uam.wmi.findmytutor.utils;
|
package com.uam.wmi.findmytutor.utils;
|
||||||
|
|
||||||
|
import android.app.Activity;
|
||||||
|
import android.graphics.Color;
|
||||||
|
import android.support.design.widget.Snackbar;
|
||||||
|
import android.view.View;
|
||||||
|
import android.widget.TextView;
|
||||||
|
|
||||||
|
import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
|
||||||
|
import com.uam.wmi.findmytutor.R;
|
||||||
|
|
||||||
import org.json.JSONObject;
|
import org.json.JSONObject;
|
||||||
|
|
||||||
import okhttp3.ResponseBody;
|
import okhttp3.ResponseBody;
|
||||||
|
|
||||||
public class RestApiHelper {
|
public class RestApiHelper extends Activity {
|
||||||
|
|
||||||
public RestApiHelper() {
|
public RestApiHelper() {
|
||||||
}
|
}
|
||||||
@ -17,4 +26,20 @@ public class RestApiHelper {
|
|||||||
return e.getMessage();
|
return e.getMessage();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public void showError(Throwable e) {
|
||||||
|
String message = e.toString();
|
||||||
|
|
||||||
|
if (e instanceof HttpException) {
|
||||||
|
ResponseBody responseBody = ((HttpException) e).response().errorBody();
|
||||||
|
message = RestApiHelper.getErrorMessage(responseBody);
|
||||||
|
}
|
||||||
|
|
||||||
|
Snackbar snackbar = Snackbar.make(findViewById(R.id.activity_content), message, Snackbar.LENGTH_LONG);
|
||||||
|
View sbView = snackbar.getView();
|
||||||
|
TextView textView = sbView.findViewById(android.support.design.R.id.snackbar_text);
|
||||||
|
textView.setTextColor(Color.BLUE);
|
||||||
|
snackbar.show();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -16,16 +16,6 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent" />
|
android:layout_height="match_parent" />
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/txt_empty_notes_view"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_centerHorizontal="true"
|
|
||||||
android:layout_marginTop="@dimen/margin_top_no_notes"
|
|
||||||
android:fontFamily="sans-serif-light"
|
|
||||||
android:text="@string/there_is_no_users_in_system"
|
|
||||||
android:textColor="@color/msg_no_notes"
|
|
||||||
android:textSize="@dimen/msg_no_notes" />
|
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
|
@ -204,4 +204,5 @@ functionality.</string>
|
|||||||
<string name="userNote">Notatka</string>
|
<string name="userNote">Notatka</string>
|
||||||
<string name="userDutyHoursHeader">Dyżury:</string>
|
<string name="userDutyHoursHeader">Dyżury:</string>
|
||||||
<string name="dutyHours">Dyżury:</string>
|
<string name="dutyHours">Dyżury:</string>
|
||||||
|
<string name="error_invalid_login_name">Invalid format of login. Use s11111 format</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
Loading…
Reference in New Issue
Block a user