AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Use redirect_uri to get access token from OneDrive

Browse Source
This commit is contained in:
Julian Raufelder 2021-01-21 12:10:44 +01:00
parent 559455aac6
commit 24651e9095
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -28,11 +28,11 @@ git submodule init && git submodule update // (not necessary if cloned using --r
./gradlew assembleApkstoreDebug ./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 For build type
* **release**: `ONEDRIVE_API_KEY` or `DROPBOX_API_KEY`. * **release**: `DROPBOX_API_KEY` or `ONEDRIVE_API_KEY` and `ONEDRIVE_API_REDIRCT_URI`
* **debug**: `ONEDRIVE_API_KEY_DEBUG` or `DROPBOX_API_KEY_DEBUG`. * **debug**: `DROPBOX_API_KEY_DEBUG` or `ONEDRIVE_API_KEY_DEBUG` and `ONEDRIVE_API_REDIRCT_URI_DEBUG`
## Contributing to Cryptomator for Android ## Contributing to Cryptomator for Android

2
data/build.gradle
View File

@ -33,10 +33,12 @@ android {
buildTypes { buildTypes {
release { release {
buildConfigField "String", "ONEDRIVE_API_KEY", "\"" + getApiKey('ONEDRIVE_API_KEY') + "\"" buildConfigField "String", "ONEDRIVE_API_KEY", "\"" + getApiKey('ONEDRIVE_API_KEY') + "\""
buildConfigField "String", "ONEDRIVE_API_REDIRCT_URI", "\"" + getApiKey('ONEDRIVE_API_REDIRCT_URI') + "\""
} }
debug { debug {
buildConfigField "String", "ONEDRIVE_API_KEY", "\"" + getApiKey('ONEDRIVE_API_KEY_DEBUG') + "\"" buildConfigField "String", "ONEDRIVE_API_KEY", "\"" + getApiKey('ONEDRIVE_API_KEY_DEBUG') + "\""
buildConfigField "String", "ONEDRIVE_API_REDIRCT_URI", "\"" + getApiKey('ONEDRIVE_API_REDIRCT_URI_DEBUG') + "\""
} }
} }

6
data/src/main/java/org/cryptomator/data/cloud/onedrive/graph/MicrosoftOAuth2Endpoint.java
View File

@ -4,6 +4,8 @@ import android.net.Uri;
import com.microsoft.services.msa.OAuthConfig; import com.microsoft.services.msa.OAuthConfig;
import org.cryptomator.data.BuildConfig;
class MicrosoftOAuth2Endpoint implements OAuthConfig { class MicrosoftOAuth2Endpoint implements OAuthConfig {
/** /**
* The current instance of this class * The current instance of this class
@ -12,7 +14,7 @@ class MicrosoftOAuth2Endpoint implements OAuthConfig {
/** /**
* The current instance of this class * The current instance of this class
* *
* @return The instance * @return The instance
*/ */
static MicrosoftOAuth2Endpoint getInstance() { static MicrosoftOAuth2Endpoint getInstance() {
@ -26,7 +28,7 @@ class MicrosoftOAuth2Endpoint implements OAuthConfig {
@Override @Override
public Uri getDesktopUri() { public Uri getDesktopUri() {
return Uri.parse("urn:ietf:wg:oauth:2.0:oob"); return Uri.parse(BuildConfig.ONEDRIVE_API_REDIRCT_URI);
} }
@Override @Override