flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-07 16:06:08 +00:00
Code Issues Releases Wiki Activity

fixed barear authentication

Browse Source
This commit is contained in:
theScrabi 2018-07-24 10:34:38 +02:00 committed by davigonz
parent 096d3b9165
commit c5a1df417f
5 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
View File

@ -52,11 +52,10 @@ public class OwnCloudBasicCredentials implements OwnCloudCredentials {
@Override @Override
public void applyTo(OwnCloudClient client) { public void applyTo(OwnCloudClient client) {
// Clear previous basic credentials // Clear previous basic credentials
HttpClient.deleteHeaderForAllRequests(HttpConstants.BASIC_AUTHORIZATION_HEADER); HttpClient.deleteHeaderForAllRequests(HttpConstants.AUTHORIZATION_HEADER);
HttpClient.deleteHeaderForAllRequests(HttpConstants.BEARER_AUTHORIZATION_HEADER);
HttpClient.deleteHeaderForAllRequests(HttpConstants.COOKIE_HEADER); HttpClient.deleteHeaderForAllRequests(HttpConstants.COOKIE_HEADER);
HttpClient.addHeaderForAllRequests(HttpConstants.BASIC_AUTHORIZATION_HEADER, HttpClient.addHeaderForAllRequests(HttpConstants.AUTHORIZATION_HEADER,
Credentials.basic(mUsername, mPassword)); Credentials.basic(mUsername, mPassword));
} }

6
src/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java
View File

@ -40,11 +40,11 @@ public class OwnCloudBearerCredentials implements OwnCloudCredentials {
@Override @Override
public void applyTo(OwnCloudClient client) { public void applyTo(OwnCloudClient client) {
// Clear previous credentials // Clear previous credentials
HttpClient.deleteHeaderForAllRequests(HttpConstants.BASIC_AUTHORIZATION_HEADER); HttpClient.deleteHeaderForAllRequests(HttpConstants.AUTHORIZATION_HEADER);
HttpClient.deleteHeaderForAllRequests(HttpConstants.BEARER_AUTHORIZATION_HEADER);
HttpClient.deleteHeaderForAllRequests(HttpConstants.COOKIE_HEADER); HttpClient.deleteHeaderForAllRequests(HttpConstants.COOKIE_HEADER);
HttpClient.addHeaderForAllRequests(HttpConstants.BEARER_AUTHORIZATION_HEADER, mAccessToken); HttpClient.addHeaderForAllRequests(HttpConstants.AUTHORIZATION_HEADER,
HttpConstants.BEARER_AUTHORIZATION_KEY + mAccessToken);
} }
@Override @Override

3
src/com/owncloud/android/lib/common/authentication/OwnCloudCredentialsFactory.java
View File

@ -67,8 +67,7 @@ public class OwnCloudCredentialsFactory {
@Override @Override
public void applyTo(OwnCloudClient client) { public void applyTo(OwnCloudClient client) {
// Clear previous basic credentials // Clear previous basic credentials
HttpClient.deleteHeaderForAllRequests(HttpConstants.BASIC_AUTHORIZATION_HEADER); HttpClient.deleteHeaderForAllRequests(HttpConstants.AUTHORIZATION_HEADER);
HttpClient.deleteHeaderForAllRequests(HttpConstants.BEARER_AUTHORIZATION_HEADER);
HttpClient.deleteHeaderForAllRequests(HttpConstants.COOKIE_HEADER); HttpClient.deleteHeaderForAllRequests(HttpConstants.COOKIE_HEADER);
} }

3
src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java
View File

@ -40,8 +40,7 @@ public class OwnCloudSamlSsoCredentials implements OwnCloudCredentials {
@Override @Override
public void applyTo(OwnCloudClient client) { public void applyTo(OwnCloudClient client) {
// Clear previous credentials // Clear previous credentials
HttpClient.deleteHeaderForAllRequests(HttpConstants.BASIC_AUTHORIZATION_HEADER); HttpClient.deleteHeaderForAllRequests(HttpConstants.AUTHORIZATION_HEADER);
HttpClient.deleteHeaderForAllRequests(HttpConstants.BEARER_AUTHORIZATION_HEADER);
HttpClient.deleteHeaderForAllRequests(HttpConstants.COOKIE_HEADER); HttpClient.deleteHeaderForAllRequests(HttpConstants.COOKIE_HEADER);
HttpClient.addHeaderForAllRequests(HttpConstants.COOKIE_HEADER, mSessionCookie); HttpClient.addHeaderForAllRequests(HttpConstants.COOKIE_HEADER, mSessionCookie);

4
src/com/owncloud/android/lib/common/http/HttpConstants.java
View File

@ -33,9 +33,9 @@ public class HttpConstants {
*************************************************** HEADERS *********************************************** *************************************************** HEADERS ***********************************************
***********************************************************************************************************/ ***********************************************************************************************************/
public static final String BASIC_AUTHORIZATION_HEADER = "Authorization"; public static final String AUTHORIZATION_HEADER = "Authorization";
public static final String COOKIE_HEADER = "Cookie"; public static final String COOKIE_HEADER = "Cookie";
public static final String BEARER_AUTHORIZATION_HEADER = "Bearer "; public static final String BEARER_AUTHORIZATION_KEY = "Bearer ";
public static final String USER_AGENT_HEADER = "User-Agent"; public static final String USER_AGENT_HEADER = "User-Agent";
public static final String IF_MATCH_HEADER = "If-Match"; public static final String IF_MATCH_HEADER = "If-Match";
public static final String IF_NONE_MATCH_HEADER = "If-None-Match"; public static final String IF_NONE_MATCH_HEADER = "If-None-Match";