Login functionality consuming REST API services. This commit closes #10…

…, closes #20 and closes #29
martineq · Sep 27, 2015 · 046f0f3 · 046f0f3
1 parent d8a9178
commit 046f0f3
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 11 deletions.
diff --git a/client/src/Udrive/app/src/main/java/com/fiuba/app/udrive/model/UserAccount.java b/client/src/Udrive/app/src/main/java/com/fiuba/app/udrive/model/UserAccount.java
@@ -6,8 +6,8 @@ public class UserAccount extends UserData implements Serializable {
     private String token = null;
     private int id;
 
-    public UserAccount(final String email, final String password, final String token, int id){
-        super(email, password);
+    public UserAccount(final String email, final String token, int id){
+        super(email, null);
         this.token = token;
         this.id = id; // User ID
     }

diff --git a/client/src/Udrive/app/src/main/java/com/fiuba/app/udrive/model/UserProfile.java b/client/src/Udrive/app/src/main/java/com/fiuba/app/udrive/model/UserProfile.java
@@ -7,8 +7,8 @@ public class UserProfile extends UserData {
     private String lastLocation = null;
     private int id;
 
-    public UserProfile(String email, String password, String firstname, String lastname, String photo, String lastLocation, int id){
-        super(email, password);
+    public UserProfile(String email, String firstname, String lastname, String photo, String lastLocation, int id){
+        super(email, null);
         this.firstname = firstname;
         this.lastname = lastname;
         this.photo = photo;

diff --git a/client/src/Udrive/app/src/main/java/com/fiuba/app/udrive/network/AbstractService.java b/client/src/Udrive/app/src/main/java/com/fiuba/app/udrive/network/AbstractService.java
@@ -2,18 +2,29 @@
 
 import com.squareup.okhttp.OkHttpClient;
 
+import retrofit.RequestInterceptor;
 import retrofit.RestAdapter;
 import retrofit.client.OkClient;
 
 public abstract class AbstractService {
     private static final String BASE_URL = "http://quick-entities.herokuapp.com";
-    private static RestAdapter restAdapter = new RestAdapter.Builder()
+    private static RestAdapter.Builder builder = new RestAdapter.Builder()
                                                     .setEndpoint(BASE_URL)
                                                     .setClient(new OkClient(new OkHttpClient()))
-                                                    .setLogLevel(RestAdapter.LogLevel.FULL).build();
+                                                    .setLogLevel(RestAdapter.LogLevel.FULL);
 
-    protected <T> T createService(Class<T> service) {
-        return restAdapter.create(service);
+
+    protected <T> T createService(Class<T> service, final String token) {
+        if (token != null){
+            builder.setRequestInterceptor(new RequestInterceptor() {
+                @Override
+                public void intercept(RequestFacade request) {
+                    request.addHeader("Accept", "application/json");
+                    request.addHeader("Authorization", token);
+                }
+            });
+        }
+        return builder.build().create(service);
     }
 
 }
diff --git a/client/src/Udrive/app/src/main/java/com/fiuba/app/udrive/network/FilesService.java b/client/src/Udrive/app/src/main/java/com/fiuba/app/udrive/network/FilesService.java
@@ -15,8 +15,8 @@ private interface FilesServiceApi {
 
     private FilesServiceApi mFilesServiceApi;
 
-    public FilesService() {
-        this.mFilesServiceApi = createService(FilesServiceApi.class);
+    public FilesService(final String token) {
+        this.mFilesServiceApi = createService(FilesServiceApi.class, token);
     }
 
     public void getFiles(final ServiceCallback<List<File>> serviceCallback) {

diff --git a/client/src/Udrive/app/src/main/java/com/fiuba/app/udrive/network/LoginService.java b/client/src/Udrive/app/src/main/java/com/fiuba/app/udrive/network/LoginService.java
@@ -25,7 +25,7 @@ private interface LoginServiceApi {
     private LoginServiceApi mLoginServiceApi;
 
     public LoginService() {
-        this.mLoginServiceApi = createService(LoginServiceApi.class);
+        this.mLoginServiceApi = createService(LoginServiceApi.class, null);
     }
 
     public void getToken(/*UserData uData, */final ServiceCallback<UserAccount> uAccountCb){