Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b80fcca9 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '6287-Improve_oidc_header_logic' into 'main' 

6287-Improve_oidc_header_logic

See merge request !5
parents aac6e37d f7ffe69f

library/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ configurations { 


def versionMajor = 1

def versionMinor = 0

def versionPatch = 7

def versionPatch = 8

def upstreamVersion = "2.17"

def releasePatch = "release"

def libName = "Nextcloud-Android-Library"

library/src/main/java/com/nextcloud/common/OkHttpMethodBase.kt

+0 −5
Original line number Diff line number Diff line
@@ -147,11 +147,6 @@ abstract class OkHttpMethodBase( 
            temp.header(RemoteOperation.OCS_API_HEADER, RemoteOperation.OCS_API_HEADER_VALUE)

        }



        if (nextcloudClient.oidcLoginWithToken) {

            temp.header(RemoteOperation.OIDC_LOGIN_WITH_TOKEN, "true")

            temp.header(RemoteOperation.OCS_API_HEADER, "true")

        }



        applyType(temp)



        val request = temp.build()

library/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java

+0 −3
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import com.nextcloud.common.DNSCache; 
import com.nextcloud.common.NextcloudUriDelegate;

import com.owncloud.android.lib.common.accounts.AccountUtils;

import com.owncloud.android.lib.common.network.RedirectionPath;

import com.owncloud.android.lib.common.operations.RemoteOperation;

import com.owncloud.android.lib.common.utils.Log_OC;



import org.apache.commons.httpclient.Cookie;
@@ -238,8 +237,6 @@ public class OwnCloudClient extends HttpClient { 
    private void addBearerCredentialIfRequired(HttpMethod method) {

        if (credentials instanceof OwnCloudBearerCredentials) {

            method.setRequestHeader("Authorization", "Bearer " + credentials.getAuthToken());

            method.setRequestHeader(RemoteOperation.OIDC_LOGIN_WITH_TOKEN, "true");

            method.setRequestHeader(RemoteOperation.OCS_API_HEADER, "true");

        }

    }

library/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperation.java

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ public abstract class RemoteOperation<T> implements Runnable { 
     * OCS API header value

     */

    public static final String OCS_API_HEADER_VALUE = "true";

    public static final String OIDC_LOGIN_WITH_TOKEN_VALUE = "true";



    public static final String CONTENT_TYPE = "Content-Type";

    public static final String FORM_URLENCODED = "application/x-www-form-urlencoded";