Merge pull request #315 from owncloud/oidc_new_arch

Open Id Connect along with new arch in login

Author: abelgardep

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/accounts/AccountUtils.java

@@ -292,6 +292,8 @@ public static class Constants {
         /**
          * Flag signaling if the ownCloud server can be accessed with OAuth2 access tokens.
          */
+
+        // TODO Please review this constants, move them out of the library, the rest of OAuth variables are in data layer
         public static final String KEY_SUPPORTS_OAUTH2 = "oc_supports_oauth2";
 
         public static final String OAUTH_SUPPORTED_TRUE = "TRUE";
@@ -316,21 +318,6 @@ public static class Constants {
          */
         public static final String KEY_DISPLAY_NAME = "oc_display_name";
 
-        /**
-         * OAuth2 user id
-         **/
-        public static final String KEY_USER_ID = "user_id";
-
-        /**
-         * OAuth2 refresh token
-         **/
-        public static final String KEY_OAUTH2_REFRESH_TOKEN = "oc_oauth2_refresh_token";
-
-        /**
-         * OAuth2 scope
-         */
-        public static final String KEY_OAUTH2_SCOPE = "oc_oauth2_scope";
-
         public static final int ACCOUNT_VERSION = 1;
     }
 }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OAuthConnectionBuilder.kt

@@ -78,14 +78,18 @@ public int execute() throws Exception {
                         .build();
 
             } else if (mResponse != null) {
-                ResponseBody responseBody = ResponseBody.create(
-                        mResponse.body().contentType(),
-                        httpException.getResponseBody()
-                );
-
-                mResponse = mResponse.newBuilder()
-                        .body(responseBody)
-                        .build();
+                // The check below should be included in okhttp library, method ResponseBody.create(
+                // TODO check most recent versions of okhttp to see if this is already fixed and try to update if so
+                if (mResponse.body().contentType() != null) {
+                    ResponseBody responseBody = ResponseBody.create(
+                            mResponse.body().contentType(),
+                            httpException.getResponseBody()
+                    );
+
+                    mResponse = mResponse.newBuilder()
+                            .body(responseBody)
+                            .build();
+                }
             }
 
             return httpException.getCode();

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java

@@ -66,7 +66,7 @@ public class RemoteOperationResult<T>
     private Exception mException = null;
     private ResultCode mCode = ResultCode.UNKNOWN_ERROR;
     private String mRedirectedLocation;
-    private String mAuthenticate;
+    private List<String> mAuthenticate = new ArrayList<>();
     private String mLastPermanentLocation = null;
     private T mData = null;
 
@@ -253,7 +253,9 @@ public RemoteOperationResult(int httpCode, String httpPhrase, Headers headers) {
                     continue;
                 }
                 if ("www-authenticate".equals(header.getKey().toLowerCase())) {
-                    mAuthenticate = header.getValue().get(0).toLowerCase();
+                    for (String value: header.getValue()) {
+                        mAuthenticate.add(value.toLowerCase());
+                    }
                 }
             }
         }
@@ -494,7 +496,7 @@ public boolean isNonSecureRedirection() {
         return (mRedirectedLocation != null && !(mRedirectedLocation.toLowerCase().startsWith("https://")));
     }
 
-    public String getAuthenticateHeaders() {
+    public List<String> getAuthenticateHeaders() {
         return mAuthenticate;
     }