Skip to content
This repository has been archived by the owner on Sep 30, 2019. It is now read-only.

Commit

Permalink
DMF-453 Facebook valve : send profile information to unomi
Browse files Browse the repository at this point in the history
  • Loading branch information
@amidani-jahia
amidani-jahia committed Oct 28, 2015
1 parent b772108 commit f874233
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 33 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Expand Up @@ -44,7 +44,7 @@
<parent>
<artifactId>jahia-modules</artifactId>
<groupId>org.jahia.modules</groupId>
<version>7.2.0.0-SNAPSHOT</version>
<version>7.1.0.1</version>
</parent>
<artifactId>facebook</artifactId>
<version>2.0-SNAPSHOT</version>
Expand Down
13 changes: 13 additions & 0 deletions src/main/java/org/jahia/modules/facebook/FacebookPropertiesMapping.java
View file
Expand Up @@ -3,7 +3,14 @@
import com.restfb.types.User;
import org.apache.commons.lang.StringUtils;
import org.apache.jackrabbit.util.ISO8601;
import org.jahia.services.content.decorator.JCRUserNode;
import org.jahia.services.usermanager.JahiaUser;

import javax.jcr.RepositoryException;
import javax.jcr.ValueFormatException;
import javax.jcr.lock.LockException;
import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.version.VersionException;
import java.util.*;

