Implement Login API, fix #45

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/LoginActivity.java

@@ -32,7 +32,6 @@ import net.openid.appauth.AuthorizationServiceConfiguration;
 
 import in.ac.iitb.gymkhana.iitbapp.api.RetrofitInterface;
 import in.ac.iitb.gymkhana.iitbapp.api.ServiceGenerator;
-import in.ac.iitb.gymkhana.iitbapp.api.model.LoginRequest;
 import in.ac.iitb.gymkhana.iitbapp.api.model.LoginResponse;
 import in.ac.iitb.gymkhana.iitbapp.gcm.RegistrationIntentService;
 import retrofit2.Call;
@@ -45,8 +44,8 @@ public class LoginActivity extends AppCompatActivity {
     public static final String REGISTRATION_COMPLETE = "registrationComplete";
     private static final String TAG = "LoginActivity";
     private static final int PLAY_SERVICES_RESOLUTION_REQUEST = 9000;
-    private final String clientId = "pFcDDWtUUfzlAX2ibriV25lm1J2m92O5ynfT4SYk";
-    private final String clientSecret = "k56GXiN1qB4Dt7CnTVWjuwLJyWntNulitWOkL7Wddr6JHPiHqIZgSfgUplO6neTqumVr32zA14XgQmkuoC8y6y9jnaQT9tKDsq4jQklRb8MQNQglQ1H4YrmqOwPfaNyO";
+    //TODO: Change this to production before launch
+    private final String clientId = "vR1pU7wXWyve1rUkg0fMS6StL1Kr6paoSmRIiLXJ";
     private final Uri redirectUri = Uri.parse("https://redirecturi");
     private final Uri mAuthEndpoint = Uri.parse("http://gymkhana.iitb.ac.in/sso/oauth/authorize/");
     private final Uri mTokenEndpoint = Uri.parse("http://gymkhana.iitb.ac.in/sso/oauth/token/");
@@ -67,26 +66,23 @@ public class LoginActivity extends AppCompatActivity {
             @Override
             public void onReceive(Context context, Intent intent) {
 
-                SharedPreferences sharedPreferences =
-                        PreferenceManager.getDefaultSharedPreferences(context);
-                boolean sentToken = sharedPreferences
-                        .getBoolean(SENT_TOKEN_TO_SERVER, false);
+                SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+                boolean sentToken = sharedPreferences.getBoolean(SENT_TOKEN_TO_SERVER, false);
                 if (sentToken) {
                     String token = intent.getStringExtra("Token");
-
                     Log.d(TAG, "Going to login with :" + authCode + "\n" + token);
                     //************
                     //TODO Remove following 6 lines after the server is hosted
                     String gcmRegId = token;
-                    session.createLoginSession(gcmRegId);
-                    Intent i = new Intent(mContext, MainActivity.class);
-                    i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                    i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                    startActivity(i);
+//                    session.createLoginSession(gcmRegId);
+//                    Intent i = new Intent(mContext, MainActivity.class);
+//                    i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+//                    i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+//                    startActivity(i);
 
 
                     //**************
-                    login(authCode, token);
+                    login(authCode, redirectUri.toString(), gcmRegId);
 
                 } else {
 
@@ -101,8 +97,7 @@ public class LoginActivity extends AppCompatActivity {
             public void onClick(View view) {
                 Log.d(TAG, "Initiating auth");
 
-                AuthorizationServiceConfiguration config =
-                        new AuthorizationServiceConfiguration(mAuthEndpoint, mTokenEndpoint);
+                AuthorizationServiceConfiguration config = new AuthorizationServiceConfiguration(mAuthEndpoint, mTokenEndpoint);
 
                 makeAuthRequest(config);
             }
@@ -121,7 +116,6 @@ public class LoginActivity extends AppCompatActivity {
 
     @Override
     protected void onNewIntent(Intent intent) {
-
         checkIntent(intent);
     }
 
@@ -154,7 +148,7 @@ public class LoginActivity extends AppCompatActivity {
     protected void onResume() {
         super.onResume();
         registerReceiver();
-        Log.d(TAG, "In Resume");
+        Log.d(TAG, "On Resume");
     }
 
     @Override
@@ -196,8 +190,7 @@ public class LoginActivity extends AppCompatActivity {
         }
     }
 
-    private void makeAuthRequest(
-            @NonNull AuthorizationServiceConfiguration serviceConfig) {
+    private void makeAuthRequest(@NonNull AuthorizationServiceConfiguration serviceConfig) {
 
         AuthorizationRequest authRequest = new AuthorizationRequest.Builder(
                 serviceConfig,
@@ -221,7 +214,7 @@ public class LoginActivity extends AppCompatActivity {
                         .build());
     }
 
-    //Todo: Change the color of Chrome custom tabs based on app theme color
+    //TODO: Change the color of Chrome custom tabs based on app theme color
     @TargetApi(Build.VERSION_CODES.M)
     @SuppressWarnings("deprecation")
     private int getCustomTabColor() {
@@ -232,16 +225,14 @@ public class LoginActivity extends AppCompatActivity {
         }
     }
 
-    private void login(String authorizationCode, String gcmId) {
-        final String gcmRegId = gcmId;
-        LoginRequest loginRequest = new LoginRequest(authorizationCode, gcmId);
+    private void login(String authorizationCode, final String redirectURI, String gcmID) {
         RetrofitInterface retrofitInterface = ServiceGenerator.createService(RetrofitInterface.class);
-        retrofitInterface.login(loginRequest).enqueue(new Callback<LoginResponse>() {
+        retrofitInterface.login(authorizationCode, redirectURI, gcmID).enqueue(new Callback<LoginResponse>() {
             @Override
             public void onResponse(Call<LoginResponse> call, Response<LoginResponse> response) {
                 if (response.isSuccessful()) {
                     Log.d(TAG, "Login request successful");
-                    session.createLoginSession(gcmRegId);
+                    session.createLoginSession(redirectURI, response.body().getUser());
                     Intent i = new Intent(mContext, MainActivity.class);
                     i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
                     i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/MainActivity.java

@@ -56,7 +56,7 @@ public class MainActivity extends AppCompatActivity
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         session = new SessionManager(getApplicationContext());
-        Toast.makeText(getApplicationContext(), "User Login Status: " + session.isLoggedIn(), Toast.LENGTH_LONG).show();
+        Toast.makeText(getApplicationContext(), "Log In status: " + session.isLoggedIn(), Toast.LENGTH_LONG).show();
         session.checkLogin();
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
@@ -184,7 +184,7 @@ public class MainActivity extends AppCompatActivity
                         Manifest.permission.ACCESS_FINE_LOCATION)
                         == PackageManager.PERMISSION_GRANTED) {
                     updateFragment(mapFragment);
-                } else{
+                } else {
                     ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, 0);
                 }
                 break;

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/SessionManager.java

@@ -6,10 +6,13 @@ import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.util.Log;
 
+import in.ac.iitb.gymkhana.iitbapp.data.User;
+
 public class SessionManager {
     private static final String PREF_NAME = "LoggedInPref";
-    private static final String IS_LOGIN = "IsLoggedIn";
+    private static final String IS_LOGGED_IN = "IsLoggedIn";
     private static final String GCM_ID = "GcmId";
+    public static final String CURRENT_USER = "current_user";
     SharedPreferences pref;
     Editor editor;
     Context context;
@@ -22,9 +25,7 @@ public class SessionManager {
     }
 
     public void checkLogin() {
-
         if (!this.isLoggedIn()) {
-
             Intent i = new Intent(context, LoginActivity.class);
             // Closing all the Activities
             i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
@@ -32,20 +33,18 @@ public class SessionManager {
             i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             // Staring Login Activity
             context.startActivity(i);
-
-
         }
-
     }
 
-    public void createLoginSession(String gcmId) {
+    public void createLoginSession(String gcmId, User currentUser) {
         Log.d("SessionManager", "GcmId being stored");
-        editor.putBoolean(IS_LOGIN, true);
+        editor.putBoolean(IS_LOGGED_IN, true);
         editor.putString(GCM_ID, gcmId);
+        editor.putString(CURRENT_USER, currentUser.toString());
         editor.commit();
     }
 
     public boolean isLoggedIn() {
-        return pref.getBoolean(IS_LOGIN, false);
+        return pref.getBoolean(IS_LOGGED_IN, false);
     }
 }

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/api/RetrofitInterface.java

@@ -4,7 +4,6 @@ import in.ac.iitb.gymkhana.iitbapp.api.model.EventCreateRequest;
 import in.ac.iitb.gymkhana.iitbapp.api.model.EventCreateResponse;
 import in.ac.iitb.gymkhana.iitbapp.api.model.ImageUploadRequest;
 import in.ac.iitb.gymkhana.iitbapp.api.model.ImageUploadResponse;
-import in.ac.iitb.gymkhana.iitbapp.api.model.LoginRequest;
 import in.ac.iitb.gymkhana.iitbapp.api.model.LoginResponse;
 import in.ac.iitb.gymkhana.iitbapp.api.model.NewsFeedResponse;
 import in.ac.iitb.gymkhana.iitbapp.api.model.NotificationsRequest;
@@ -17,8 +16,8 @@ import retrofit2.http.Path;
 import retrofit2.http.Query;
 
 public interface RetrofitInterface {
-    @POST("login/")
-    Call<LoginResponse> login(@Body LoginRequest loginRequest);
+    @GET("login")
+    Call<LoginResponse> login(@Query("code") String AUTH_CODE, @Query("redir") String redirectURI, @Query("fcm_id") String fcmID);
 
     @POST("events")
     Call<EventCreateResponse> createEvent(@Body EventCreateRequest eventCreateRequest);

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/api/model/LoginRequest.java

-package in.ac.iitb.gymkhana.iitbapp.api.model;
-
-import com.google.gson.annotations.SerializedName;
-
-public class LoginRequest {
-    @SerializedName("AUTHORIZATION_CODE")
-    private String authCode;
-    @SerializedName("reg_id")
-    private String regId;
-
-    public LoginRequest(String authCode, String regId) {
-        this.authCode = authCode;
-        this.regId = regId;
-    }
-
-    public String getAuthCode() {
-        return authCode;
-    }
-
-    public void setAuthCode(String authCode) {
-        this.authCode = authCode;
-    }
-
-    public String getRegId() {
-        return regId;
-    }
-
-    public void setRegId(String regId) {
-        this.regId = regId;
-    }
-}

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/api/model/LoginResponse.java

 package in.ac.iitb.gymkhana.iitbapp.api.model;
 
+import com.google.gson.annotations.SerializedName;
+import in.ac.iitb.gymkhana.iitbapp.data.User;
+
 public class LoginResponse {
-    private String result;
-    private String message;
+    @SerializedName("sessionid")
+    private String sessionID;
+    @SerializedName("user")
+    private int userID;
+    @SerializedName("profile_id")
+    private String profileID;
+    @SerializedName("profile")
+    private User user;
+
+    public LoginResponse(String sessionID, int userID, String profileID, User user) {
+        this.sessionID = sessionID;
+        this.userID = userID;
+        this.profileID = profileID;
+        this.user = user;
+    }
+
+    public String getSessionID() {
+        return sessionID;
+    }
+
+    public void setSessionID(String sessionID) {
+        this.sessionID = sessionID;
+    }
+
+    public int getUserID() {
+        return userID;
+    }
 
-    public LoginResponse(String result, String message) {
-        this.result = result;
-        this.message = message;
+    public void setUserID(int userID) {
+        this.userID = userID;
     }
 
-    public String getResult() {
-        return result;
+    public String getProfileID() {
+        return profileID;
     }
 
-    public void setResult(String result) {
-        this.result = result;
+    public void setProfileID(String profileID) {
+        this.profileID = profileID;
     }
 
-    public String getMessage() {
-        return message;
+    public User getUser() {
+        return user;
     }
 
-    public void setMessage(String message) {
-        this.message = message;
+    public void setUser(User user) {
+        this.user = user;
     }
 }

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/User.java

@@ -4,12 +4,13 @@ import android.arch.persistence.room.ColumnInfo;
 import android.arch.persistence.room.Entity;
 import android.arch.persistence.room.PrimaryKey;
 
+import com.google.gson.Gson;
 import com.google.gson.annotations.SerializedName;
 
 import java.util.List;
 
 @Entity(tableName = "users")
-class User {
+public class User {
     @PrimaryKey(autoGenerate = true)
     int db_id;
 
@@ -160,4 +161,13 @@ class User {
     public void setUserFollowedBodiesID(List<String> userFollowedBodiesID) {
         this.userFollowedBodiesID = userFollowedBodiesID;
     }
+
+    @Override
+    public String toString() {
+        return new Gson().toJson(this);
+    }
+
+    public static User fromString(String json) {
+        return new Gson().fromJson(json, User.class);
+    }
 }