Fix merge conflict commit

Accidentally overwrote some new changes
tttzach · Jun 17, 2020 · 0f15f74 · 0f15f74
1 parent 0ffb42b
commit 0f15f74
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/portfolio/src/main/webapp/libraries.js b/portfolio/src/main/webapp/libraries.js
@@ -146,11 +146,16 @@ 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 = getEmail(json);
+  const redirectUrl = getUrl(json);
+  if (userEmail == 'N/A') {
+    const html = loginHtml(redirectUrl);
+    document.getElementById('login-status').innerHTML = html;
+  } else {
+    const html = logoutHtml(userEmail, redirectUrl);
+    document.getElementById('login-status').innerHTML = html;
+    document.getElementById('comments-form').style.display = "block";
 }
 
 function getEmail(json) {