diff --git a/src/main/java/org/ntlab/acanthus_server/resources/accounts/AccountsRest.java b/src/main/java/org/ntlab/acanthus_server/resources/accounts/AccountsRest.java index ed1bc6b..784c4c1 100644 --- a/src/main/java/org/ntlab/acanthus_server/resources/accounts/AccountsRest.java +++ b/src/main/java/org/ntlab/acanthus_server/resources/accounts/AccountsRest.java @@ -64,7 +64,7 @@ var searchAccount = accounts.getAccountByUid(uid); if (searchAccount == null) throw new WebApplicationException(404); - if (!searchAccount.getToken().equals(token)) throw new WebApplicationException(400); + if (!token.equals(searchAccount.getToken())) throw new WebApplicationException(400); return searchAccount; } @@ -84,7 +84,7 @@ public int createAccount(@FormParam("name") String name, @FormParam("email") String email, @FormParam("password") String password) { // パスワード, メアドが正しく入力されているかチェック - if (!isCorrectPassword(password) || !isCorrectEmailAddress(email)||!isCorrectName(name)) + if (!isCorrectPassword(password) || !isCorrectEmailAddress(email) || !isCorrectName(name)) throw new WebApplicationException(401); // すでに同じメールアドレスが存在しているか @@ -108,7 +108,7 @@ @SuppressWarnings("{unchecked}") // 正規表現の警告無視 private boolean isCorrectEmailAddress(String emailAddress) { - var aText = "[a-zA-Z0-9_!#¥¥$¥¥%&'*+/=?¥¥^`{}~|¥¥-]+"; + var aText = "[a-zA-Z0-9_!#¥¥$¥¥%&'*+/=?¥¥^`{}~|¥¥-]+"; var dotAtom = aText + "(?:\\." + aText + "+)*"; var regularExpression = "^" + dotAtom + "@" + dotAtom + "$"; @@ -130,12 +130,13 @@ var passMinLen = 8; return (passMinLen <= password.length()); } + //----------------------------------------------------------------- //正しく名前が入力されているか //----------------------------------------------------------------- - private boolean isCorrectName(String name){ + private boolean isCorrectName(String name) { var nameMinLen = 1; - return (nameMinLen<= name.length()); + return (nameMinLen <= name.length()); } //-----------------------------------------------------------------