From 968ceb1a1d9f631c596fb7b6266e7dd85b194ad7 Mon Sep 17 00:00:00 2001 From: Colin McDonald Date: Wed, 29 Jun 2016 21:23:37 -0400 Subject: [PATCH] Modify APIv3#respondJson to not have default status code --- src/main/java/net/frozenorb/apiv3/APIv3.java | 8 +++--- .../frozenorb/apiv3/auditLog/AuditLog.java | 13 ++-------- .../apiv3/dataImport/V2Importer.java | 8 +++--- .../apiv3/handler/MetricsHandler.java | 25 +++++++++++-------- .../java/net/frozenorb/apiv3/model/User.java | 14 +++++------ .../frozenorb/apiv3/route/GETDumpsType.java | 12 ++++----- .../net/frozenorb/apiv3/route/GETWhoAmI.java | 2 +- .../accessTokens/DELETEAccessTokensId.java | 4 +-- .../route/accessTokens/GETAccessTokens.java | 2 +- .../route/accessTokens/GETAccessTokensId.java | 2 +- .../route/accessTokens/POSTAccessTokens.java | 2 +- .../route/auditLog/DELETEAuditLogId.java | 4 +-- .../apiv3/route/auditLog/GETAuditLog.java | 2 +- .../apiv3/route/auditLog/POSTAuditLog.java | 2 +- .../route/bannedAsns/DELETEBannedAsnsId.java | 4 +-- .../apiv3/route/bannedAsns/GETBannedAsns.java | 2 +- .../route/bannedAsns/GETBannedAsnsId.java | 2 +- .../route/bannedAsns/POSTBannedAsns.java | 4 +-- .../DELETEBannedCellCarriersId.java | 4 +-- .../GETBannedCellCarriers.java | 2 +- .../GETBannedCellCarriersId.java | 2 +- .../POSTBannedCellCarriers.java | 4 +-- .../route/chatFilterList/GETChatFilter.java | 2 +- .../emailTokens/GETEmailTokensIdOwner.java | 2 +- .../emailTokens/POSTEmailTokensIdConfirm.java | 4 +-- .../apiv3/route/grants/DELETEGrantsId.java | 4 +-- .../apiv3/route/grants/GETGrants.java | 2 +- .../apiv3/route/grants/GETGrantsId.java | 2 +- .../apiv3/route/grants/POSTGrants.java | 4 +-- .../apiv3/route/ipBans/DELETEIpBansId.java | 2 +- .../apiv3/route/ipBans/GETIpBans.java | 2 +- .../apiv3/route/ipBans/GETIpBansId.java | 2 +- .../apiv3/route/ipBans/POSTIpBans.java | 4 +-- .../apiv3/route/ipIntel/GETIpInteld.java | 2 +- .../apiv3/route/ipLog/GETIpLogId.java | 2 +- .../DELETENotificationTemplatesId.java | 4 +-- .../GETNotificationTemplates.java | 2 +- .../GETNotificationTemplatesId.java | 2 +- .../POSTNotificationTemplates.java | 4 +-- .../route/phoneIntel/GETPhoneInteld.java | 2 +- .../punishments/DELETEPunishmentsId.java | 2 +- .../DELETEUsersIdActivePunishment.java | 4 +-- .../route/punishments/GETPunishments.java | 2 +- .../route/punishments/GETPunishmentsId.java | 2 +- .../route/punishments/POSTPunishments.java | 8 +++--- .../apiv3/route/ranks/DELETERanksId.java | 4 +-- .../frozenorb/apiv3/route/ranks/GETRanks.java | 2 +- .../apiv3/route/ranks/GETRanksId.java | 2 +- .../apiv3/route/ranks/POSTRanks.java | 4 +-- .../serverGroups/DELETEServerGroupsId.java | 4 +-- .../route/serverGroups/GETServerGroups.java | 2 +- .../route/serverGroups/GETServerGroupsId.java | 2 +- .../route/serverGroups/POSTServerGroups.java | 4 +-- .../apiv3/route/servers/DELETEServersId.java | 4 +-- .../apiv3/route/servers/GETServers.java | 2 +- .../apiv3/route/servers/GETServersId.java | 2 +- .../apiv3/route/servers/POSTServers.java | 4 +-- .../route/servers/POSTServersHeartbeat.java | 16 ++++++------ .../frozenorb/apiv3/route/users/GETStaff.java | 2 +- .../apiv3/route/users/GETUsersId.java | 2 +- .../GETUsersIdCompoundedPermissions.java | 2 +- .../apiv3/route/users/GETUsersIdDetails.java | 2 +- .../route/users/GETUsersIdRequiresTotp.java | 2 +- .../route/users/GETUsersIdVerifyPassword.java | 2 +- .../users/POSTUsersIdChangePassword.java | 6 ++--- .../route/users/POSTUsersIdConfirmPhone.java | 2 +- .../apiv3/route/users/POSTUsersIdLeave.java | 4 +-- .../apiv3/route/users/POSTUsersIdLogin.java | 4 +-- .../apiv3/route/users/POSTUsersIdNotify.java | 2 +- .../route/users/POSTUsersIdPasswordReset.java | 2 +- .../route/users/POSTUsersIdRegisterEmail.java | 2 +- .../route/users/POSTUsersIdRegisterPhone.java | 2 +- .../route/users/POSTUsersIdSetupTotp.java | 2 +- .../route/users/POSTUsersIdVerifyTotp.java | 2 +- ...allback.java => MongoToVertxCallback.java} | 4 +-- .../net/frozenorb/apiv3/util/EmailUtils.java | 4 +-- .../net/frozenorb/apiv3/util/ErrorUtils.java | 2 +- .../net/frozenorb/apiv3/util/PhoneUtils.java | 5 ++-- .../net/frozenorb/apiv3/util/TotpUtils.java | 20 +++------------ 79 files changed, 148 insertions(+), 169 deletions(-) rename src/main/java/net/frozenorb/apiv3/unsorted/{FutureCompatibilityCallback.java => MongoToVertxCallback.java} (72%) diff --git a/src/main/java/net/frozenorb/apiv3/APIv3.java b/src/main/java/net/frozenorb/apiv3/APIv3.java index f1789db..a2926d1 100644 --- a/src/main/java/net/frozenorb/apiv3/APIv3.java +++ b/src/main/java/net/frozenorb/apiv3/APIv3.java @@ -129,6 +129,8 @@ public final class APIv3 extends AbstractVerticle { converter.startImport((ignored, error) -> { if (error != null) { error.printStackTrace(); + } else { + log.info("Finished conversion!"); } });*/ } @@ -351,16 +353,12 @@ public final class APIv3 extends AbstractVerticle { webServer.requestHandler(http::accept).listen(port); } - public static void respondJson(RoutingContext ctx, Object response) { - respondJson(ctx, 200, response); - } - public static void respondJson(RoutingContext ctx, int code, Object response) { ctx.response().putHeader(HttpHeaders.CONTENT_TYPE, MediaType.JSON_UTF_8.toString()); ctx.response().setStatusCode(code); if (!ctx.request().path().contains("dumps")) { - log.info(gson.toJson(response)); + //log.info(gson.toJson(response)); } ctx.response().end(gson.toJson(response)); diff --git a/src/main/java/net/frozenorb/apiv3/auditLog/AuditLog.java b/src/main/java/net/frozenorb/apiv3/auditLog/AuditLog.java index c4853ed..9bc8e21 100644 --- a/src/main/java/net/frozenorb/apiv3/auditLog/AuditLog.java +++ b/src/main/java/net/frozenorb/apiv3/auditLog/AuditLog.java @@ -4,7 +4,6 @@ import com.google.common.collect.ImmutableMap; import com.mongodb.async.SingleResultCallback; import io.vertx.ext.web.RoutingContext; import lombok.experimental.UtilityClass; -import net.frozenorb.apiv3.actor.Actor; import net.frozenorb.apiv3.model.AuditLogEntry; import java.util.Map; @@ -14,19 +13,11 @@ import java.util.UUID; public class AuditLog { public static void log(UUID performedBy, String performedByIp, RoutingContext ctx, AuditLogActionType actionType, SingleResultCallback callback) { - log(performedBy, performedByIp, ctx.get("actor"), ctx.request().remoteAddress().host(), actionType, ImmutableMap.of(), callback); + log(performedBy, performedByIp, ctx, actionType, ImmutableMap.of(), callback); } public static void log(UUID performedBy, String performedByIp, RoutingContext ctx, AuditLogActionType actionType, Map actionData, SingleResultCallback callback) { - log(performedBy, performedByIp, ctx.get("actor"), ctx.request().remoteAddress().host(), actionType, actionData, callback); - } - - public static void log(UUID performedBy, String performedByIp, Actor actor, String actorIp, AuditLogActionType actionType, SingleResultCallback callback) { - log(performedBy, performedByIp, actor, actorIp, actionType, ImmutableMap.of(), callback); - } - - public static void log(UUID performedBy, String performedByIp, Actor actor, String actorIp, AuditLogActionType actionType, Map actionData, SingleResultCallback callback) { - AuditLogEntry entry = new AuditLogEntry(performedBy, performedByIp, actor,actorIp, actionType, actionData); + AuditLogEntry entry = new AuditLogEntry(performedBy, performedByIp, ctx.get("actor"), ctx.request().remoteAddress().host(), actionType, actionData); entry.insert((ignored, error) -> { if (error != null) { callback.onResult(null, error); diff --git a/src/main/java/net/frozenorb/apiv3/dataImport/V2Importer.java b/src/main/java/net/frozenorb/apiv3/dataImport/V2Importer.java index 3bd261f..83f346d 100644 --- a/src/main/java/net/frozenorb/apiv3/dataImport/V2Importer.java +++ b/src/main/java/net/frozenorb/apiv3/dataImport/V2Importer.java @@ -10,7 +10,7 @@ import net.frozenorb.apiv3.dataImport.converters.GrantConverter; import net.frozenorb.apiv3.dataImport.converters.IpLogConverter; import net.frozenorb.apiv3.dataImport.converters.PunishmentConverter; import net.frozenorb.apiv3.dataImport.converters.UserConverter; -import net.frozenorb.apiv3.unsorted.FutureCompatibilityCallback; +import net.frozenorb.apiv3.unsorted.MongoToVertxCallback; import org.bson.types.ObjectId; import java.util.HashMap; @@ -39,9 +39,9 @@ public final class V2Importer { Future grantsFuture = Future.future(); Future ipLogFuture = Future.future(); - importFrom.getCollection("punishment").find().forEach(new PunishmentConverter(oidToUniqueId), new FutureCompatibilityCallback<>(punishmentsFuture)); - importFrom.getCollection("grant").find().forEach(new GrantConverter(oidToUniqueId), new FutureCompatibilityCallback<>(grantsFuture)); - importFrom.getCollection("iplog").find().forEach(new IpLogConverter(oidToUniqueId), new FutureCompatibilityCallback<>(ipLogFuture)); + importFrom.getCollection("punishment").find().forEach(new PunishmentConverter(oidToUniqueId), new MongoToVertxCallback<>(punishmentsFuture)); + importFrom.getCollection("grant").find().forEach(new GrantConverter(oidToUniqueId), new MongoToVertxCallback<>(grantsFuture)); + importFrom.getCollection("iplog").find().forEach(new IpLogConverter(oidToUniqueId), new MongoToVertxCallback<>(ipLogFuture)); CompositeFuture.all(punishmentsFuture, grantsFuture, ipLogFuture).setHandler((result) -> { if (result.succeeded()) { diff --git a/src/main/java/net/frozenorb/apiv3/handler/MetricsHandler.java b/src/main/java/net/frozenorb/apiv3/handler/MetricsHandler.java index 4fe3013..73fe81b 100644 --- a/src/main/java/net/frozenorb/apiv3/handler/MetricsHandler.java +++ b/src/main/java/net/frozenorb/apiv3/handler/MetricsHandler.java @@ -5,6 +5,7 @@ import io.vertx.ext.web.RoutingContext; import io.vertx.redis.RedisClient; import io.vertx.redis.RedisOptions; import net.frozenorb.apiv3.APIv3; +import net.frozenorb.apiv3.actor.Actor; public final class MetricsHandler implements Handler { @@ -19,19 +20,21 @@ public final class MetricsHandler implements Handler { redisClient.incr("apiv3:requests:total", (totalUpdateResult) -> { if (totalUpdateResult.failed()) { totalUpdateResult.cause().printStackTrace(); - } else { - redisClient.incr("apiv3:requests:method:" + ctx.request().method(), (methodUpdateResult) -> { - if (methodUpdateResult.failed()) { - methodUpdateResult.cause().printStackTrace(); - } else { - redisClient.incr("apiv3:requests:actor:" + ctx.get("actor").getClass().getSimpleName(), (actorUpdateResult) -> { - if (actorUpdateResult.failed()) { - actorUpdateResult.cause().printStackTrace(); - } - }); + return; + } + + redisClient.incr("apiv3:requests:method:" + ctx.request().method(), (methodUpdateResult) -> { + if (methodUpdateResult.failed()) { + methodUpdateResult.cause().printStackTrace(); + return; + } + + redisClient.incr("apiv3:requests:actor:" + ((Actor) ctx.get("actor")).getType(), (actorUpdateResult) -> { + if (actorUpdateResult.failed()) { + actorUpdateResult.cause().printStackTrace(); } }); - } + }); }); ctx.next(); diff --git a/src/main/java/net/frozenorb/apiv3/model/User.java b/src/main/java/net/frozenorb/apiv3/model/User.java index a3ce99a..ab0dd15 100644 --- a/src/main/java/net/frozenorb/apiv3/model/User.java +++ b/src/main/java/net/frozenorb/apiv3/model/User.java @@ -24,7 +24,7 @@ import net.frozenorb.apiv3.maxmind.MaxMindUserType; import net.frozenorb.apiv3.serialization.gson.ExcludeFromReplies; import net.frozenorb.apiv3.serialization.jackson.UuidJsonDeserializer; import net.frozenorb.apiv3.serialization.jackson.UuidJsonSerializer; -import net.frozenorb.apiv3.unsorted.FutureCompatibilityCallback; +import net.frozenorb.apiv3.unsorted.MongoToVertxCallback; import net.frozenorb.apiv3.unsorted.Permissions; import net.frozenorb.apiv3.unsorted.RequiresTotpResult; import net.frozenorb.apiv3.unsorted.TotpAuthorizationResult; @@ -214,17 +214,17 @@ public final class User { Punishment.PunishmentType.BLACKLIST, Punishment.PunishmentType.BAN, Punishment.PunishmentType.MUTE - ), new FutureCompatibilityCallback<>(punishmentsFuture)); + ), new MongoToVertxCallback<>(punishmentsFuture)); if (userIp != null) { - IpIntel.findOrCreateById(userIp, new FutureCompatibilityCallback<>(ipIntelFuture)); - IpBan.findByIp(userIp, new FutureCompatibilityCallback<>(ipBansFuture)); + IpIntel.findOrCreateById(userIp, new MongoToVertxCallback<>(ipIntelFuture)); + IpBan.findByIp(userIp, new MongoToVertxCallback<>(ipBansFuture)); } else { ipIntelFuture.complete(null); ipBansFuture.complete(ImmutableList.of()); } - Grant.findByUser(this, new FutureCompatibilityCallback<>(grantsFuture)); + Grant.findByUser(this, new MongoToVertxCallback<>(grantsFuture)); CompositeFuture.all(punishmentsFuture, ipIntelFuture, ipBansFuture, grantsFuture).setHandler((result) -> { if (result.succeeded()) { @@ -456,8 +456,8 @@ public final class User { Future markPreAuthFuture = Future.future(); Future markRecentlyUsedFuture = Future.future(); - TotpUtils.markPreAuthorized(this, ip, 3, TimeUnit.DAYS, new FutureCompatibilityCallback<>(markPreAuthFuture)); - TotpUtils.markRecentlyUsed(this, code, new FutureCompatibilityCallback<>(markRecentlyUsedFuture)); + TotpUtils.markPreAuthorized(this, ip, 3, TimeUnit.DAYS, new MongoToVertxCallback<>(markPreAuthFuture)); + TotpUtils.markRecentlyUsed(this, code, new MongoToVertxCallback<>(markRecentlyUsedFuture)); CompositeFuture.all(markPreAuthFuture, markRecentlyUsedFuture).setHandler((result) -> { if (result.failed()) { diff --git a/src/main/java/net/frozenorb/apiv3/route/GETDumpsType.java b/src/main/java/net/frozenorb/apiv3/route/GETDumpsType.java index 95609ee..070d1be 100644 --- a/src/main/java/net/frozenorb/apiv3/route/GETDumpsType.java +++ b/src/main/java/net/frozenorb/apiv3/route/GETDumpsType.java @@ -33,7 +33,7 @@ public final class GETDumpsType implements Handler { for (Punishment punishment : punishments) { if (!punishment.isActive()) { - return; + continue; } if (punishment.getType() == Punishment.PunishmentType.BAN) { @@ -57,7 +57,7 @@ public final class GETDumpsType implements Handler { for (Grant grant : grants) { if (!grant.isActive()) { - return; + continue; } List users = grantCache.get(grant.getRank()); @@ -80,10 +80,10 @@ public final class GETDumpsType implements Handler { switch (dumpType.toLowerCase()) { case "ban": - APIv3.respondJson(ctx, banCache); + APIv3.respondJson(ctx, 200, banCache); return; case "blacklist": - APIv3.respondJson(ctx, blacklistCache); + APIv3.respondJson(ctx, 200, blacklistCache); return; case "accessdeniable": // Lowercase d because we convert to lowercase above List result = new LinkedList<>(); @@ -91,10 +91,10 @@ public final class GETDumpsType implements Handler { result.addAll(banCache); result.addAll(blacklistCache); - APIv3.respondJson(ctx, result); + APIv3.respondJson(ctx, 200, result); return; case "grant": - APIv3.respondJson(ctx, grantCache); + APIv3.respondJson(ctx, 200, grantCache); return; default: ErrorUtils.respondInvalidInput(ctx, dumpType + " is not a valid type. Not in [ban, blacklist, accessDeniable, grant]"); diff --git a/src/main/java/net/frozenorb/apiv3/route/GETWhoAmI.java b/src/main/java/net/frozenorb/apiv3/route/GETWhoAmI.java index 042ed19..9d9530c 100644 --- a/src/main/java/net/frozenorb/apiv3/route/GETWhoAmI.java +++ b/src/main/java/net/frozenorb/apiv3/route/GETWhoAmI.java @@ -11,7 +11,7 @@ public final class GETWhoAmI implements Handler { public void handle(RoutingContext ctx) { Actor actor = ctx.get("actor"); - APIv3.respondJson(ctx, ImmutableMap.of( + APIv3.respondJson(ctx, 200, ImmutableMap.of( "name", actor.getName(), "type", actor.getType(), "authorized", actor.isAuthorized() diff --git a/src/main/java/net/frozenorb/apiv3/route/accessTokens/DELETEAccessTokensId.java b/src/main/java/net/frozenorb/apiv3/route/accessTokens/DELETEAccessTokensId.java index c115f8f..73968a6 100644 --- a/src/main/java/net/frozenorb/apiv3/route/accessTokens/DELETEAccessTokensId.java +++ b/src/main/java/net/frozenorb/apiv3/route/accessTokens/DELETEAccessTokensId.java @@ -37,11 +37,11 @@ public final class DELETEAccessTokensId implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, accessToken); + APIv3.respondJson(ctx, 200, accessToken); } }); } else { - APIv3.respondJson(ctx, accessToken); + APIv3.respondJson(ctx, 200, accessToken); } } diff --git a/src/main/java/net/frozenorb/apiv3/route/accessTokens/GETAccessTokens.java b/src/main/java/net/frozenorb/apiv3/route/accessTokens/GETAccessTokens.java index b13f8fc..5575274 100644 --- a/src/main/java/net/frozenorb/apiv3/route/accessTokens/GETAccessTokens.java +++ b/src/main/java/net/frozenorb/apiv3/route/accessTokens/GETAccessTokens.java @@ -35,7 +35,7 @@ public final class GETAccessTokens implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, accessTokens); + APIv3.respondJson(ctx, 200, accessTokens); } }); } diff --git a/src/main/java/net/frozenorb/apiv3/route/accessTokens/GETAccessTokensId.java b/src/main/java/net/frozenorb/apiv3/route/accessTokens/GETAccessTokensId.java index 08e26f3..4c6d7b3 100644 --- a/src/main/java/net/frozenorb/apiv3/route/accessTokens/GETAccessTokensId.java +++ b/src/main/java/net/frozenorb/apiv3/route/accessTokens/GETAccessTokensId.java @@ -13,7 +13,7 @@ public final class GETAccessTokensId implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, accessToken); + APIv3.respondJson(ctx, 200, accessToken); } }); } diff --git a/src/main/java/net/frozenorb/apiv3/route/accessTokens/POSTAccessTokens.java b/src/main/java/net/frozenorb/apiv3/route/accessTokens/POSTAccessTokens.java index 3852256..8f327d2 100644 --- a/src/main/java/net/frozenorb/apiv3/route/accessTokens/POSTAccessTokens.java +++ b/src/main/java/net/frozenorb/apiv3/route/accessTokens/POSTAccessTokens.java @@ -52,7 +52,7 @@ public final class POSTAccessTokens implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, accessToken); + APIv3.respondJson(ctx, 200, accessToken); } }); } diff --git a/src/main/java/net/frozenorb/apiv3/route/auditLog/DELETEAuditLogId.java b/src/main/java/net/frozenorb/apiv3/route/auditLog/DELETEAuditLogId.java index 738973f..25403d5 100644 --- a/src/main/java/net/frozenorb/apiv3/route/auditLog/DELETEAuditLogId.java +++ b/src/main/java/net/frozenorb/apiv3/route/auditLog/DELETEAuditLogId.java @@ -41,11 +41,11 @@ public final class DELETEAuditLogId implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, auditLogEntry); + APIv3.respondJson(ctx, 200, auditLogEntry); } }); } else { - APIv3.respondJson(ctx, auditLogEntry); + APIv3.respondJson(ctx, 200, auditLogEntry); } } diff --git a/src/main/java/net/frozenorb/apiv3/route/auditLog/GETAuditLog.java b/src/main/java/net/frozenorb/apiv3/route/auditLog/GETAuditLog.java index dee547b..6cef693 100644 --- a/src/main/java/net/frozenorb/apiv3/route/auditLog/GETAuditLog.java +++ b/src/main/java/net/frozenorb/apiv3/route/auditLog/GETAuditLog.java @@ -19,7 +19,7 @@ public final class GETAuditLog implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, auditLog); + APIv3.respondJson(ctx, 200, auditLog); } }); } catch (NumberFormatException ignored) { diff --git a/src/main/java/net/frozenorb/apiv3/route/auditLog/POSTAuditLog.java b/src/main/java/net/frozenorb/apiv3/route/auditLog/POSTAuditLog.java index f6948ba..0cb4997 100644 --- a/src/main/java/net/frozenorb/apiv3/route/auditLog/POSTAuditLog.java +++ b/src/main/java/net/frozenorb/apiv3/route/auditLog/POSTAuditLog.java @@ -46,7 +46,7 @@ public final class POSTAuditLog implements Handler { if (error2 != null) { ErrorUtils.respondInternalError(ctx, error2); } else { - APIv3.respondJson(ctx, auditLogEntry); + APIv3.respondJson(ctx, 200, auditLogEntry); } }); }); diff --git a/src/main/java/net/frozenorb/apiv3/route/bannedAsns/DELETEBannedAsnsId.java b/src/main/java/net/frozenorb/apiv3/route/bannedAsns/DELETEBannedAsnsId.java index 995e33e..f9bf418 100644 --- a/src/main/java/net/frozenorb/apiv3/route/bannedAsns/DELETEBannedAsnsId.java +++ b/src/main/java/net/frozenorb/apiv3/route/bannedAsns/DELETEBannedAsnsId.java @@ -35,11 +35,11 @@ public final class DELETEBannedAsnsId implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, bannedAsn); + APIv3.respondJson(ctx, 200, bannedAsn); } }); } else { - APIv3.respondJson(ctx, bannedAsn); + APIv3.respondJson(ctx, 200, bannedAsn); } } diff --git a/src/main/java/net/frozenorb/apiv3/route/bannedAsns/GETBannedAsns.java b/src/main/java/net/frozenorb/apiv3/route/bannedAsns/GETBannedAsns.java index 35a521e..d92edbe 100644 --- a/src/main/java/net/frozenorb/apiv3/route/bannedAsns/GETBannedAsns.java +++ b/src/main/java/net/frozenorb/apiv3/route/bannedAsns/GETBannedAsns.java @@ -8,7 +8,7 @@ import net.frozenorb.apiv3.model.BannedAsn; public final class GETBannedAsns implements Handler { public void handle(RoutingContext ctx) { - APIv3.respondJson(ctx, BannedAsn.findAll()); + APIv3.respondJson(ctx, 200, BannedAsn.findAll()); } } \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/route/bannedAsns/GETBannedAsnsId.java b/src/main/java/net/frozenorb/apiv3/route/bannedAsns/GETBannedAsnsId.java index d810fde..f6e90a4 100644 --- a/src/main/java/net/frozenorb/apiv3/route/bannedAsns/GETBannedAsnsId.java +++ b/src/main/java/net/frozenorb/apiv3/route/bannedAsns/GETBannedAsnsId.java @@ -8,7 +8,7 @@ import net.frozenorb.apiv3.model.BannedAsn; public final class GETBannedAsnsId implements Handler { public void handle(RoutingContext ctx) { - APIv3.respondJson(ctx, BannedAsn.findById(Integer.parseInt(ctx.request().getParam("bannedAsn")))); + APIv3.respondJson(ctx, 200, BannedAsn.findById(Integer.parseInt(ctx.request().getParam("bannedAsn")))); } } \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/route/bannedAsns/POSTBannedAsns.java b/src/main/java/net/frozenorb/apiv3/route/bannedAsns/POSTBannedAsns.java index 0d57f14..d20a828 100644 --- a/src/main/java/net/frozenorb/apiv3/route/bannedAsns/POSTBannedAsns.java +++ b/src/main/java/net/frozenorb/apiv3/route/bannedAsns/POSTBannedAsns.java @@ -30,11 +30,11 @@ public final class POSTBannedAsns implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, bannedAsn); + APIv3.respondJson(ctx, 200, bannedAsn); } }); } else { - APIv3.respondJson(ctx, bannedAsn); + APIv3.respondJson(ctx, 200, bannedAsn); } } diff --git a/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/DELETEBannedCellCarriersId.java b/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/DELETEBannedCellCarriersId.java index b968c50..0ca4e84 100644 --- a/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/DELETEBannedCellCarriersId.java +++ b/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/DELETEBannedCellCarriersId.java @@ -35,11 +35,11 @@ public final class DELETEBannedCellCarriersId implements Handler if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, bannedCellCarrier); + APIv3.respondJson(ctx, 200, bannedCellCarrier); } }); } else { - APIv3.respondJson(ctx, bannedCellCarrier); + APIv3.respondJson(ctx, 200, bannedCellCarrier); } } diff --git a/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/GETBannedCellCarriers.java b/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/GETBannedCellCarriers.java index da168ec..23643c6 100644 --- a/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/GETBannedCellCarriers.java +++ b/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/GETBannedCellCarriers.java @@ -8,7 +8,7 @@ import net.frozenorb.apiv3.model.BannedCellCarrier; public final class GETBannedCellCarriers implements Handler { public void handle(RoutingContext ctx) { - APIv3.respondJson(ctx, BannedCellCarrier.findAll()); + APIv3.respondJson(ctx, 200, BannedCellCarrier.findAll()); } } \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/GETBannedCellCarriersId.java b/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/GETBannedCellCarriersId.java index 45db064..9379186 100644 --- a/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/GETBannedCellCarriersId.java +++ b/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/GETBannedCellCarriersId.java @@ -8,7 +8,7 @@ import net.frozenorb.apiv3.model.BannedCellCarrier; public final class GETBannedCellCarriersId implements Handler { public void handle(RoutingContext ctx) { - APIv3.respondJson(ctx, BannedCellCarrier.findById(Integer.parseInt(ctx.request().getParam("bannedCellCarrier")))); + APIv3.respondJson(ctx, 200, BannedCellCarrier.findById(Integer.parseInt(ctx.request().getParam("bannedCellCarrier")))); } } \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/POSTBannedCellCarriers.java b/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/POSTBannedCellCarriers.java index 0ea3c60..6fbcf5c 100644 --- a/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/POSTBannedCellCarriers.java +++ b/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/POSTBannedCellCarriers.java @@ -30,11 +30,11 @@ public final class POSTBannedCellCarriers implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, bannedCellCarrier); + APIv3.respondJson(ctx, 200, bannedCellCarrier); } }); } else { - APIv3.respondJson(ctx, bannedCellCarrier); + APIv3.respondJson(ctx, 200, bannedCellCarrier); } } diff --git a/src/main/java/net/frozenorb/apiv3/route/chatFilterList/GETChatFilter.java b/src/main/java/net/frozenorb/apiv3/route/chatFilterList/GETChatFilter.java index 45ecbd3..3d3522f 100644 --- a/src/main/java/net/frozenorb/apiv3/route/chatFilterList/GETChatFilter.java +++ b/src/main/java/net/frozenorb/apiv3/route/chatFilterList/GETChatFilter.java @@ -10,7 +10,7 @@ public final class GETChatFilter implements Handler { public void handle(RoutingContext ctx) { // TODO // WARNING: THIS IS REGISTERED ASYNC SO DONT MESS IT UP - APIv3.respondJson(ctx, ImmutableList.of()); + APIv3.respondJson(ctx, 200, ImmutableList.of()); } } \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/route/emailTokens/GETEmailTokensIdOwner.java b/src/main/java/net/frozenorb/apiv3/route/emailTokens/GETEmailTokensIdOwner.java index c40a8fb..00d10dd 100644 --- a/src/main/java/net/frozenorb/apiv3/route/emailTokens/GETEmailTokensIdOwner.java +++ b/src/main/java/net/frozenorb/apiv3/route/emailTokens/GETEmailTokensIdOwner.java @@ -13,7 +13,7 @@ public final class GETEmailTokensIdOwner implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, user); + APIv3.respondJson(ctx, 200, user); } }); } diff --git a/src/main/java/net/frozenorb/apiv3/route/emailTokens/POSTEmailTokensIdConfirm.java b/src/main/java/net/frozenorb/apiv3/route/emailTokens/POSTEmailTokensIdConfirm.java index 16907fd..299c7ea 100644 --- a/src/main/java/net/frozenorb/apiv3/route/emailTokens/POSTEmailTokensIdConfirm.java +++ b/src/main/java/net/frozenorb/apiv3/route/emailTokens/POSTEmailTokensIdConfirm.java @@ -27,7 +27,7 @@ public final class POSTEmailTokensIdConfirm implements Handler { } if (user.getEmail() != null) { - ErrorUtils.respondGeneric(ctx, 400, "User provided already has email set."); + ErrorUtils.respondGeneric(ctx, 409, "User provided already has email set."); return; } @@ -54,7 +54,7 @@ public final class POSTEmailTokensIdConfirm implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, ImmutableMap.of( + APIv3.respondJson(ctx, 200, ImmutableMap.of( "success", true )); } diff --git a/src/main/java/net/frozenorb/apiv3/route/grants/DELETEGrantsId.java b/src/main/java/net/frozenorb/apiv3/route/grants/DELETEGrantsId.java index 7bc0f19..9bdd38f 100644 --- a/src/main/java/net/frozenorb/apiv3/route/grants/DELETEGrantsId.java +++ b/src/main/java/net/frozenorb/apiv3/route/grants/DELETEGrantsId.java @@ -49,11 +49,11 @@ public final class DELETEGrantsId implements Handler { grant.delete(removedBy, reason, callback); callback.get(); - AuditLog.log(removedBy.getId(), requestBody.getString("removedByIp"), ctx, AuditLogActionType.GRANT_DELETE,ImmutableMap.of("grantId", grant.getId()), (ignored, error) -> { + AuditLog.log(removedBy.getId(), requestBody.getString("removedByIp"), ctx, AuditLogActionType.GRANT_DELETE, ImmutableMap.of("grantId", grant.getId()), (ignored, error) -> { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, grant); + APIv3.respondJson(ctx, 200, grant); } }); } diff --git a/src/main/java/net/frozenorb/apiv3/route/grants/GETGrants.java b/src/main/java/net/frozenorb/apiv3/route/grants/GETGrants.java index 0b20542..fc43da8 100644 --- a/src/main/java/net/frozenorb/apiv3/route/grants/GETGrants.java +++ b/src/main/java/net/frozenorb/apiv3/route/grants/GETGrants.java @@ -18,7 +18,7 @@ public final class GETGrants implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, grants); + APIv3.respondJson(ctx, 200, grants); } }); } catch (NumberFormatException ignored) { diff --git a/src/main/java/net/frozenorb/apiv3/route/grants/GETGrantsId.java b/src/main/java/net/frozenorb/apiv3/route/grants/GETGrantsId.java index 1fd3614..024f756 100644 --- a/src/main/java/net/frozenorb/apiv3/route/grants/GETGrantsId.java +++ b/src/main/java/net/frozenorb/apiv3/route/grants/GETGrantsId.java @@ -13,7 +13,7 @@ public final class GETGrantsId implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, grant); + APIv3.respondJson(ctx, 200, grant); } }); } diff --git a/src/main/java/net/frozenorb/apiv3/route/grants/POSTGrants.java b/src/main/java/net/frozenorb/apiv3/route/grants/POSTGrants.java index bd358ff..efe652e 100644 --- a/src/main/java/net/frozenorb/apiv3/route/grants/POSTGrants.java +++ b/src/main/java/net/frozenorb/apiv3/route/grants/POSTGrants.java @@ -101,11 +101,11 @@ public final class POSTGrants implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, grant); + APIv3.respondJson(ctx, 200, grant); } }); } else { - APIv3.respondJson(ctx, grant); + APIv3.respondJson(ctx, 200, grant); } } diff --git a/src/main/java/net/frozenorb/apiv3/route/ipBans/DELETEIpBansId.java b/src/main/java/net/frozenorb/apiv3/route/ipBans/DELETEIpBansId.java index 6f77be3..9106dff 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ipBans/DELETEIpBansId.java +++ b/src/main/java/net/frozenorb/apiv3/route/ipBans/DELETEIpBansId.java @@ -52,7 +52,7 @@ public final class DELETEIpBansId implements Handler { BlockingCallback blockingCallback = new BlockingCallback<>(); AuditLog.log(removedBy.getId(), requestBody.getString("removedByIp"), ctx, AuditLogActionType.IP_BAN_DELETE, ImmutableMap.of("punishmentId", ipBan.getId()), blockingCallback); blockingCallback.get(); - APIv3.respondJson(ctx, ipBan); + APIv3.respondJson(ctx, 200, ipBan); } } \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/route/ipBans/GETIpBans.java b/src/main/java/net/frozenorb/apiv3/route/ipBans/GETIpBans.java index 375d8cd..3fca803 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ipBans/GETIpBans.java +++ b/src/main/java/net/frozenorb/apiv3/route/ipBans/GETIpBans.java @@ -18,7 +18,7 @@ public final class GETIpBans implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, grants); + APIv3.respondJson(ctx, 200, grants); } }); } catch (NumberFormatException ignored) { diff --git a/src/main/java/net/frozenorb/apiv3/route/ipBans/GETIpBansId.java b/src/main/java/net/frozenorb/apiv3/route/ipBans/GETIpBansId.java index e12790a..09a1a2b 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ipBans/GETIpBansId.java +++ b/src/main/java/net/frozenorb/apiv3/route/ipBans/GETIpBansId.java @@ -13,7 +13,7 @@ public final class GETIpBansId implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, ipBan); + APIv3.respondJson(ctx, 200, ipBan); } }); } diff --git a/src/main/java/net/frozenorb/apiv3/route/ipBans/POSTIpBans.java b/src/main/java/net/frozenorb/apiv3/route/ipBans/POSTIpBans.java index 86ab6fe..82f2b08 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ipBans/POSTIpBans.java +++ b/src/main/java/net/frozenorb/apiv3/route/ipBans/POSTIpBans.java @@ -59,11 +59,11 @@ public final class POSTIpBans implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, ipBan); + APIv3.respondJson(ctx, 200, ipBan); } }); } else { - APIv3.respondJson(ctx, ipBan); + APIv3.respondJson(ctx, 200, ipBan); } } diff --git a/src/main/java/net/frozenorb/apiv3/route/ipIntel/GETIpInteld.java b/src/main/java/net/frozenorb/apiv3/route/ipIntel/GETIpInteld.java index dd7d09f..a70bad3 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ipIntel/GETIpInteld.java +++ b/src/main/java/net/frozenorb/apiv3/route/ipIntel/GETIpInteld.java @@ -21,7 +21,7 @@ public final class GETIpInteld implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, ipIntel); + APIv3.respondJson(ctx, 200, ipIntel); } }); } diff --git a/src/main/java/net/frozenorb/apiv3/route/ipLog/GETIpLogId.java b/src/main/java/net/frozenorb/apiv3/route/ipLog/GETIpLogId.java index c5c5007..4ef87c7 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ipLog/GETIpLogId.java +++ b/src/main/java/net/frozenorb/apiv3/route/ipLog/GETIpLogId.java @@ -20,7 +20,7 @@ public final class GETIpLogId implements Handler { if (error2 != null) { ErrorUtils.respondInternalError(ctx, error2); } else { - APIv3.respondJson(ctx, ipLog); + APIv3.respondJson(ctx, 200, ipLog); } }); } diff --git a/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/DELETENotificationTemplatesId.java b/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/DELETENotificationTemplatesId.java index 9f004f3..65fa5d0 100644 --- a/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/DELETENotificationTemplatesId.java +++ b/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/DELETENotificationTemplatesId.java @@ -37,11 +37,11 @@ public final class DELETENotificationTemplatesId implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, notificationTemplates); + APIv3.respondJson(ctx, 200, notificationTemplates); } }); } diff --git a/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/GETNotificationTemplatesId.java b/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/GETNotificationTemplatesId.java index 23ad17b..0c78480 100644 --- a/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/GETNotificationTemplatesId.java +++ b/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/GETNotificationTemplatesId.java @@ -13,7 +13,7 @@ public final class GETNotificationTemplatesId implements Handler if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, notificationTemplate); + APIv3.respondJson(ctx, 200, notificationTemplate); } }); } diff --git a/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/POSTNotificationTemplates.java b/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/POSTNotificationTemplates.java index 1c4ce96..ead428f 100644 --- a/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/POSTNotificationTemplates.java +++ b/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/POSTNotificationTemplates.java @@ -31,11 +31,11 @@ public final class POSTNotificationTemplates implements Handler if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, notificationTemplate); + APIv3.respondJson(ctx, 200, notificationTemplate); } }); } else { - APIv3.respondJson(ctx, notificationTemplate); + APIv3.respondJson(ctx, 200, notificationTemplate); } } diff --git a/src/main/java/net/frozenorb/apiv3/route/phoneIntel/GETPhoneInteld.java b/src/main/java/net/frozenorb/apiv3/route/phoneIntel/GETPhoneInteld.java index a326670..363183c 100644 --- a/src/main/java/net/frozenorb/apiv3/route/phoneIntel/GETPhoneInteld.java +++ b/src/main/java/net/frozenorb/apiv3/route/phoneIntel/GETPhoneInteld.java @@ -21,7 +21,7 @@ public final class GETPhoneInteld implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, ipIntel); + APIv3.respondJson(ctx, 200, ipIntel); } }); } diff --git a/src/main/java/net/frozenorb/apiv3/route/punishments/DELETEPunishmentsId.java b/src/main/java/net/frozenorb/apiv3/route/punishments/DELETEPunishmentsId.java index 37c6d76..ad813ae 100644 --- a/src/main/java/net/frozenorb/apiv3/route/punishments/DELETEPunishmentsId.java +++ b/src/main/java/net/frozenorb/apiv3/route/punishments/DELETEPunishmentsId.java @@ -52,7 +52,7 @@ public final class DELETEPunishmentsId implements Handler { BlockingCallback blockingCallback = new BlockingCallback<>(); AuditLog.log(removedBy.getId(), requestBody.getString("removedByIp"), ctx, AuditLogActionType.PUNISHMENT_DELETE, ImmutableMap.of("punishmentId", punishment.getId()), blockingCallback); blockingCallback.get(); - APIv3.respondJson(ctx, punishment); + APIv3.respondJson(ctx, 200, punishment); } } \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/route/punishments/DELETEUsersIdActivePunishment.java b/src/main/java/net/frozenorb/apiv3/route/punishments/DELETEUsersIdActivePunishment.java index 4837f61..ea02e94 100644 --- a/src/main/java/net/frozenorb/apiv3/route/punishments/DELETEUsersIdActivePunishment.java +++ b/src/main/java/net/frozenorb/apiv3/route/punishments/DELETEUsersIdActivePunishment.java @@ -60,7 +60,7 @@ public final class DELETEUsersIdActivePunishment implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, grants); + APIv3.respondJson(ctx, 200, grants); } }); } catch (NumberFormatException ignored) { diff --git a/src/main/java/net/frozenorb/apiv3/route/punishments/GETPunishmentsId.java b/src/main/java/net/frozenorb/apiv3/route/punishments/GETPunishmentsId.java index 14dd622..c0baeed 100644 --- a/src/main/java/net/frozenorb/apiv3/route/punishments/GETPunishmentsId.java +++ b/src/main/java/net/frozenorb/apiv3/route/punishments/GETPunishmentsId.java @@ -13,7 +13,7 @@ public final class GETPunishmentsId implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, punishment); + APIv3.respondJson(ctx, 200, punishment); } }); } diff --git a/src/main/java/net/frozenorb/apiv3/route/punishments/POSTPunishments.java b/src/main/java/net/frozenorb/apiv3/route/punishments/POSTPunishments.java index 2572271..6b6eb5e 100644 --- a/src/main/java/net/frozenorb/apiv3/route/punishments/POSTPunishments.java +++ b/src/main/java/net/frozenorb/apiv3/route/punishments/POSTPunishments.java @@ -49,7 +49,7 @@ public final class POSTPunishments implements Handler { if (punishment.isActive()) { BlockingCallback addedByCallback = new BlockingCallback<>(); User.findById(punishment.getAddedBy(), addedByCallback); - ErrorUtils.respondGeneric(ctx, 200, "A punishment by " + addedByCallback.get().getLastUsername() + " already covers this user."); + ErrorUtils.respondGeneric(ctx, 409, "A punishment by " + addedByCallback.get().getLastUsername() + " already covers this user."); return; } } @@ -82,7 +82,7 @@ public final class POSTPunishments implements Handler { target.hasPermissionAnywhere(Permissions.PROTECTED_PUNISHMENT, permissionsCallback); if (permissionsCallback.get()) { - ErrorUtils.respondGeneric(ctx, 200, target.getLastSeenOn() + " is protected from punishments."); + ErrorUtils.respondGeneric(ctx, 409, target.getLastSeenOn() + " is protected from punishments."); return; } @@ -108,14 +108,14 @@ public final class POSTPunishments implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, ImmutableMap.of( + APIv3.respondJson(ctx, 200, ImmutableMap.of( "punishment", punishment, "accessDenialReason", accessDenialReason == null ? "" : accessDenialReason )); } }); } else { - APIv3.respondJson(ctx, ImmutableMap.of( + APIv3.respondJson(ctx, 200, ImmutableMap.of( "punishment", punishment, "accessDenialReason", accessDenialReason == null ? "" : accessDenialReason )); diff --git a/src/main/java/net/frozenorb/apiv3/route/ranks/DELETERanksId.java b/src/main/java/net/frozenorb/apiv3/route/ranks/DELETERanksId.java index 3d865f2..9bef8dd 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ranks/DELETERanksId.java +++ b/src/main/java/net/frozenorb/apiv3/route/ranks/DELETERanksId.java @@ -35,11 +35,11 @@ public final class DELETERanksId implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, rank); + APIv3.respondJson(ctx, 200, rank); } }); } else { - APIv3.respondJson(ctx, rank); + APIv3.respondJson(ctx, 200, rank); } } diff --git a/src/main/java/net/frozenorb/apiv3/route/ranks/GETRanks.java b/src/main/java/net/frozenorb/apiv3/route/ranks/GETRanks.java index fc503b3..94c75d3 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ranks/GETRanks.java +++ b/src/main/java/net/frozenorb/apiv3/route/ranks/GETRanks.java @@ -8,7 +8,7 @@ import net.frozenorb.apiv3.model.Rank; public final class GETRanks implements Handler { public void handle(RoutingContext ctx) { - APIv3.respondJson(ctx, Rank.findAll()); + APIv3.respondJson(ctx, 200, Rank.findAll()); } } \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/route/ranks/GETRanksId.java b/src/main/java/net/frozenorb/apiv3/route/ranks/GETRanksId.java index 78a751f..f57515f 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ranks/GETRanksId.java +++ b/src/main/java/net/frozenorb/apiv3/route/ranks/GETRanksId.java @@ -8,7 +8,7 @@ import net.frozenorb.apiv3.model.Rank; public final class GETRanksId implements Handler { public void handle(RoutingContext ctx) { - APIv3.respondJson(ctx, Rank.findById(ctx.request().getParam("rankId"))); + APIv3.respondJson(ctx, 200, Rank.findById(ctx.request().getParam("rankId"))); } } \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/route/ranks/POSTRanks.java b/src/main/java/net/frozenorb/apiv3/route/ranks/POSTRanks.java index 626068b..75b1740 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ranks/POSTRanks.java +++ b/src/main/java/net/frozenorb/apiv3/route/ranks/POSTRanks.java @@ -36,11 +36,11 @@ public final class POSTRanks implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, rank); + APIv3.respondJson(ctx, 200, rank); } }); } else { - APIv3.respondJson(ctx, rank); + APIv3.respondJson(ctx, 200, rank); } } diff --git a/src/main/java/net/frozenorb/apiv3/route/serverGroups/DELETEServerGroupsId.java b/src/main/java/net/frozenorb/apiv3/route/serverGroups/DELETEServerGroupsId.java index 912ab79..8c14116 100644 --- a/src/main/java/net/frozenorb/apiv3/route/serverGroups/DELETEServerGroupsId.java +++ b/src/main/java/net/frozenorb/apiv3/route/serverGroups/DELETEServerGroupsId.java @@ -35,11 +35,11 @@ public final class DELETEServerGroupsId implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, serverGroup); + APIv3.respondJson(ctx, 200, serverGroup); } }); } else { - APIv3.respondJson(ctx, serverGroup); + APIv3.respondJson(ctx, 200, serverGroup); } } diff --git a/src/main/java/net/frozenorb/apiv3/route/serverGroups/GETServerGroups.java b/src/main/java/net/frozenorb/apiv3/route/serverGroups/GETServerGroups.java index 48ca748..28452b1 100644 --- a/src/main/java/net/frozenorb/apiv3/route/serverGroups/GETServerGroups.java +++ b/src/main/java/net/frozenorb/apiv3/route/serverGroups/GETServerGroups.java @@ -8,7 +8,7 @@ import net.frozenorb.apiv3.model.ServerGroup; public final class GETServerGroups implements Handler { public void handle(RoutingContext ctx) { - APIv3.respondJson(ctx, ServerGroup.findAll()); + APIv3.respondJson(ctx, 200, ServerGroup.findAll()); } } \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/route/serverGroups/GETServerGroupsId.java b/src/main/java/net/frozenorb/apiv3/route/serverGroups/GETServerGroupsId.java index 77a0552..ac22424 100644 --- a/src/main/java/net/frozenorb/apiv3/route/serverGroups/GETServerGroupsId.java +++ b/src/main/java/net/frozenorb/apiv3/route/serverGroups/GETServerGroupsId.java @@ -8,7 +8,7 @@ import net.frozenorb.apiv3.model.ServerGroup; public final class GETServerGroupsId implements Handler { public void handle(RoutingContext ctx) { - APIv3.respondJson(ctx, ServerGroup.findById(ctx.request().getParam("serverGroupId"))); + APIv3.respondJson(ctx, 200, ServerGroup.findById(ctx.request().getParam("serverGroupId"))); } } \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/route/serverGroups/POSTServerGroups.java b/src/main/java/net/frozenorb/apiv3/route/serverGroups/POSTServerGroups.java index 5d5b59b..0d70c4a 100644 --- a/src/main/java/net/frozenorb/apiv3/route/serverGroups/POSTServerGroups.java +++ b/src/main/java/net/frozenorb/apiv3/route/serverGroups/POSTServerGroups.java @@ -30,11 +30,11 @@ public final class POSTServerGroups implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, serverGroup); + APIv3.respondJson(ctx, 200, serverGroup); } }); } else { - APIv3.respondJson(ctx, serverGroup); + APIv3.respondJson(ctx, 200, serverGroup); } } diff --git a/src/main/java/net/frozenorb/apiv3/route/servers/DELETEServersId.java b/src/main/java/net/frozenorb/apiv3/route/servers/DELETEServersId.java index 62e0178..eb25b8b 100644 --- a/src/main/java/net/frozenorb/apiv3/route/servers/DELETEServersId.java +++ b/src/main/java/net/frozenorb/apiv3/route/servers/DELETEServersId.java @@ -49,11 +49,11 @@ public final class DELETEServersId implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, server); + APIv3.respondJson(ctx, 200, server); } }); } else { - APIv3.respondJson(ctx, server); + APIv3.respondJson(ctx, 200, server); } } diff --git a/src/main/java/net/frozenorb/apiv3/route/servers/GETServers.java b/src/main/java/net/frozenorb/apiv3/route/servers/GETServers.java index bab8fc8..df5f752 100644 --- a/src/main/java/net/frozenorb/apiv3/route/servers/GETServers.java +++ b/src/main/java/net/frozenorb/apiv3/route/servers/GETServers.java @@ -8,7 +8,7 @@ import net.frozenorb.apiv3.model.Server; public final class GETServers implements Handler { public void handle(RoutingContext ctx) { - APIv3.respondJson(ctx, Server.findAll()); + APIv3.respondJson(ctx, 200, Server.findAll()); } } \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/route/servers/GETServersId.java b/src/main/java/net/frozenorb/apiv3/route/servers/GETServersId.java index 0053e65..db9d2e6 100644 --- a/src/main/java/net/frozenorb/apiv3/route/servers/GETServersId.java +++ b/src/main/java/net/frozenorb/apiv3/route/servers/GETServersId.java @@ -8,7 +8,7 @@ import net.frozenorb.apiv3.model.Server; public final class GETServersId implements Handler { public void handle(RoutingContext ctx) { - APIv3.respondJson(ctx, Server.findById(ctx.request().getParam("serverId"))); + APIv3.respondJson(ctx, 200, Server.findById(ctx.request().getParam("serverId"))); } } \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/route/servers/POSTServers.java b/src/main/java/net/frozenorb/apiv3/route/servers/POSTServers.java index 6184f43..ffcb96b 100644 --- a/src/main/java/net/frozenorb/apiv3/route/servers/POSTServers.java +++ b/src/main/java/net/frozenorb/apiv3/route/servers/POSTServers.java @@ -50,11 +50,11 @@ public final class POSTServers implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, server); + APIv3.respondJson(ctx, 200, server); } }); } else { - APIv3.respondJson(ctx, server); + APIv3.respondJson(ctx, 200, server); } } diff --git a/src/main/java/net/frozenorb/apiv3/route/servers/POSTServersHeartbeat.java b/src/main/java/net/frozenorb/apiv3/route/servers/POSTServersHeartbeat.java index 1f3072f..acfa4b9 100644 --- a/src/main/java/net/frozenorb/apiv3/route/servers/POSTServersHeartbeat.java +++ b/src/main/java/net/frozenorb/apiv3/route/servers/POSTServersHeartbeat.java @@ -13,7 +13,7 @@ import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.actor.Actor; import net.frozenorb.apiv3.actor.ActorType; import net.frozenorb.apiv3.model.*; -import net.frozenorb.apiv3.unsorted.FutureCompatibilityCallback; +import net.frozenorb.apiv3.unsorted.MongoToVertxCallback; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.PermissionUtils; import net.frozenorb.apiv3.util.UuidUtils; @@ -30,7 +30,7 @@ public final class POSTServersHeartbeat implements Handler { Actor actor = ctx.get("actor"); if (actor.getType() != ActorType.SERVER) { - ErrorUtils.respondGeneric(ctx, 400, "This action can only be performed when requested by a server."); + ErrorUtils.respondGeneric(ctx, 403, "This action can only be performed when requested by a server."); return; } @@ -48,7 +48,7 @@ public final class POSTServersHeartbeat implements Handler { if (result.succeeded()) { // We don't do anything with the info callback, as // it's just to update our database. - APIv3.respondJson(ctx, ImmutableMap.of( + APIv3.respondJson(ctx, 200, ImmutableMap.of( "players", result.result().result(1), "permissions", result.result().result(2), "events", result.result().result(3) @@ -81,9 +81,9 @@ public final class POSTServersHeartbeat implements Handler { Future>> grantLookupCallback = Future.future(); Future>> punishmentLookupCallback = Future.future(); - User.findOrCreateByIdGrouped(playerNames, new FutureCompatibilityCallback<>(userLookupCallback)); - Grant.findByUserGrouped(playerNames.keySet(), new FutureCompatibilityCallback<>(grantLookupCallback)); - Punishment.findByUserGrouped(playerNames.keySet(), new FutureCompatibilityCallback<>(punishmentLookupCallback)); + User.findOrCreateByIdGrouped(playerNames, new MongoToVertxCallback<>(userLookupCallback)); + Grant.findByUserGrouped(playerNames.keySet(), new MongoToVertxCallback<>(grantLookupCallback)); + Punishment.findByUserGrouped(playerNames.keySet(), new MongoToVertxCallback<>(punishmentLookupCallback)); CompositeFuture.all( userLookupCallback, @@ -179,10 +179,10 @@ public final class POSTServersHeartbeat implements Handler { } // TODO: IP BAN INFO (AND FOR LINE BELOW) - user.getLoginInfo(server, null, punishments, ImmutableList.of(), grants, new FutureCompatibilityCallback<>(callback)); + user.getLoginInfo(server, null, punishments, ImmutableList.of(), grants, new MongoToVertxCallback<>(callback)); }); } else { - user.getLoginInfo(server, null, punishments, ImmutableList.of(), grants, new FutureCompatibilityCallback<>(callback)); + user.getLoginInfo(server, null, punishments, ImmutableList.of(), grants, new MongoToVertxCallback<>(callback)); } } diff --git a/src/main/java/net/frozenorb/apiv3/route/users/GETStaff.java b/src/main/java/net/frozenorb/apiv3/route/users/GETStaff.java index 7cdc609..43c564a 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/GETStaff.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/GETStaff.java @@ -46,7 +46,7 @@ public final class GETStaff implements Handler { } }); - APIv3.respondJson(ctx, result); + APIv3.respondJson(ctx, 200, result); } } \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/route/users/GETUsersId.java b/src/main/java/net/frozenorb/apiv3/route/users/GETUsersId.java index 3782297..5cbccdb 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/GETUsersId.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/GETUsersId.java @@ -13,7 +13,7 @@ public final class GETUsersId implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, user); + APIv3.respondJson(ctx, 200, user); } }); } diff --git a/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdCompoundedPermissions.java b/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdCompoundedPermissions.java index b9dfdda..ef4e52c 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdCompoundedPermissions.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdCompoundedPermissions.java @@ -20,7 +20,7 @@ public final class GETUsersIdCompoundedPermissions implements Handler { result.put("aliases", user.getAliases()); result.put("totpSetup", user.getTotpSecret() != null); - APIv3.respondJson(ctx, result); + APIv3.respondJson(ctx, 200, result); } } \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdRequiresTotp.java b/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdRequiresTotp.java index 57b116e..c1342c2 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdRequiresTotp.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdRequiresTotp.java @@ -34,7 +34,7 @@ public final class GETUsersIdRequiresTotp implements Handler { if (error2 != null) { ErrorUtils.respondInternalError(ctx, error2); } else { - APIv3.respondJson(ctx, ImmutableMap.of( + APIv3.respondJson(ctx, 200, ImmutableMap.of( "required", (requiresTotpResult == RequiresTotpResult.REQUIRED_NO_EXEMPTIONS), "message", requiresTotpResult.name() )); diff --git a/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdVerifyPassword.java b/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdVerifyPassword.java index 7bc5ab6..94ee91b 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdVerifyPassword.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdVerifyPassword.java @@ -48,7 +48,7 @@ public final class GETUsersIdVerifyPassword implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, ImmutableMap.of( + APIv3.respondJson(ctx, 200, ImmutableMap.of( "authorized", authorized, "uuid", finalUuid )); diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdChangePassword.java b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdChangePassword.java index 77f4ca6..2f8ce11 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdChangePassword.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdChangePassword.java @@ -57,7 +57,7 @@ public final class POSTUsersIdChangePassword implements Handler authorized = true; } else if (user.getPasswordResetToken() != null && user.getPasswordResetToken().equals(requestBody.getString("passwordResetToken"))) { if ((System.currentTimeMillis() - user.getPasswordResetTokenSetAt().toEpochMilli()) > TimeUnit.DAYS.toMillis(2)) { - ErrorUtils.respondGeneric(ctx, 200, "Password reset token is expired"); + ErrorUtils.respondGeneric(ctx, 409, "Password reset token is expired"); return; } @@ -72,7 +72,7 @@ public final class POSTUsersIdChangePassword implements Handler String newPassword = requestBody.getString("newPassword"); if (newPassword.length() < 8) { - ErrorUtils.respondGeneric(ctx, 200, "Your password is too short."); + ErrorUtils.respondInvalidInput(ctx, "Password is too short."); return; } @@ -85,7 +85,7 @@ public final class POSTUsersIdChangePassword implements Handler if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, ImmutableMap.of( + APIv3.respondJson(ctx, 200, ImmutableMap.of( "success", true )); } diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdConfirmPhone.java b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdConfirmPhone.java index d81b601..9935424 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdConfirmPhone.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdConfirmPhone.java @@ -58,7 +58,7 @@ public final class POSTUsersIdConfirmPhone implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, ImmutableMap.of( + APIv3.respondJson(ctx, 200, ImmutableMap.of( "success", true )); } diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdLeave.java b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdLeave.java index 0087ce0..13c0df3 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdLeave.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdLeave.java @@ -16,7 +16,7 @@ public class POSTUsersIdLeave implements Handler { Actor actor = ctx.get("actor"); if (actor.getType() != ActorType.SERVER) { - ErrorUtils.respondGeneric(ctx, 400, "This action can only be performed when requested by a server."); + ErrorUtils.respondGeneric(ctx, 403, "This action can only be performed when requested by a server."); return; } @@ -38,7 +38,7 @@ public class POSTUsersIdLeave implements Handler { if (error2 != null) { ErrorUtils.respondInternalError(ctx, error2); } else { - APIv3.respondJson(ctx, user); + APIv3.respondJson(ctx, 200, user); } }); } diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdLogin.java b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdLogin.java index c6f69b8..24757c8 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdLogin.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdLogin.java @@ -36,7 +36,7 @@ public final class POSTUsersIdLogin implements Handler { Actor actor = ctx.get("actor"); if (actor.getType() != ActorType.SERVER) { - ErrorUtils.respondGeneric(ctx, 400, "This action can only be performed when requested by a server."); + ErrorUtils.respondGeneric(ctx, 403, "This action can only be performed when requested by a server."); return; } @@ -88,7 +88,7 @@ public final class POSTUsersIdLogin implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, loginInfo); + APIv3.respondJson(ctx, 200, loginInfo); } }); } diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdNotify.java b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdNotify.java index 02d5718..16fb365 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdNotify.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdNotify.java @@ -49,7 +49,7 @@ public final class POSTUsersIdNotify implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, ImmutableMap.of( + APIv3.respondJson(ctx, 200, ImmutableMap.of( "success", true )); } diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdPasswordReset.java b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdPasswordReset.java index 35c9aa4..405a0ab 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdPasswordReset.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdPasswordReset.java @@ -58,7 +58,7 @@ public final class POSTUsersIdPasswordReset implements Handler { if (error2 != null) { ErrorUtils.respondInternalError(ctx, error2); } else { - APIv3.respondJson(ctx, ImmutableMap.of( + APIv3.respondJson(ctx, 200, ImmutableMap.of( "success", true )); } diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdRegisterEmail.java b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdRegisterEmail.java index d0fa9fe..55e80e0 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdRegisterEmail.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdRegisterEmail.java @@ -84,7 +84,7 @@ public final class POSTUsersIdRegisterEmail implements Handler { if (error2 != null) { ErrorUtils.respondInternalError(ctx, error2); } else { - APIv3.respondJson(ctx, ImmutableMap.of( + APIv3.respondJson(ctx, 200, ImmutableMap.of( "success", true )); } diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdRegisterPhone.java b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdRegisterPhone.java index 0e95239..34071dc 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdRegisterPhone.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdRegisterPhone.java @@ -90,7 +90,7 @@ public final class POSTUsersIdRegisterPhone implements Handler { if (error2 != null) { ErrorUtils.respondInternalError(ctx, error2); } else { - APIv3.respondJson(ctx, ImmutableMap.of( + APIv3.respondJson(ctx, 200, ImmutableMap.of( "success", true )); } diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdSetupTotp.java b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdSetupTotp.java index 632a2af..30a4e48 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdSetupTotp.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdSetupTotp.java @@ -44,7 +44,7 @@ public final class POSTUsersIdSetupTotp implements Handler { if (error != null) { ErrorUtils.respondInternalError(ctx, error); } else { - APIv3.respondJson(ctx, ImmutableMap.of( + APIv3.respondJson(ctx, 200, ImmutableMap.of( "success", true, "message", "Totp code set." )); diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdVerifyTotp.java b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdVerifyTotp.java index aa141f0..1ba7714 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdVerifyTotp.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdVerifyTotp.java @@ -48,7 +48,7 @@ public final class POSTUsersIdVerifyTotp implements Handler { if (error3 != null) { ErrorUtils.respondInternalError(ctx, error3); } else { - APIv3.respondJson(ctx, ImmutableMap.of( + APIv3.respondJson(ctx, 200, ImmutableMap.of( "authorized", totpAuthorizationResult.isAuthorized(), "message", totpAuthorizationResult.name() )); diff --git a/src/main/java/net/frozenorb/apiv3/unsorted/FutureCompatibilityCallback.java b/src/main/java/net/frozenorb/apiv3/unsorted/MongoToVertxCallback.java similarity index 72% rename from src/main/java/net/frozenorb/apiv3/unsorted/FutureCompatibilityCallback.java rename to src/main/java/net/frozenorb/apiv3/unsorted/MongoToVertxCallback.java index d41a951..4e07839 100644 --- a/src/main/java/net/frozenorb/apiv3/unsorted/FutureCompatibilityCallback.java +++ b/src/main/java/net/frozenorb/apiv3/unsorted/MongoToVertxCallback.java @@ -3,11 +3,11 @@ package net.frozenorb.apiv3.unsorted; import com.mongodb.async.SingleResultCallback; import io.vertx.core.Future; -public class FutureCompatibilityCallback implements SingleResultCallback { +public class MongoToVertxCallback implements SingleResultCallback { private final Future future; - public FutureCompatibilityCallback(Future future) { + public MongoToVertxCallback(Future future) { this.future = future; } diff --git a/src/main/java/net/frozenorb/apiv3/util/EmailUtils.java b/src/main/java/net/frozenorb/apiv3/util/EmailUtils.java index becf196..0cac3b3 100644 --- a/src/main/java/net/frozenorb/apiv3/util/EmailUtils.java +++ b/src/main/java/net/frozenorb/apiv3/util/EmailUtils.java @@ -32,7 +32,7 @@ public class EmailUtils { } public static boolean isBannedEmailDomain(String email) { - if (email == null) { + if (!isValidEmail(email)) { return false; } @@ -42,7 +42,7 @@ public class EmailUtils { } public static boolean isValidEmail(String email) { - return VALID_EMAIL_PATTERN.matcher(email).matches(); + return email != null && VALID_EMAIL_PATTERN.matcher(email).matches(); } } \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/util/ErrorUtils.java b/src/main/java/net/frozenorb/apiv3/util/ErrorUtils.java index 254102f..56edbbd 100644 --- a/src/main/java/net/frozenorb/apiv3/util/ErrorUtils.java +++ b/src/main/java/net/frozenorb/apiv3/util/ErrorUtils.java @@ -17,7 +17,7 @@ public class ErrorUtils { } public static void respondRequiredInput(RoutingContext ctx, String field) { - respondGeneric(ctx, 400, "Field \"" + field + "\" is required."); + respondGeneric(ctx, 400, "Required input: " + field + " is required."); } public static void respondInternalError(RoutingContext ctx, Throwable error) { diff --git a/src/main/java/net/frozenorb/apiv3/util/PhoneUtils.java b/src/main/java/net/frozenorb/apiv3/util/PhoneUtils.java index 12cb0c5..116e65d 100644 --- a/src/main/java/net/frozenorb/apiv3/util/PhoneUtils.java +++ b/src/main/java/net/frozenorb/apiv3/util/PhoneUtils.java @@ -8,13 +8,12 @@ import java.util.regex.Pattern; public class PhoneUtils { private static final Pattern VALID_PHONE_PATTERN = Pattern.compile( - "^[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,6}$", + "^(+1|1)?([2-9]\\d\\d[2-9]\\d{6})$", Pattern.CASE_INSENSITIVE ); public static boolean isValidPhone(String phoneNumber) { - return true; // TODO - //return VALID_EMAIL_PATTERN.matcher(email).matches(); + return phoneNumber != null && VALID_PHONE_PATTERN.matcher(phoneNumber).matches(); } } \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/util/TotpUtils.java b/src/main/java/net/frozenorb/apiv3/util/TotpUtils.java index 815bed8..ecc6164 100644 --- a/src/main/java/net/frozenorb/apiv3/util/TotpUtils.java +++ b/src/main/java/net/frozenorb/apiv3/util/TotpUtils.java @@ -48,15 +48,9 @@ public class TotpUtils { String key = user.getId() + ":preAuthorizedIp:" + ip.toLowerCase(); - redisClient.set(key, "", (result) -> { + redisClient.setex(key, unit.toSeconds(duration), "", (result) -> { if (result.succeeded()) { - redisClient.expire(key, (int) unit.toSeconds(duration), (result2) -> { - if (result2.succeeded()) { - callback.onResult(null, null); - } else { - callback.onResult(null, result.cause()); - } - }); + callback.onResult(null, null); } else { callback.onResult(null, result.cause()); } @@ -76,15 +70,9 @@ public class TotpUtils { public static void markRecentlyUsed(User user, int code, SingleResultCallback callback) { String key = user.getId() + ":recentTotpCodes:" + code; - redisClient.set(key, "", (result) -> { + redisClient.setex(key, TimeUnit.MINUTES.toSeconds(5), "", (result) -> { if (result.succeeded()) { - redisClient.expire(key, (int) TimeUnit.MINUTES.toSeconds(5), (result2) -> { - if (result2.succeeded()) { - callback.onResult(null, null); - } else { - callback.onResult(null, result.cause()); - } - }); + callback.onResult(null, null); } else { callback.onResult(null, result.cause()); }