Add Authentication extra features to Comments tab

portfolio/pom.xml

@@ -33,6 +33,11 @@
       <artifactId>appengine-api-1.0-sdk</artifactId>
       <version>1.9.59</version>
     </dependency>
+    <dependency>
+      <groupId>org.javatuples</groupId>
+      <artifactId>javatuples</artifactId>
+      <version>1.2</version>
+    </dependency>
     <dependency>
       <groupId>com.opencsv</groupId>
       <artifactId>opencsv</artifactId>

portfolio/src/main/java/com/google/sps/servlets/AuthenticationServlet.java

@@ -27,16 +27,19 @@ public class AuthenticationServlet extends HttpServlet {
 
   @Override
   public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
-    response.setContentType("text/html");
+    response.setContentType("application/json");
     UserService userService = UserServiceFactory.getUserService();
     String redirectUrl = "/index.html";
     if (userService.isUserLoggedIn()) {
+      String userEmail = userService.getCurrentUser().getEmail();
       String logoutUrl = userService.createLogoutURL(redirectUrl);
-      response.getWriter().println("<p>Logout <a href=\"" + logoutUrl + "\">here</a>.");
-    } else {
-      String loginUrl = userService.createLoginURL(redirectUrl);
-      response.getWriter().println("<p>Login <a href=\"" + loginUrl + "\">here</a>.");
+      UserInfo userInfo = new UserInfo(userEmail, logoutUrl, true);
+      JsonUtil.sendJson(response, userInfo);
+      return;
     }
+    String loginUrl = userService.createLoginURL(redirectUrl);
+    UserInfo userInfo = new UserInfo("", loginUrl, false);
+    JsonUtil.sendJson(response, userInfo);
   }
-  
+
 }

portfolio/src/main/java/com/google/sps/servlets/JsonUtil.java

@@ -0,0 +1,29 @@
+// Copyright 2019 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.sps.servlets;
+
+import com.google.gson.Gson;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+
+public final class JsonUtil {
+
+  public static void sendJson(HttpServletResponse response, Object object) throws IOException {
+    Gson gson = new Gson();
+    String json = gson.toJson(object);
+    response.getWriter().println(json);
+  }
+
+}

portfolio/src/main/java/com/google/sps/servlets/ListCommentsServlet.java

@@ -18,12 +18,11 @@
 import com.google.appengine.api.datastore.DatastoreServiceFactory;
 import com.google.appengine.api.datastore.Entity;
 import com.google.appengine.api.datastore.PreparedQuery;
-import com.google.appengine.api.datastore.Query;
 import com.google.appengine.api.datastore.Query.SortDirection;
-import com.google.gson.Gson;
+import com.google.appengine.api.datastore.Query;
 import java.io.IOException;
-import java.util.Iterator;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
@@ -39,7 +38,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
     PreparedQuery results = prepareQuery();
     int max = getMax(request);
     List<String> comments = getCommentsToDisplay(results, max);
-    sendJson(response, comments);
+    JsonUtil.sendJson(response, comments);
   }
 
   private PreparedQuery prepareQuery() {
@@ -60,16 +59,11 @@ private List<String> getCommentsToDisplay(PreparedQuery results, int max) {
     Iterator<Entity> iterator = results.asIterator();
     for (int i = 0; (i < max) && (iterator.hasNext()); ++i) {
       Entity entity = iterator.next();
+      String email = (String) entity.getProperty("email");
       String comment = (String) entity.getProperty("comment");
-      comments.add(comment);
+      comments.add(email + ": " + comment);
     }
     return comments;
   }
-
-  private void sendJson(HttpServletResponse response, List<String> comments) throws IOException {
-    Gson gson = new Gson();
-    response.setContentType("application/json;");
-    response.getWriter().println(gson.toJson(comments));
-  }
 
 }

portfolio/src/main/java/com/google/sps/servlets/NewCommentServlet.java

@@ -17,6 +17,8 @@
 import com.google.appengine.api.datastore.DatastoreService;
 import com.google.appengine.api.datastore.DatastoreServiceFactory;
 import com.google.appengine.api.datastore.Entity;
+import com.google.appengine.api.users.UserService;
+import com.google.appengine.api.users.UserServiceFactory;
 import java.io.IOException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
@@ -29,17 +31,20 @@ public class NewCommentServlet extends HttpServlet {
 
   @Override
   public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
+    UserService userService = UserServiceFactory.getUserService();
+    String email = userService.getCurrentUser().getEmail();
     String comment = request.getParameter("comment");
     long timestamp = System.currentTimeMillis();
-    Entity commentEntity = createEntity(comment, timestamp);
+    Entity commentEntity = createEntity(comment, timestamp, email);
     putEntity(commentEntity);
     response.sendRedirect("/index.html");
   }
 
-  private Entity createEntity(String comment, long timestamp) {
+  private Entity createEntity(String comment, long timestamp, String email) {
     Entity entity = new Entity("Comment");
     entity.setProperty("comment", comment);
     entity.setProperty("timestamp", timestamp);
+    entity.setProperty("email", email);
     return entity;
   }
 

portfolio/src/main/java/com/google/sps/servlets/UserInfo.java

@@ -0,0 +1,41 @@
+// Copyright 2019 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.sps.servlets;
+
+public class UserInfo {
+
+  private String email;
+  private String loginOrLogoutUrl;
+  private boolean loggedIn;
+
+  UserInfo(String email, String loginOrLogoutUrl, boolean loggedIn) {
+    this.email = email;
+    this.loginOrLogoutUrl = loginOrLogoutUrl;
+    this.loggedIn = loggedIn;
+  }
+
+  public String getEmail(){
+    return email;
+  }
+
+  public String getLoginOrLogoutUrl(){
+    return loginOrLogoutUrl;
+  }
+
+  public boolean isLoggedIn() {
+    return loggedIn;
+  }
+
+}

portfolio/src/main/webapp/libraries.js

@@ -146,9 +146,24 @@ function drawCoronavirusChart() {
 
 async function getLoginStatus() {
   const response = await fetch('/authentication');
-  const responseHtml = await response.text();
-  document.getElementById('login-status').innerHTML = responseHtml;
-  if (responseHtml.includes('Logout')) {
-    document.getElementById('comments-form').style.display = 'block';
+  const json = await response.json();
+  const userEmail = json["email"];
+  const redirectUrl = json["loginOrLogoutUrl"];
+  const loggedIn = json["loggedIn"];
+  if (!loggedIn) {
+    const html = loginHtml(redirectUrl);
+    document.getElementById('login-status').innerHTML = html;
+    return;
   }
+  const html = logoutHtml(userEmail, redirectUrl);
+  document.getElementById('login-status').innerHTML = html;
+  document.getElementById('comments-form').style.display = "block";
+}
+
+function loginHtml(loginUrl) {
+  return `<p>Login <a href=\ ${loginUrl} \>here</a>.`;
+}
+
+function logoutHtml(userEmail, logoutUrl) {
+  return `<p>Hi ${userEmail}! Logout <a href=\ ${logoutUrl} \>here</a>.`;
 }