|
|
@@ -425,12 +425,21 @@ public class AuthResource { |
|
|
|
if (!existing.getUuid().equals(sessionAccount.getUuid())) { |
|
|
|
sessionDAO.invalidate(existing.getApiToken()); |
|
|
|
} else { |
|
|
|
markAuthenticated(existing); |
|
|
|
return ok(existing); |
|
|
|
} |
|
|
|
} |
|
|
|
markAuthenticated(sessionAccount); |
|
|
|
return ok(sessionAccount.setApiToken(sessionDAO.create(sessionAccount))); |
|
|
|
} |
|
|
|
|
|
|
|
private void markAuthenticated(Account sessionAccount) { |
|
|
|
final AccountPolicy policy = policyDAO.findSingleByAccount(sessionAccount.getUuid()); |
|
|
|
if (policy.hasVerifiedAuthenticator()) { |
|
|
|
authenticatorService.markAsAuthenticated(sessionAccount.getToken(), policy); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@POST @Path(EP_VERIFY_KEY) |
|
|
|
public Response verifyNodeKey(@Context Request req, |
|
|
|
@Context ContainerRequest ctx, |
|
|
|