Google sing in upgrade

orcid-web/pom.xml

@@ -150,22 +150,22 @@
 		<dependency>
 			<groupId>org.springframework.social</groupId>
 			<artifactId>spring-social-core</artifactId>
-			<version>1.1.4.RELEASE</version>
+			<version>1.1.6.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.social</groupId>
 			<artifactId>spring-social-web</artifactId>
-			<version>1.1.4.RELEASE</version>
+			<version>1.1.6.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.social</groupId>
 			<artifactId>spring-social-facebook</artifactId>
 			<version>3.0.0.GRAPH-v2.10-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.social</groupId>
-			<artifactId>spring-social-google</artifactId>
-			<version>1.0.0.RELEASE</version>
+    		<groupId>com.github.spring-social</groupId>
+    		<artifactId>spring-social-google</artifactId>
+   			<version>1.1.3</version>
 		</dependency>
         <dependency>
             <groupId>com.sun.jersey</groupId>

orcid-web/src/main/java/org/orcid/frontend/spring/SocialAjaxAuthenticationSuccessHandler.java

@@ -10,6 +10,7 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.orcid.core.manager.UserConnectionManager;
+import org.orcid.frontend.spring.web.social.GoogleSignIn;
 import org.orcid.frontend.spring.web.social.config.SocialContext;
 import org.orcid.frontend.spring.web.social.config.SocialType;
 import org.orcid.persistence.jpa.entities.UserconnectionEntity;
@@ -18,6 +19,7 @@
 import org.springframework.social.facebook.api.Facebook;
 import org.springframework.social.facebook.api.User;
 import org.springframework.social.google.api.Google;
