mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-20 03:31:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump tinyoauth2 dependecy and adjust to new api

Browse Source
This commit is contained in:
Armin Schrenk
2022-07-04 17:15:00 +02:00
parent 63cd3a02de
commit 381c1cd8d3
2 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/org/cryptomator/ui/keyloading/hub/AuthFlowTask.java
View File

@@ -2,6 +2,8 @@ package org.cryptomator.ui.keyloading.hub;
import com.google.gson.JsonParser;
import io.github.coffeelibs.tinyoauth2client.AuthFlow;
import io.github.coffeelibs.tinyoauth2client.TinyOAuth2;
import io.github.coffeelibs.tinyoauth2client.http.response.Response;
import javafx.concurrent.Task;
import java.io.IOException;
@@ -28,13 +30,24 @@ class AuthFlowTask extends Task<String> {
@Override
protected String call() throws IOException, InterruptedException {
var response = AuthFlow.asClient(hubConfig.clientId) //
.withSuccessRedirect(URI.create(hubConfig.authSuccessUrl + "&device=" + authFlowContext.deviceId())) //
.withErrorRedirect(URI.create(hubConfig.authErrorUrl + "&device=" + authFlowContext.deviceId())) //
.authorize(URI.create(hubConfig.authEndpoint), redirectUriConsumer) //
.getAccessToken(URI.create(hubConfig.tokenEndpoint));
var json = JsonParser.parseString(response);
var response = TinyOAuth2.client(hubConfig.clientId) //
.withTokenEndpoint(URI.create(hubConfig.tokenEndpoint)) //
.authFlow(URI.create(hubConfig.authEndpoint)) //
.setSuccessResponse(Response.redirect(URI.create(hubConfig.authSuccessUrl + "&device=" + authFlowContext.deviceId()))) //
.setErrorResponse(Response.redirect(URI.create(hubConfig.authErrorUrl + "&device=" + authFlowContext.deviceId()))) //
.authorize(redirectUriConsumer);
if (response.statusCode() != 200) {
throw new NotOkResponseException("Authorization returned status code " + response.statusCode());
}
var json = JsonParser.parseString(response.body());
return json.getAsJsonObject().get("access_token").getAsString();
}
public static class NotOkResponseException extends RuntimeException {
NotOkResponseException(String msg) {
super(msg);
}
}
}