From 18c0b338455c4ebf16d3720b6f9a92d17b0d5b70 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Mon, 5 Feb 2018 15:06:12 +0300 Subject: Revert "www: fb and vk logins using hash redirects" This partially reverts commit 8aa11c92f36a5fd2fbed24e8423c8b9e14efda5f. --- juick-www/src/main/java/com/juick/www/controllers/FacebookLogin.java | 5 ++++- .../src/main/java/com/juick/www/controllers/VKontakteLogin.java | 5 ++++- juick-www/src/main/webapp/WEB-INF/layouts/content.html | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'juick-www/src') diff --git a/juick-www/src/main/java/com/juick/www/controllers/FacebookLogin.java b/juick-www/src/main/java/com/juick/www/controllers/FacebookLogin.java index 2b2a89b2..6e8d6864 100644 --- a/juick-www/src/main/java/com/juick/www/controllers/FacebookLogin.java +++ b/juick-www/src/main/java/com/juick/www/controllers/FacebookLogin.java @@ -130,7 +130,10 @@ public class FacebookLogin { if (!crosspostService.updateFacebookUser(fbID, token.getAccessToken(), fb.getName(), fb.getLink())) { throw new HttpBadRequestException(); } - return "redirect:/?hash=" + userService.getHashByUID(uid); + Cookie c = new Cookie("hash", userService.getHashByUID(uid)); + c.setMaxAge(50 * 24 * 60 * 60); + response.addCookie(c); + return Utils.getPreviousPageByRequest(request).orElse("redirect:/"); } else if (fb.getVerified()) { String loginhash = UUID.randomUUID().toString(); if (!crosspostService.createFacebookUser(fbID, loginhash, token.getAccessToken(), fb.getName(), fb.getLink())) { diff --git a/juick-www/src/main/java/com/juick/www/controllers/VKontakteLogin.java b/juick-www/src/main/java/com/juick/www/controllers/VKontakteLogin.java index 23cbedff..382c3194 100644 --- a/juick-www/src/main/java/com/juick/www/controllers/VKontakteLogin.java +++ b/juick-www/src/main/java/com/juick/www/controllers/VKontakteLogin.java @@ -123,7 +123,10 @@ public class VKontakteLogin { Long vkID = NumberUtils.toLong(jsonUser.getUid(), 0); int uid = crosspostService.getUIDbyVKID(vkID); if (uid > 0) { - return "redirect:/?hash=" + userService.getHashByUID(uid); + Cookie c = new Cookie("hash", userService.getHashByUID(uid)); + c.setMaxAge(50 * 24 * 60 * 60); + response.addCookie(c); + return Utils.getPreviousPageByRequest(request).orElse("redirect:/"); } else { String loginhash = UUID.randomUUID().toString(); if (!crosspostService.createVKUser(vkID, loginhash, token.getAccessToken(), vkName, vkLink)) { diff --git a/juick-www/src/main/webapp/WEB-INF/layouts/content.html b/juick-www/src/main/webapp/WEB-INF/layouts/content.html index 78d79eb0..f4ca0d84 100644 --- a/juick-www/src/main/webapp/WEB-INF/layouts/content.html +++ b/juick-www/src/main/webapp/WEB-INF/layouts/content.html @@ -43,7 +43,7 @@ } - + 0 %}data-hash="{{visitor.authHash}}"{% endif %}> {% include "views/partial/navigation" %}

{% if visitor.uid == 0 %} -- cgit v1.2.3