+import org.springframework.social.google.api.oauth2.UserInfo;
 import org.springframework.social.google.api.plus.Person;
 
 public class SocialAjaxAuthenticationSuccessHandler extends AjaxAuthenticationSuccessHandlerBase {
@@ -65,11 +67,13 @@ private Map<String, String> retrieveUserDetails(SocialType connectionType) {
             userMap.put("userName", user.getName());
             userMap.put("email", user.getEmail());
         } else if (SocialType.GOOGLE.equals(connectionType)) {
-            Google google = socialContext.getGoogle();
-            Person person = google.plusOperations().getGoogleProfile();
-            userMap.put("providerUserId", person.getId());
-            userMap.put("userName", person.getDisplayName());
-            userMap.put("email", person.getAccountEmail());
+            GoogleSignIn google = socialContext.getGoogle();
+            UserInfo userInfo = google.getUserInfo();
+            userMap.put("providerUserId", userInfo.getId());
+            userMap.put("userName", userInfo.getName());
+            userMap.put("email", userInfo.getEmail());
+            userMap.put("firstName", userInfo.getGivenName());
+            userMap.put("lastName", userInfo.getFamilyName());            
         }
 
         return userMap;

orcid-web/src/main/java/org/orcid/frontend/spring/web/social/GoogleSignIn.java

@@ -0,0 +1,9 @@
+package org.orcid.frontend.spring.web.social;
+
+import org.springframework.social.google.api.Google;
+import org.springframework.social.google.api.oauth2.UserInfo;
+
+public interface GoogleSignIn extends Google {
+
+    UserInfo getUserInfo();
+}

orcid-web/src/main/java/org/orcid/frontend/spring/web/social/GoogleSignInImpl.java

@@ -0,0 +1,23 @@
+package org.orcid.frontend.spring.web.social;
+
+import org.springframework.social.google.api.impl.GoogleTemplate;
+import org.springframework.social.google.api.oauth2.OAuth2Operations;
+import org.springframework.social.google.api.oauth2.UserInfo;
+
+public class GoogleSignInImpl extends GoogleTemplate implements GoogleSignIn {
+
+    public GoogleSignInImpl() {
+        super();
+    }
+
+    public GoogleSignInImpl(String accessToken) {
+        super(accessToken);
+    }
+
+    @Override
+    public UserInfo getUserInfo() {
+        OAuth2Operations op = oauth2Operations();
+        return op.getUserinfo();
+    }
+
+}

orcid-web/src/main/java/org/orcid/frontend/spring/web/social/config/SocialConfig.java

@@ -3,6 +3,8 @@
 import javax.annotation.Resource;
 import javax.sql.DataSource;
 
+import org.orcid.frontend.spring.web.social.GoogleSignIn;
+import org.orcid.frontend.spring.web.social.GoogleSignInImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
@@ -22,7 +24,6 @@
 import org.springframework.social.facebook.api.impl.FacebookTemplate;
 import org.springframework.social.facebook.connect.FacebookConnectionFactory;
 import org.springframework.social.google.api.Google;
-import org.springframework.social.google.api.impl.GoogleTemplate;
 import org.springframework.social.google.connect.GoogleConnectionFactory;
 
 /**
@@ -31,84 +32,82 @@
 @Configuration
 public class SocialConfig implements InitializingBean {
 
-	private static final Logger logger = LoggerFactory.getLogger(SocialConfig.class);
-
-	@Value("${org.orcid.social.fb.key}")
-	private String fb_key;
-	@Value("${org.orcid.social.fb.secret}")
-	private String fb_secret;
-	@Value("${org.orcid.social.gg.key}")
-	private String gg_key;
-	@Value("${org.orcid.social.gg.secret}")
-	private String gg_secret;
-
-	private SocialContext socialContext;
-
-	private UsersConnectionRepository usersConnectionRepositiory;
-
-	@Resource
-	private DataSource simpleDataSource;
-
-	@Value("${org.orcid.core.baseUri}")
-	private String appUrl;
-
-	@Bean
-	public SocialContext socialContext() {
-
-		return socialContext;
-	}
-
-	@Bean
-	public ConnectionFactoryLocator connectionFactoryLocator() {
-		logger.info("getting connectionFactoryLocator");
-		ConnectionFactoryRegistry registry = new ConnectionFactoryRegistry();
-		registry.addConnectionFactory(new FacebookConnectionFactory(fb_key, fb_secret));
-		registry.addConnectionFactory(new GoogleConnectionFactory(gg_key, gg_secret));
-		return registry;
-	}
-
-	@Bean
-	public UsersConnectionRepository usersConnectionRepository() {
-		return usersConnectionRepositiory;
-	}
-
-	@Bean
-	@Scope(value = "request", proxyMode = ScopedProxyMode.INTERFACES)
-	public ConnectionRepository connectionRepository() {
-		String userId = socialContext.getUserId();
-		return usersConnectionRepository().createConnectionRepository(userId);
-	}
-
-	@Bean
-	@Scope(value = "request", proxyMode = ScopedProxyMode.INTERFACES)
-	public Facebook facebook() {
-		String accessToken = connectionRepository().getPrimaryConnection(Facebook.class).createData().getAccessToken();
-		return new FacebookTemplate(accessToken);
-	}
-
-	@Bean
-	@Scope(value = "request", proxyMode = ScopedProxyMode.INTERFACES)
-	public Google google() {
-		String accessToken = connectionRepository().getPrimaryConnection(Google.class).createData().getAccessToken();
-		return new GoogleTemplate(accessToken);
-	}
-
-	@Bean
-	public ProviderSignInController providerSignInController() {
-		ProviderSignInController providerSigninController = new ProviderSignInController(connectionFactoryLocator(),
-				usersConnectionRepository(), socialContext);
-		providerSigninController.setPostSignInUrl(appUrl + "/social/access");
-		providerSigninController.setApplicationUrl(appUrl);
-		return providerSigninController;
-	}
-
-	@Override
-	public void afterPropertiesSet() throws Exception {
-
-		JdbcUsersConnectionRepository usersConnectionRepositiory = new JdbcUsersConnectionRepository(simpleDataSource,
-				connectionFactoryLocator(), Encryptors.noOpText());
-		socialContext = new SocialContext(usersConnectionRepositiory, new UserCookieGenerator(), facebook(), google());
-		usersConnectionRepositiory.setConnectionSignUp(socialContext);
-		this.usersConnectionRepositiory = usersConnectionRepositiory;
-	}
+    private static final Logger logger = LoggerFactory.getLogger(SocialConfig.class);
+
+    @Value("${org.orcid.social.fb.key}")
+    private String fb_key;
+    @Value("${org.orcid.social.fb.secret}")
+    private String fb_secret;
+    @Value("${org.orcid.social.gg.key}")
+    private String gg_key;
+    @Value("${org.orcid.social.gg.secret}")
+    private String gg_secret;
+
+    private SocialContext socialContext;
+
+    private UsersConnectionRepository usersConnectionRepositiory;
+
+    @Resource
+    private DataSource simpleDataSource;
+
+    @Value("${org.orcid.core.baseUri}")
+    private String appUrl;
+
+    @Bean
+    public SocialContext socialContext() {
+
+        return socialContext;
+    }
+
+    @Bean
+    public ConnectionFactoryLocator connectionFactoryLocator() {
+        logger.info("getting connectionFactoryLocator");
+        ConnectionFactoryRegistry registry = new ConnectionFactoryRegistry();
+        registry.addConnectionFactory(new FacebookConnectionFactory(fb_key, fb_secret));
+        registry.addConnectionFactory(new GoogleConnectionFactory(gg_key, gg_secret));
+        return registry;
+    }
+
+    @Bean
+    public UsersConnectionRepository usersConnectionRepository() {
+        return usersConnectionRepositiory;
+    }
+
+    @Bean
+    @Scope(value = "request", proxyMode = ScopedProxyMode.INTERFACES)
+    public ConnectionRepository connectionRepository() {
+        String userId = socialContext.getUserId();
+        return usersConnectionRepository().createConnectionRepository(userId);
+    }
+
+    @Bean
+    @Scope(value = "request", proxyMode = ScopedProxyMode.INTERFACES)
+    public Facebook facebook() {
+        String accessToken = connectionRepository().getPrimaryConnection(Facebook.class).createData().getAccessToken();
+        return new FacebookTemplate(accessToken);
+    }
+
+    @Bean
+    @Scope(value = "request", proxyMode = ScopedProxyMode.INTERFACES)
+    public GoogleSignIn google() {
+        String accessToken = connectionRepository().getPrimaryConnection(Google.class).createData().getAccessToken();
+        return new GoogleSignInImpl(accessToken);
+    }
+
+    @Bean
+    public ProviderSignInController providerSignInController() {
+        ProviderSignInController providerSigninController = new ProviderSignInController(connectionFactoryLocator(), usersConnectionRepository(), socialContext);
+        providerSigninController.setPostSignInUrl(appUrl + "/social/access");
+        providerSigninController.setApplicationUrl(appUrl);
+        return providerSigninController;
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+
+        JdbcUsersConnectionRepository usersConnectionRepositiory = new JdbcUsersConnectionRepository(simpleDataSource, connectionFactoryLocator(), Encryptors.noOpText());
+        socialContext = new SocialContext(usersConnectionRepositiory, new UserCookieGenerator(), facebook(), google());
+        usersConnectionRepositiory.setConnectionSignUp(socialContext);
+        this.usersConnectionRepositiory = usersConnectionRepositiory;
+    }
 }