From a895027683a6ae6afdaaf8cc738126685a013b7c Mon Sep 17 00:00:00 2001 From: Rafael Klaessen Date: Fri, 5 May 2017 13:36:10 +0200 Subject: [PATCH 1/2] Added account exists verification --- src/net/wespot/oauth2/provider/AccountService.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/net/wespot/oauth2/provider/AccountService.java b/src/net/wespot/oauth2/provider/AccountService.java index 4c3e3ae..7a728e1 100644 --- a/src/net/wespot/oauth2/provider/AccountService.java +++ b/src/net/wespot/oauth2/provider/AccountService.java @@ -101,13 +101,19 @@ public String createAccount(@DefaultValue("application/json") @HeaderParam("Cont try { JSONObject accountJson = new JSONObject(account); - Account accountOfi = new Account(accountJson.getString("username"),accountJson.getString("username")) ; + String username = accountJson.getString("username"); + + if (ObjectifyService.ofy().load().key(Key.create(Account.class, username)).now() != null) { + return "Account already exists!"; + } + + Account accountOfi = new Account(username, username) ; accountOfi.setPasswordHash(hash(accountJson.getString("password"))); - accountOfi.setName(accountJson.getString("firstname")+" "+accountJson.getString("familyName")); + accountOfi.setName(accountJson.getString("firstname") + " " + accountJson.getString("familyName")); accountOfi.setFamilyName(accountJson.getString("familyName")); accountOfi.setGivenName(accountJson.getString("firstname")); - if (accountJson.has("pictureUrl")) accountOfi.setPictureUrl(accountJson.getString("pictureUrl")); + if (accountJson.has("pictureUrl")) account.setPictureUrl(accountJson.getString("pictureUrl")); accountOfi.setEmail(accountJson.getString("email")); From 74a244f29350f79c71f417d34d862b2f2de0debb Mon Sep 17 00:00:00 2001 From: Rafael Klaessen Date: Fri, 5 May 2017 13:39:43 +0200 Subject: [PATCH 2/2] Fixed typo --- src/net/wespot/oauth2/provider/AccountService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/net/wespot/oauth2/provider/AccountService.java b/src/net/wespot/oauth2/provider/AccountService.java index 7a728e1..be0a4ad 100644 --- a/src/net/wespot/oauth2/provider/AccountService.java +++ b/src/net/wespot/oauth2/provider/AccountService.java @@ -113,7 +113,7 @@ public String createAccount(@DefaultValue("application/json") @HeaderParam("Cont accountOfi.setName(accountJson.getString("firstname") + " " + accountJson.getString("familyName")); accountOfi.setFamilyName(accountJson.getString("familyName")); accountOfi.setGivenName(accountJson.getString("firstname")); - if (accountJson.has("pictureUrl")) account.setPictureUrl(accountJson.getString("pictureUrl")); + if (accountJson.has("pictureUrl")) accountOfi.setPictureUrl(accountJson.getString("pictureUrl")); accountOfi.setEmail(accountJson.getString("email"));