diff --git a/bubble-server/src/main/java/bubble/resources/account/AuthResource.java b/bubble-server/src/main/java/bubble/resources/account/AuthResource.java index 6fb6ada7..3bd17389 100644 --- a/bubble-server/src/main/java/bubble/resources/account/AuthResource.java +++ b/bubble-server/src/main/java/bubble/resources/account/AuthResource.java @@ -83,16 +83,14 @@ public class AuthResource { public Response activate(@Context Request req, @Context ContainerRequest ctx, @Valid ActivationRequest request) { - if (request == null) return invalid("err.activationRequest.required"); + if (request == null) return invalid("err.activation.request.required"); final Account found = optionalUserPrincipal(ctx); if (found != null) { if (!found.admin()) return forbidden(); - return invalid("err.activation.alreadyDone", - "activation has already been done"); + return invalid("err.activation.alreadyDone", "activation has already been done"); } if (accountDAO.activated()) { - return invalid("err.activation.alreadyDone", - "activation has already been done"); + return invalid("err.activation.alreadyDone", "activation has already been done"); } if (!request.hasName()) return invalid("err.name.required", "name is required"); if (!request.hasPassword()) return invalid("err.password.required", "password is required"); diff --git a/bubble-server/src/main/resources/message_templates/en_US/server/pre_auth/ResourceMessages.properties b/bubble-server/src/main/resources/message_templates/en_US/server/pre_auth/ResourceMessages.properties index f35b5a62..1bad724e 100644 --- a/bubble-server/src/main/resources/message_templates/en_US/server/pre_auth/ResourceMessages.properties +++ b/bubble-server/src/main/resources/message_templates/en_US/server/pre_auth/ResourceMessages.properties @@ -8,7 +8,6 @@ message_false=False message_null=null message_undefined=undefined -err.activationRequest.required=Activation request object is required err.name.required=Name is required err.name.tooShort=Name must be at least 4 characters err.name.tooLong=Name cannot be longer than 100 characters @@ -18,6 +17,7 @@ err.password.invalid=Password must contain at least one letter, one number, and err.account.suspended=Account is suspended err.account.locked=Account is locked err.account.noParent=No parent account found +err.activation.request.required=Activation request object is required err.activation.required=Bubble has not yet been activated err.activation.alreadyDone=Bubble has already been activated err.unlock.required=Bubble is locked