From 1c9983de66a332bb1a87ca0395399960604df344 Mon Sep 17 00:00:00 2001 From: Colin McDonald Date: Sun, 27 Nov 2016 02:06:44 -0500 Subject: [PATCH] Properly create new access tokens --- .../POSTDeploymentUpdateServer.java | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/main/java/net/frozenorb/apiv3/route/deployment/POSTDeploymentUpdateServer.java b/src/main/java/net/frozenorb/apiv3/route/deployment/POSTDeploymentUpdateServer.java index 4f08e41..ce09b73 100644 --- a/src/main/java/net/frozenorb/apiv3/route/deployment/POSTDeploymentUpdateServer.java +++ b/src/main/java/net/frozenorb/apiv3/route/deployment/POSTDeploymentUpdateServer.java @@ -59,27 +59,24 @@ public final class POSTDeploymentUpdateServer implements Handler } Server server = Server.findById(serverId); + AccessToken accessToken = SyncUtils.runBlocking(v -> AccessToken.findByNameAndType(serverId, type, v)); if (server == null) { server = new Server(serverId, displayName, group, ip + ":" + port); - SyncUtils.runBlocking(server::insert); + accessToken = new AccessToken(server); + + SyncUtils.runBlocking(server::insert); + SyncUtils.runBlocking(accessToken::insert); } else { server.setServerIp(ip + ":" + port); server.setLastUpdatedAt(Instant.now()); - SyncUtils.runBlocking(server::save); + SyncUtils.runBlocking(server::save); + + accessToken.setLockedIps(ImmutableList.of(ip)); + accessToken.setLastUpdatedAt(Instant.now()); + SyncUtils.runBlocking(accessToken::save); } - AccessToken accessToken = SyncUtils.runBlocking(v -> AccessToken.findByNameAndType(serverId, type, v)); - - if (accessToken == null) { - ErrorUtils.respondNotFound(ctx, "access token", serverId); - return; - } - - accessToken.setLockedIps(ImmutableList.of(ip)); - accessToken.setLastUpdatedAt(Instant.now()); - - SyncUtils.runBlocking(accessToken::save); ctx.response().end(accessToken.getId()); }