diff --git a/Lambdas/Lists/User/src/UserGetter.java b/Lambdas/Lists/User/src/UserGetter.java index d19fc20..41c9b27 100644 --- a/Lambdas/Lists/User/src/UserGetter.java +++ b/Lambdas/Lists/User/src/UserGetter.java @@ -33,15 +33,12 @@ public class UserGetter implements CallHandler { checkRequest.setFilter("email=\"" + emailObject.toString() +"\""); } else { try { -// String id = queryMap.get("id"); + String id = queryMap.get("id"); attributeToGet = "email"; checkRequest.setFilter("sub=\"" + cognitoID + "\""); -// if ((id != null) && (!id.equals(""))) { -// attributeToGet = "email"; -// checkRequest.setFilter("sub=\"" + cognitoID + "\""); -// } else { -// return cognitoID; -// } + if ((id != null) && (!id.equals(""))) { + checkRequest.setFilter("sub=\"" + id + "\""); + } } catch (Exception e) { System.out.println(e); return new User(cognitoID, null); diff --git a/Listify/app/src/main/java/com/example/listify/AuthManager.java b/Listify/app/src/main/java/com/example/listify/AuthManager.java index 5ded460..2573157 100644 --- a/Listify/app/src/main/java/com/example/listify/AuthManager.java +++ b/Listify/app/src/main/java/com/example/listify/AuthManager.java @@ -69,7 +69,7 @@ public class AuthManager { jsonException.printStackTrace(); } SynchronousReceiver userSynchronousReceiver = new SynchronousReceiver<>(); - requestor.getObject("self", User.class, userSynchronousReceiver); + requestor.getObject("", User.class, userSynchronousReceiver); try { email = userSynchronousReceiver.await().getEmail(); } catch (Exception e) {