/**
Expand All @@ -18,6 +25,12 @@ public class FacebookPropertiesMapping {
private User fbUser;
private Properties props;

public void mapProperties(JCRUserNode jahiaUser, Properties props) throws RepositoryException {
for (Object key : props.keySet()) {
jahiaUser.setProperty(key.toString(), (String)props.get(key));
}
}

public Properties mapProperties(User fbUser, String token) {
this.fbUser = fbUser;
this.props = new Properties();
Expand Down
74 changes: 45 additions & 29 deletions src/main/java/org/jahia/params/valves/facebook/FacebookAuthValveImpl.java
View file
Expand Up @@ -44,26 +44,22 @@
import com.restfb.FacebookClient;
import com.restfb.Parameter;
import com.restfb.types.User;
import org.apache.jackrabbit.core.security.JahiaPrivilegeRegistry;
import org.apache.poi.openxml4j.opc.ContentTypes;
import org.jahia.api.Constants;
import org.jahia.modules.facebook.FacebookPropertiesMapping;
import org.jahia.modules.facebook.FacebookUtil;
import org.jahia.params.valves.AuthValveContext;
import org.jahia.params.valves.AutoRegisteredBaseAuthValve;
import org.jahia.params.valves.CookieAuthConfig;
import org.jahia.params.valves.CookieAuthValveImpl;
import org.jahia.params.valves.*;
import org.jahia.pipelines.PipelineException;
import org.jahia.pipelines.valves.ValveContext;
import org.jahia.services.SpringContextSingleton;
import org.jahia.services.content.JCRCallback;
import org.jahia.services.content.JCRNodeWrapper;
import org.jahia.services.content.JCRSessionWrapper;
import org.jahia.services.content.JCRTemplate;
import org.jahia.services.content.decorator.JCRUserNode;
import org.jahia.services.notification.HttpClientService;
import org.jahia.services.preferences.user.UserPreferencesHelper;
import org.jahia.services.usermanager.JahiaUser;
import org.jahia.services.usermanager.JahiaUserManagerService;
import org.jahia.settings.SettingsBean;
import org.jahia.utils.LanguageCodeConverters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -101,12 +97,20 @@ public class FacebookAuthValveImpl extends AutoRegisteredBaseAuthValve {

public static final String VALVE_RESULT = "login_valve_result";

private String getAccessToken(String fbCode, HttpServletRequest request)
public class LoginEvent extends BaseLoginEvent {
private static final long serialVersionUID = -7356560804745397662L;

public LoginEvent(Object source, JahiaUser jahiaUser, AuthValveContext authValveContext) {
super(source, jahiaUser, authValveContext);
}
}

private String getAccessToken(String fbCode, String site, HttpServletRequest request)
throws IOException {
// Build the URL to request the access token
StringBuilder tokenUrl = new StringBuilder();
tokenUrl.append("https://graph.facebook.com/oauth/access_token?redirect_uri=")
.append(URLEncoder.encode(request.getRequestURL().toString(), "UTF-8"))
.append(URLEncoder.encode(request.getRequestURL().toString()+"?site="+site, "UTF-8"))
.append("&client_id=").append(appId).append("&client_secret=").append(appSecret)
.append("&code=").append(fbCode);

Expand Down Expand Up @@ -147,12 +151,13 @@ public void invoke(Object context, ValveContext valveContext) throws PipelineExc
return;
}
String fbCode = request.getParameter("code");
String site = request.getParameter("site");

// If we have the code from Facebook, we can start to work
if (fbCode != null) {
try {

String fbToken = getAccessToken(fbCode, request);
String fbToken = getAccessToken(fbCode, site, request);

if (fbToken != null) {
// Get the Facebook Client based on the access token
Expand All @@ -168,27 +173,38 @@ public void invoke(Object context, ValveContext valveContext) throws PipelineExc

// Create a Jahia Facebook User based on the "business" Facebook User
final Properties props = facebookPropertiesMapping.mapProperties(user, fbToken);
JCRUserNode userNode = JCRTemplate.getInstance().doExecuteWithSystemSessionAsUser((JahiaUser) null, "default", userLocale, new JCRCallback<JCRUserNode>() {
public JCRUserNode doInJCR(JCRSessionWrapper session) throws RepositoryException {
JCRTemplate.getInstance().doExecuteWithSystemSessionAsUser((JahiaUser) null, "default", userLocale, new JCRCallback<Object>() {
public Object doInJCR(JCRSessionWrapper session) throws RepositoryException {

JahiaPrivilegeRegistry.init(session);
//Look for previous connection's user
JCRUserNode oldUser = userService.lookupUser(user.getId());
if(oldUser != null){
//There's no update we must delete any previous data
userService.deleteUser(oldUser.getPath(), session);
JCRUserNode userNode = userService.lookupUser(user.getEmail(), session);
JCRUserNode userRoot = userService.lookupUser("root");
if(userNode == null){
//Create the user in JCR
userNode = userService.createUser(user.getEmail(), "SHA-1:*", props, session);
if (userNode == null) {
throw new RuntimeException("Cannot create user from access token");
}
}else{
facebookPropertiesMapping.mapProperties(userNode, props);
}
//Create the user in JCR
JCRUserNode userNode = userService.createUser(user.getId(), "facebook", props, session);

if (userNode != null) {
//Save the session
session.save();
loginFacebookUser(authContext, request, userNode, session.getLocale());
} else {
throw new RuntimeException("Cannot retrieve user from access token");
try {
URL urlPicture = new URL(user.getPicture().getUrl());
InputStream input = urlPicture.openStream();
JCRNodeWrapper filesFolder = userNode.hasNode("files")?userNode.getNode("files"):userNode.addNode("files", "jnt:folder");
JCRNodeWrapper pictureNode = filesFolder.uploadFile(user.getId(), input, ContentTypes.IMAGE_JPEG);

if(pictureNode != null ){

pictureNode.addMixin("jmix:autoPublish");
userNode.setProperty("j:picture", pictureNode);
}
} catch (IOException e) {
e.printStackTrace();
}
return userNode;
session.save();
loginFacebookUser(authContext, request, userNode, session.getLocale());
return null;
}
});
return;
Expand Down Expand Up @@ -220,7 +236,7 @@ private void loginFacebookUser(AuthValveContext authContext, HttpServletRequest
CookieAuthValveImpl.createAndSendCookie(authContext, theUser, cookieAuthConfig);
}

//SpringContextSingleton.getInstance().publishEvent(new LoginEngineAuthValveImpl.LoginEvent(this, theUser.getJahiaUser(), authContext));
SpringContextSingleton.getInstance().publishEvent(new FacebookAuthValveImpl.LoginEvent(this, theUser.getJahiaUser(), authContext));
}

public void setAppId(String appId) {
Expand Down
3 changes: 1 addition & 2 deletions src/main/resources/META-INF/spring/mod-facebook.xml
View file
Expand Up @@ -5,8 +5,7 @@

<bean id="FacebookAuthValve" class="org.jahia.params.valves.facebook.FacebookAuthValveImpl">
<property name="appId" value="367543746749734"/>
<property name="appSecret" value="34fd97c8974b655df9856e9bef1f77f9">
</property>
<property name="appSecret" value="34fd97c8974b655df9856e9bef1f77f9"/>
<property name="httpClientService" ref="HttpClientService"/>
<property name="facebookPropertiesMapping" ref="facebookPropertiesMapping"/>
<property name="userService" ref="JahiaUserManagerService"/>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/jnt_facebookConnect/html/facebookConnect.jsp
View file
Expand Up @@ -22,7 +22,7 @@
<c:param name="client_id" value="${fbUtil:getFacebookAppID()}"/>
<c:param name="scope" value="public_profile,email"/>
<c:param name="display" value="page"/>
<c:param name="redirect_uri" value="${url.server}${url.context}${url.base}${renderContext.mainResource.node.path}.html"/>
<c:param name="redirect_uri" value="${url.server}${url.context}${url.base}${renderContext.mainResource.node.path}.html?site=${renderContext.site.name}"/>
</c:url>
<a href="${connectUrl}" >
<img src="${url.currentModule}/images/fbconnect.gif" title="Login with Facebook" />
Expand Down

0 comments on commit f874233

Please sign in to comment.