From 0b85980d2a84302c558085dafd0ca9558c5b01d6 Mon Sep 17 00:00:00 2001
From: NMerz <nmerz@icloud.com>
Date: Sun, 29 Nov 2020 21:41:38 -0500
Subject: [PATCH] User ease of use

Make email retrieveable client-facing
---
 Lambdas/Lists/ListShare/src/ListSharer.java   |  3 ++-
 Lambdas/Lists/User/src/User.java              | 26 +++++++++++++++++++
 Lambdas/Lists/User/src/UserGetter.java        |  2 +-
 .../java/com/example/listify/data/User.java   | 23 ++++++++++++++++
 4 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 Lambdas/Lists/User/src/User.java

diff --git a/Lambdas/Lists/ListShare/src/ListSharer.java b/Lambdas/Lists/ListShare/src/ListSharer.java
index a80d0d8..2273399 100644
--- a/Lambdas/Lists/ListShare/src/ListSharer.java
+++ b/Lambdas/Lists/ListShare/src/ListSharer.java
@@ -1,6 +1,7 @@
 import com.amazonaws.services.lambda.AWSLambdaClientBuilder;
 import com.amazonaws.services.lambda.model.InvokeRequest;
 import com.amazonaws.services.lambda.model.InvokeResult;
+import com.google.gson.Gson;
 
 import java.security.AccessControlException;
 import java.sql.Connection;
@@ -56,7 +57,7 @@ public class ListSharer implements CallHandler {
         if (invokeResult.getStatusCode() != 200) {
             throw new InputMismatchException("Could not find specified user to share with");
         }
-        String shareWithSub = new String(invokeResult.getPayload().array()).replace("\"", "");
+        String shareWithSub = new Gson().fromJson(new String(invokeResult.getPayload().array()), User.class).cognitoID;
 //        checkAccess.setString(2, shareWithSub);
 //        checkAccessRS = checkAccess.executeQuery();
 //        if (checkAccessRS.next()) {
diff --git a/Lambdas/Lists/User/src/User.java b/Lambdas/Lists/User/src/User.java
new file mode 100644
index 0000000..e3ceb43
--- /dev/null
+++ b/Lambdas/Lists/User/src/User.java
@@ -0,0 +1,26 @@
+
+public class User {
+    String cognitoID;
+    String email;
+
+    public User(String cognitoID, String email) {
+        this.cognitoID = cognitoID;
+        this.email = email;
+    }
+
+    public String getCognitoID() {
+        return cognitoID;
+    }
+
+    public void setCognitoID(String cognitoID) {
+        this.cognitoID = cognitoID;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+}
diff --git a/Lambdas/Lists/User/src/UserGetter.java b/Lambdas/Lists/User/src/UserGetter.java
index 42d7422..93a8ff3 100644
--- a/Lambdas/Lists/User/src/UserGetter.java
+++ b/Lambdas/Lists/User/src/UserGetter.java
@@ -66,6 +66,6 @@ public class UserGetter implements CallHandler {
             }
             System.out.println(attribute.getName() + ": " + attribute.getValue());
         }
-        return attributeToReturn;
+        return new User(cognitoID, attributeToReturn);
     }
 }
diff --git a/Listify/app/src/main/java/com/example/listify/data/User.java b/Listify/app/src/main/java/com/example/listify/data/User.java
index 65ba3e6..e12952d 100644
--- a/Listify/app/src/main/java/com/example/listify/data/User.java
+++ b/Listify/app/src/main/java/com/example/listify/data/User.java
@@ -1,4 +1,27 @@
 package com.example.listify.data;
 
 public class User {
+    String cognitoID;
+    String email;
+
+    public User(String cognitoID, String email) {
+        this.cognitoID = cognitoID;
+        this.email = email;
+    }
+
+    public String getCognitoID() {
+        return cognitoID;
+    }
+
+    public void setCognitoID(String cognitoID) {
+        this.cognitoID = cognitoID;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
 }