Commit @df00f1f17ba7ce754d9a7282aa829bbe38970ae7

doortts 2017-02-15

social-login: Make more graceful login

- Keep current page after logged in
- Don't need to refresh after logged in

@df00f1f17ba7ce754d9a7282aa829bbe38970ae7

d73aa26

df00f1f

app/service/YonaUserServicePlugin.java

--- app/service/YonaUserServicePlugin.java

+++ app/service/YonaUserServicePlugin.java


 import com.feth.play.module.pa.user.AuthUser;
 import com.feth.play.module.pa.user.AuthUserIdentity;
 import com.feth.play.module.pa.user.BasicIdentity;
+import controllers.UserApp;
 import models.User;
 import models.UserCredential;
 import play.Application;
+
+import javax.annotation.Nonnull;
 
 public class YonaUserServicePlugin extends UserServicePlugin {
     private static boolean useSocialNameSync = play.Configuration.root().getBoolean("application.use.social.login.name.sync", false);

 	public Object save(final AuthUser authUser) {
 		final boolean isLinked = UserCredential.existsByAuthUserIdentity(authUser);
 		if (!isLinked) {
-			return UserCredential.create(authUser).id;
+			UserCredential userCredential = UserCredential.create(authUser);
+			User existed = User.findByEmail(userCredential.email);
+			if (existed.isAnonymous()) {
+				UserApp.createLocalUserWithOAuth(userCredential);
+			} else {
+				UserApp.addUserInfoToSession(existed);
+			}
+			return userCredential.id;
 		} else {
 			// we have this user already, so return null
 			return null;

 		if(u != null) {
 			if(useSocialNameSync && identity instanceof BasicIdentity){
 				BasicIdentity authUser = ((BasicIdentity) identity);
+				setStatusLoggedIn(u, authUser);
 				if(!u.name.equals(authUser.getName())){
 					updateLocalUserName(u, authUser);
 				}

 		}
 	}
 
+	private void setStatusLoggedIn(@Nonnull UserCredential u, BasicIdentity authUser) {
+		User localUser = User.findByEmail(authUser.getEmail());
+		if(localUser.isAnonymous() && u.loginId == null){
+            UserApp.createLocalUserWithOAuth(u);
+        } else {
+            if (u.loginId == null) {
+                u.loginId = localUser.loginId;
+                u.user = localUser;
+                u.update();
+            }
+            UserApp.addUserInfoToSession(localUser);
+        }
+	}
+
 	private void updateLocalUserName(UserCredential u, BasicIdentity authUser) {
 		u.name = authUser.getName();
 		u.update();

d73aa26

df00f1f

app/views/common/loginDialog.scala.html

--- app/views/common/loginDialog.scala.html

+++ app/views/common/loginDialog.scala.html


                 <a href="@p.getUrl" class="ybtn oauth-login-btn">@Html(providerWithLogo(p.getKey))</a>
               }
             }
+          } else {
+            <a href="@routes.Application.oAuthLogout()" class="ybtn oauth-login-btn">@Messages("title.logout")</a>
           }
         }
       </div>

d73aa26

df00f1f

app/views/common/usermenu.scala.html

--- app/views/common/usermenu.scala.html

+++ app/views/common/usermenu.scala.html


 * Copyright Yona & Yobi Authors & NAVER Corp.
 * https://yona.io
 **@
+@import org.apache.commons.lang3.StringUtils
 @(project:Project)
 @import utils.TemplateHelper._
 @import com.feth.play.module.pa.PlayAuthenticate._

 @if(UserApp.currentUser().isAnonymous){
     @currentAuth() { auth => @{
             if(auth == null) {
-                val url = storeOriginalUrl(Context.current())
-            } else {
-                UserApp.linkWithExistedOrCreateLocalUser()
+                val redirect = Context.current().request().getQueryString("redirectUrl")
+                if(StringUtils.isNotEmpty(redirect)) {
+                    val url = Context.current().session().put("pa.url.orig", redirect)
+                } else {
+                    val url = storeOriginalUrl(Context.current())
+                }
             }
         }
     }
 }
+
 <div id="mySidenav" class="sidenav">
     <div class="span5 right-menu span-hard-wrap">
         <div class="row-fluid user-menu-wrap">

Add a comment

Open 0
Closed 0

List

