Merge branch 'logging-activity-ldap' of s416084/find-my-tutor-android into develop

app/src/main/java/com/uam/wmi/findmytutor/activity/LoginActivity.java

@@ -3,33 +3,20 @@ package com.uam.wmi.findmytutor.activity;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.annotation.TargetApi;
-import android.app.LoaderManager.LoaderCallbacks;
-import android.content.CursorLoader;
 import android.content.Intent;
-import android.content.Loader;
-import android.content.pm.PackageManager;
-import android.database.Cursor;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.provider.ContactsContract;
-import android.support.annotation.NonNull;
 import android.support.design.widget.Snackbar;
 import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.KeyEvent;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.inputmethod.EditorInfo;
-import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Switch;
-import android.widget.TextView;
-import android.widget.ToggleButton;
 
 import com.auth0.android.jwt.Claim;
 import com.auth0.android.jwt.JWT;
@@ -38,208 +25,122 @@ import com.uam.wmi.findmytutor.R;
 import com.uam.wmi.findmytutor.model.JwtToken;
 import com.uam.wmi.findmytutor.model.LdapUser;
 import com.uam.wmi.findmytutor.model.User;
+import com.uam.wmi.findmytutor.model.ValidateUser;
 import com.uam.wmi.findmytutor.network.ApiClient;
 import com.uam.wmi.findmytutor.service.LdapService;
 import com.uam.wmi.findmytutor.service.UserService;
 import com.uam.wmi.findmytutor.utils.PrefUtils;
 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.disposables.CompositeDisposable;
-import io.reactivex.observers.DisposableSingleObserver;
 import io.reactivex.schedulers.Schedulers;
 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.
-    private AutoCompleteTextView mEmailView;
+    private AutoCompleteTextView mLoginNameView;
     private EditText mPasswordView;
     private View mProgressView;
     private View mLoginFormView;
-    private boolean loginOption;
+    private LdapService ldapService;
+    private UserService userService;
+    private CompositeDisposable disposable = new CompositeDisposable();
+    private Boolean isTutor = false;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         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) {
                 attemptLogin();
                 return true;
             }
             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);
         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() {
-        if (mAuthTask != null) {
-            return;
-        }
-
         // Reset errors.
-        mEmailView.setError(null);
+        mLoginNameView.setError(null);
         mPasswordView.setError(null);
 
         // Store values at the time of the login attempt.
-        String email = mEmailView.getText().toString();
+        String loginName = mLoginNameView.getText().toString();
         String password = mPasswordView.getText().toString();
 
         boolean cancel = false;
         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));
             focusView = mPasswordView;
             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) {
-            // There was an error; don't attempt login and focus the first
-            // form field with an error.
             focusView.requestFocus();
         } else {
-            // Show a progress spinner, and kick off a background task to
-            // perform the user login attempt.
             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) {
-        //TODO: Replace this with your own logic
         return password.length() > 4;
     }
 
-    /**
-     * Shows the progress UI and hides the login form.
-     */
     @TargetApi(Build.VERSION_CODES.HONEYCOMB_MR2)
     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);
 
         mLoginFormView.setVisibility(show ? View.GONE : View.VISIBLE);
@@ -259,186 +160,76 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks<
                 mProgressView.setVisibility(show ? View.VISIBLE : View.GONE);
             }
         });
