From 24651e90953f0966f2d4c3cbf134955bda0313bb Mon Sep 17 00:00:00 2001
From: Julian Raufelder <Julian@Raufelder.com>
Date: Thu, 21 Jan 2021 12:10:44 +0100
Subject: [PATCH] Use redirect_uri to get access token from OneDrive

---
 README.md                                                   | 6 +++---
 data/build.gradle                                           | 2 ++
 .../data/cloud/onedrive/graph/MicrosoftOAuth2Endpoint.java  | 6 ++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 9688ee01..48aafde9 100644
--- a/README.md
+++ b/README.md
@@ -28,11 +28,11 @@ git submodule init && git submodule update // (not necessary if cloned using --r
 ./gradlew assembleApkstoreDebug
 ```
 
-Before connecting to Onedrive or Dropbox you have to provide valid API keys using environment variables:   
+Before connecting to OneDrive or Dropbox you have to provide valid API keys using environment variables:   
 For build type
 
-* **release**: `ONEDRIVE_API_KEY` or `DROPBOX_API_KEY`.
-* **debug**: `ONEDRIVE_API_KEY_DEBUG` or `DROPBOX_API_KEY_DEBUG`.
+* **release**: `DROPBOX_API_KEY` or `ONEDRIVE_API_KEY` and  `ONEDRIVE_API_REDIRCT_URI`
+* **debug**: `DROPBOX_API_KEY_DEBUG` or `ONEDRIVE_API_KEY_DEBUG` and `ONEDRIVE_API_REDIRCT_URI_DEBUG`
 
 ## Contributing to Cryptomator for Android
 
diff --git a/data/build.gradle b/data/build.gradle
index 6eb0df5d..d9b3ca1c 100644
--- a/data/build.gradle
+++ b/data/build.gradle
@@ -33,10 +33,12 @@ android {
 	buildTypes {
 		release {
 			buildConfigField "String", "ONEDRIVE_API_KEY", "\"" + getApiKey('ONEDRIVE_API_KEY') + "\""
+			buildConfigField "String", "ONEDRIVE_API_REDIRCT_URI", "\"" + getApiKey('ONEDRIVE_API_REDIRCT_URI') + "\""
 		}
 
 		debug {
 			buildConfigField "String", "ONEDRIVE_API_KEY", "\"" + getApiKey('ONEDRIVE_API_KEY_DEBUG') + "\""
+			buildConfigField "String", "ONEDRIVE_API_REDIRCT_URI", "\"" + getApiKey('ONEDRIVE_API_REDIRCT_URI_DEBUG') + "\""
 		}
 	}
 
diff --git a/data/src/main/java/org/cryptomator/data/cloud/onedrive/graph/MicrosoftOAuth2Endpoint.java b/data/src/main/java/org/cryptomator/data/cloud/onedrive/graph/MicrosoftOAuth2Endpoint.java
index 168bb6de..5adb24a9 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/onedrive/graph/MicrosoftOAuth2Endpoint.java
+++ b/data/src/main/java/org/cryptomator/data/cloud/onedrive/graph/MicrosoftOAuth2Endpoint.java
@@ -4,6 +4,8 @@ import android.net.Uri;
 
 import com.microsoft.services.msa.OAuthConfig;
 
+import org.cryptomator.data.BuildConfig;
+
 class MicrosoftOAuth2Endpoint implements OAuthConfig {
 	/**
 	 * The current instance of this class
@@ -12,7 +14,7 @@ class MicrosoftOAuth2Endpoint implements OAuthConfig {
 
 	/**
 	 * The current instance of this class
-	 * 
+	 *
 	 * @return The instance
 	 */
 	static MicrosoftOAuth2Endpoint getInstance() {
@@ -26,7 +28,7 @@ class MicrosoftOAuth2Endpoint implements OAuthConfig {
 
 	@Override
 	public Uri getDesktopUri() {
-		return Uri.parse("urn:ietf:wg:oauth:2.0:oob");
+		return Uri.parse(BuildConfig.ONEDRIVE_API_REDIRCT_URI);
 	}
 
 	@Override