...	...	@@ -4,9 +4,12 @@
4	4	import com.feth.play.module.pa.user.AuthUser;
5	5	import com.feth.play.module.pa.user.AuthUserIdentity;
6	6	import com.feth.play.module.pa.user.BasicIdentity;
	7	+import controllers.UserApp;
7	8	import models.User;
8	9	import models.UserCredential;
9	10	import play.Application;
	11	+
	12	+import javax.annotation.Nonnull;
10	13
11	14	public class YonaUserServicePlugin extends UserServicePlugin {
12	15	private static boolean useSocialNameSync = play.Configuration.root().getBoolean("application.use.social.login.name.sync", false);
...	...	@@ -19,7 +22,14 @@
19	22	public Object save(final AuthUser authUser) {
20	23	final boolean isLinked = UserCredential.existsByAuthUserIdentity(authUser);
21	24	if (!isLinked) {
22		- return UserCredential.create(authUser).id;
	25	+ UserCredential userCredential = UserCredential.create(authUser);
	26	+ User existed = User.findByEmail(userCredential.email);
	27	+ if (existed.isAnonymous()) {
	28	+ UserApp.createLocalUserWithOAuth(userCredential);
	29	+ } else {
	30	+ UserApp.addUserInfoToSession(existed);
	31	+ }
	32	+ return userCredential.id;
23	33	} else {
24	34	// we have this user already, so return null
25	35	return null;
...	...	@@ -34,6 +44,7 @@
34	44	if(u != null) {
35	45	if(useSocialNameSync && identity instanceof BasicIdentity){
36	46	BasicIdentity authUser = ((BasicIdentity) identity);
	47	+ setStatusLoggedIn(u, authUser);
37	48	if(!u.name.equals(authUser.getName())){
38	49	updateLocalUserName(u, authUser);
39	50	}
...	...	@@ -44,6 +55,20 @@
44	55	}
45	56	}
46	57
	58	+ private void setStatusLoggedIn(@Nonnull UserCredential u, BasicIdentity authUser) {
	59	+ User localUser = User.findByEmail(authUser.getEmail());
	60	+ if(localUser.isAnonymous() && u.loginId == null){
	61	+ UserApp.createLocalUserWithOAuth(u);
	62	+ } else {
	63	+ if (u.loginId == null) {
	64	+ u.loginId = localUser.loginId;
	65	+ u.user = localUser;
	66	+ u.update();
	67	+ }
	68	+ UserApp.addUserInfoToSession(localUser);
	69	+ }
	70	+ }
	71	+
47	72	private void updateLocalUserName(UserCredential u, BasicIdentity authUser) {
48	73	u.name = authUser.getName();
49	74	u.update();

...	...	@@ -62,6 +62,8 @@
62	62	<a href="@p.getUrl" class="ybtn oauth-login-btn">@Html(providerWithLogo(p.getKey))</a>
63	63	}
64	64	}
	65	+ } else {
	66	+ <a href="@routes.Application.oAuthLogout()" class="ybtn oauth-login-btn">@Messages("title.logout")</a>
65	67	}
66	68	}
67	69	</div>

...	...	@@ -4,6 +4,7 @@
4	4	* Copyright Yona & Yobi Authors & NAVER Corp.
5	5	* https://yona.io
6	6	**@
	7	+@import org.apache.commons.lang3.StringUtils
7	8	@(project:Project)
8	9	@import utils.TemplateHelper._
9	10	@import com.feth.play.module.pa.PlayAuthenticate._
...	...	@@ -13,13 +14,17 @@
13	14	@if(UserApp.currentUser().isAnonymous){
14	15	@currentAuth() { auth => @{
15	16	if(auth == null) {
16		- val url = storeOriginalUrl(Context.current())
17		- } else {
18		- UserApp.linkWithExistedOrCreateLocalUser()
	17	+ val redirect = Context.current().request().getQueryString("redirectUrl")
	18	+ if(StringUtils.isNotEmpty(redirect)) {
	19	+ val url = Context.current().session().put("pa.url.orig", redirect)
	20	+ } else {
	21	+ val url = storeOriginalUrl(Context.current())
	22	+ }
19	23	}
20	24	}
21	25	}
22	26	}
	27	+
23	28	<div id="mySidenav" class="sidenav">
24	29	<div class="span5 right-menu span-hard-wrap">
25	30	<div class="row-fluid user-menu-wrap">

Delete comment