+    }
+
+
+    private void loginProcess(String email, String password) {
+
+        //Fake validate
+        LdapUser user = new LdapUser(email, password, "admin", (isTutor) ? "Tutor" : "Student", "string", "string", email);
+
+
+       // ValidateUser user = new ValidateUser(email, password);
+
+        // LDAP logging
+       // disposable.add(ldapService.validate(user)
+        disposable.add(ldapService.fakeValidate(user)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(this::handleResponse, this::handleError));
+    }
+
+    private void getUserProfile(String userId) {
+        disposable.add(userService.getUserByID(userId)
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(this::saveUserProfileToSharedPreferences, this::handleError));
+    }
+
+    private void showSnackBarMessage(String message) {
+        Snackbar.make(findViewById(R.id.login_form), message, Snackbar.LENGTH_LONG)
+                .show();
+    }
+
+    private void handleResponse(JwtToken jwtToken) {
+        showProgress(false);
+
+        String token = jwtToken.getToken();
+        JWT jwt = new JWT(token);
+        Claim role = jwt.getClaim("nameid");
+
+        Log.e("LOGIN", "SUCCESS " + token);
+
+        PrefUtils.storeIsLoggedIn(getApplicationContext(), true);
+        PrefUtils.storeApiKey(getApplicationContext(), token);
+        PrefUtils.storeUserId(getApplicationContext(), role.asString());
+
+        getUserProfile(role.asString());
+
+        Intent data = new Intent();
+        String txt = "Main Activity";
+        data.setData(Uri.parse(txt));
+        setResult(RESULT_OK, data);
+        finish();
+    }
+
+    private void handleError(Throwable error) {
+        showProgress(false);
+
+        if (error instanceof HttpException) {
+
+            ResponseBody responseBody = ((HttpException) error).response().errorBody();
+            showSnackBarMessage(RestApiHelper.getErrorMessage(responseBody));
+
         } else {
-            // The ViewPropertyAnimator APIs are not available, so simply show
+            showSnackBarMessage("Network Error !");
-            // 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 {
-        String[] PROJECTION = {
-                ContactsContract.CommonDataKinds.Email.ADDRESS,
-                ContactsContract.CommonDataKinds.Email.IS_PRIMARY,
-        };
-
-        int ADDRESS = 0;
-        int IS_PRIMARY = 1;
-    }
-
-    /**
-     * 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) {
-            disposable.add(
-                    userService
-                            .getUserByID(userId)
-                            .subscribeOn(Schedulers.io())
-                            .observeOn(AndroidSchedulers.mainThread())
-                            .subscribeWith(new DisposableSingleObserver<User>() {
-                                @Override
-                                public void onSuccess(User user) {
-                                    Log.e("USER", String.valueOf(user));
-                                    saveUserProfileToSharedPreferences(user);
-
-                                    onPostExecute(true);
-                                }
-
-                                public void onError(Throwable e) {
-                                    ((HttpException) e).code();
-                                    Log.e("Login onError", e.getMessage());
-
-                                    if (e instanceof HttpException) {
-                                        ResponseBody responseBody = ((HttpException) e).response().errorBody();
-                                        Log.e("Login onError", RestApiHelper.getErrorMessage(responseBody));
-                                    }
-
-                                }
-                            }));
-        }
-
-        @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();
-
-                                    JWT jwt = new JWT(token);
-                                    Claim role = jwt.getClaim("nameid");
-
-                                    PrefUtils.storeIsLoggedIn(getApplicationContext(), true);
-                                    PrefUtils.storeApiKey(getApplicationContext(), token);
-                                    PrefUtils.storeUserId(getApplicationContext(), 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();
-                String txt = "Main Activity";
-                data.setData(Uri.parse(txt));
-                setResult(RESULT_OK, data);
-                finish();
-            } else {
-                mPasswordView.setError(getString(R.string.error_incorrect_password));
-                mPasswordView.requestFocus();
-            }
-
-        }
-
-        @Override
-        protected void onCancelled() {
-            mAuthTask = null;
-            showProgress(false);
-        }
-    }
 }
 

app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java

@@ -24,6 +24,7 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
 import com.uam.wmi.findmytutor.R;
 import com.uam.wmi.findmytutor.model.Coordinate;
+import com.uam.wmi.findmytutor.network.ApiClient;
 import com.uam.wmi.findmytutor.network.RetrofitClientInstance;
 import com.uam.wmi.findmytutor.service.BackgroundLocalizationService;
 import com.uam.wmi.findmytutor.service.CoordinateService;
@@ -81,8 +82,9 @@ public class MapActivity extends BaseActivity
             }
         };
 
-        coordinateService = RetrofitClientInstance.createService(CoordinateService.class,"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1laWQiOiJhM2MxMDU1YS1kZDM0LTQ5ZWItYTFkNS0xY2E5YTE2YzY0ODgiLCJzdWIiOiJzdHJpbmciLCJqdGkiOiI4NTA0NDA5NS00NjBkLTQzZDgtYjMxMC0xYmNiNWMxNGExZjQiLCJleHAiOjE1NDMzNTAzMzQsImlzcyI6Imh0dHA6Ly9maW5kbXl0dXRvci5jb20iLCJhdWQiOiJodHRwOi8vZmluZG15dHV0b3IuY29tIn0.xGyu6iBeq9xF0ufBd01jNzILLq1NeYa-5MeVOiPahD8");
+        // fetching coords service
-
+        coordinateService = ApiClient.getClient(getApplicationContext())
+                .create(CoordinateService.class);
         mHandler = new Handler();
         Bundle extras = getIntent().getExtras();
 

app/src/main/java/com/uam/wmi/findmytutor/model/ValidateUser.java

@@ -0,0 +1,94 @@
+package com.uam.wmi.findmytutor.model;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.Objects;
+
+import io.swagger.annotations.ApiModelProperty;
+
+
+/**
+ * ValidateUser
+ */
+
+public class ValidateUser extends BaseResponse {
+    @SerializedName("login")
+    private String login = null;
+
+    @SerializedName("password")
+    private String password = null;;
+
+    public ValidateUser(String login, String password) {
+        this.login = login;
+        this.password = password;
+    }
+
+    public ValidateUser login(String login) {
+        this.login = login;
+        return this;
+    }
+
+    /**
+     * Get login
+     * @return login
+     **/
+    @ApiModelProperty(required = true, value = "")
+    public String getLogin() {
+        return login;
+    }
+
+    public void setLogin(String login) {
+        this.login = login;
+    }
+
+    public ValidateUser password(String password) {
+        this.password = password;
+        return this;
+    }
+
+
+
+    @Override
+    public boolean equals(java.lang.Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        ValidateUser ValidateUser = (ValidateUser) o;
+        return Objects.equals(this.login, ValidateUser.login) &&
+                Objects.equals(this.password, ValidateUser.password);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(login, password);
+    }
+
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class ValidateUser {\n");
+
+        sb.append("    login: ").append(toIndentedString(login)).append("\n");
+        sb.append("    password: ").append(toIndentedString(password)).append("\n");
+
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     */
+    private String toIndentedString(java.lang.Object o) {
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n    ");
+    }
+
+}
+

app/src/main/java/com/uam/wmi/findmytutor/service/LdapService.java

@@ -2,6 +2,7 @@ package com.uam.wmi.findmytutor.service;
 
 import com.uam.wmi.findmytutor.model.JwtToken;
 import com.uam.wmi.findmytutor.model.LdapUser;
+import com.uam.wmi.findmytutor.model.ValidateUser;
 
 import io.reactivex.Single;
 import retrofit2.http.Body;
@@ -15,7 +16,7 @@ public interface LdapService {
     Single<JwtToken> fakeValidate(@Body LdapUser user);
 
     @POST("api/ldap/validate")
-    Single<JwtToken> validate(@Body LdapUser user);
+    Single<JwtToken> validate(@Body ValidateUser user);
 
     @GET("api/ldap/getUserData/{login}")
     Single<LdapUser> getUserDataByLogin(@Path("login") String userLogin);

app/src/main/res/values/strings.xml

@@ -201,4 +201,5 @@ functionality.</string>
     </plurals>
 
     <string name="title_activity_main2">Main2Activity</string>
+    <string name="error_invalid_login_name">Invalid login format</string>
 </resources>