fix verification url generation, rewrite DAG test

This commit is contained in:
Dusan Jakub
2023-09-18 18:29:42 +02:00
parent f300fdb13f
commit fc039750b2
6 changed files with 128 additions and 59 deletions

View File

@@ -13,6 +13,7 @@ import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.UriBuilder;
import jakarta.ws.rs.core.UriInfo;
import org.apache.commons.lang3.StringUtils;
import java.util.List;
@@ -46,6 +47,8 @@ public class OAuthResource {
UsersRepo usersRepo;
@Inject
SessionsRepo sessionsRepo;
@Inject
UriInfo uriInfo;
@GET
@Produces(MediaType.TEXT_HTML)
@@ -102,7 +105,9 @@ public class OAuthResource {
return new DeviceResponse(
sessionsRepo.generateAuthorizationCode(sessionId),
sessionsRepo.generateUserCode(sessionId),
"http://verificationuri/device-login",
uriInfo.getBaseUriBuilder()
.path(OAuthResource.class)
.path(OAuthResource.class, "enterDeviceCode").build(),
10,
180
);

View File

@@ -2,10 +2,12 @@ package com.ysoft.geecon.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.net.URI;
public record DeviceResponse(
@JsonProperty("device_code") String deviceCode,
@JsonProperty("user_code") String userCode,
@JsonProperty("verification_uri") String verificationUri,
@JsonProperty("verification_uri") URI verificationUri,
@JsonProperty("interval") long interval,
@JsonProperty("expires_in") long expiresIn
) {