Index: .idea/artifacts/standard_config_war_exploded.xml =================================================================== diff -u -rac874a0037a5cd5f0a9ca8ff4500ab2b1d652900 -r4bb1c91d523a0051f87344908936f42c8661dc03 --- .idea/artifacts/standard_config_war_exploded.xml (.../standard_config_war_exploded.xml) (revision ac874a0037a5cd5f0a9ca8ff4500ab2b1d652900) +++ .idea/artifacts/standard_config_war_exploded.xml (.../standard_config_war_exploded.xml) (revision 4bb1c91d523a0051f87344908936f42c8661dc03) @@ -9,7 +9,7 @@ - + Index: .idea/artifacts/standard_server_war_exploded.xml =================================================================== diff -u -rac874a0037a5cd5f0a9ca8ff4500ab2b1d652900 -r4bb1c91d523a0051f87344908936f42c8661dc03 --- .idea/artifacts/standard_server_war_exploded.xml (.../standard_server_war_exploded.xml) (revision ac874a0037a5cd5f0a9ca8ff4500ab2b1d652900) +++ .idea/artifacts/standard_server_war_exploded.xml (.../standard_server_war_exploded.xml) (revision 4bb1c91d523a0051f87344908936f42c8661dc03) @@ -7,7 +7,7 @@ - + @@ -188,6 +188,7 @@ + Index: .idea/sonarIssues.xml =================================================================== diff -u -rac874a0037a5cd5f0a9ca8ff4500ab2b1d652900 -r4bb1c91d523a0051f87344908936f42c8661dc03 --- .idea/sonarIssues.xml (.../sonarIssues.xml) (revision ac874a0037a5cd5f0a9ca8ff4500ab2b1d652900) +++ .idea/sonarIssues.xml (.../sonarIssues.xml) (revision 4bb1c91d523a0051f87344908936f42c8661dc03) @@ -23,6 +23,11 @@ + + + + + @@ -78,6 +83,11 @@ + + + + + @@ -368,6 +378,11 @@ + + + + + Index: development-project/pom.xml =================================================================== diff -u -r3fe0b545432d7e3353e0476a7a6de160acdb73af -r4bb1c91d523a0051f87344908936f42c8661dc03 --- development-project/pom.xml (.../pom.xml) (revision 3fe0b545432d7e3353e0476a7a6de160acdb73af) +++ development-project/pom.xml (.../pom.xml) (revision 4bb1c91d523a0051f87344908936f42c8661dc03) @@ -59,9 +59,9 @@ http://www.313.co.kr/bamboo - scm:svn:http://www.313.co.kr/steady/trunk - http://www.313.co.kr/steady/trunk - scm:svn:http://www.313.co.kr/steady/trunk + https://github.com/jstree/jsTree-Service-Framework-Frontend-App.git + https://github.com/jstree + https://github.com/jstree/jsTree-Service-Framework-Backend-App.git Index: development-project/project-standard/standard-server/pom.xml =================================================================== diff -u -r45440e06665841c816c5998756a7cb2fc3a4e252 -r4bb1c91d523a0051f87344908936f42c8661dc03 --- development-project/project-standard/standard-server/pom.xml (.../pom.xml) (revision 45440e06665841c816c5998756a7cb2fc3a4e252) +++ development-project/project-standard/standard-server/pom.xml (.../pom.xml) (revision 4bb1c91d523a0051f87344908936f42c8661dc03) @@ -1,184 +1,178 @@ - - 4.0.0 + + 4.0.0 - - development - project-standard - ${project.version} - ../pom.xml - + + development + project-standard + ${project.version} + ../pom.xml + - standard-server - war - standard-server - - server by 313 DEV GRP - + standard-server + war + standard-server + server by 313 DEV GRP - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - + + + + development + standard-server-support + ${project.version} + pom + + + javax.servlet + javax.servlet-api + 3.1.0 + + + javax.servlet.jsp + javax.servlet.jsp-api + 2.3.1 + + + javax.servlet + jstl + 1.2 + + + javax.annotation + jsr250-api + 1.0 + + + javax.servlet.jsp.jstl + jstl-api + 1.2 + + + taglibs + standard + 1.1.2 + + + + javax.websocket + javax.websocket-api + 1.1 + - + + + kr.go.mgov + smeapi + 2.7 + system + ${basedir}/src/main/webapp/WEB-INF/lib/smeapi_2_7.jar + + + + kr.go.gpki + gpkisecureweb + 1.0.4.9 + system + ${basedir}/src/main/webapp/WEB-INF/lib/gpkisecureweb-1.0.4.9.jar + + + kr.go.gpki + libgpkiapi_jni + 1.4.0.0 + system + ${basedir}/src/main/webapp/WEB-INF/lib/libgpkiapi_jni-1.4.0.0.jar + + - - - development - standard-server-support - ${project.version} - pom - + + + install + ${basedir}/target + standard-server - - javax.servlet - javax.servlet-api - 3.1.0 - - - javax.servlet.jsp - javax.servlet.jsp-api - 2.3.1 - - - javax.servlet - jstl - 1.2 - - - javax.annotation - jsr250-api - 1.0 - - - javax.servlet.jsp.jstl - jstl-api - 1.2 - + + + org.apache.tomcat.maven + tomcat7-maven-plugin + 2.2 + + + deploy + + redeploy + + + + + UTF-8 + UTF-8 + http://ubuntu.313.co.kr:58080/manager/text + StandardProject-Snapshot + / + org.apache.coyote.http11.Http11NioProtocol + + + + org.apache.maven.plugins + maven-war-plugin + 2.6 + + false + + + false + + + ${maven.build.timestamp} + default + ${user.name} + Maven 3.0.5 + ${java.version} + ${os.name} + ${project.version} + ${basedir} + Korea Standard Project + + + + + - - - javax.websocket - javax.websocket-api - 1.1 - + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + UTF-8 + + + + org.codehaus.mojo + hibernate3-maven-plugin + 2.1 + + + + hbm2ddl + annotationconfiguration + + + + + + org.hsqldb + hsqldb + 2.3.2 + + + - - - kr.go.mgov - smeapi - 2.7 - system - ${basedir}/src/main/webapp/WEB-INF/lib/smeapi_2_7.jar - - - - kr.go.gpki - gpkisecureweb - 1.0.4.9 - system - ${basedir}/src/main/webapp/WEB-INF/lib/gpkisecureweb-1.0.4.9.jar - - - kr.go.gpki - libgpkiapi_jni - 1.4.0.0 - system - ${basedir}/src/main/webapp/WEB-INF/lib/libgpkiapi_jni-1.4.0.0.jar - - + + - - - install - ${basedir}/target - standard-server - - - - org.apache.tomcat.maven - tomcat7-maven-plugin - 2.2 - - - deploy - - redeploy - - - - - UTF-8 - UTF-8 - http://ubuntu.313.co.kr:58080/manager/text - StandardProject-Snapshot - / - org.apache.coyote.http11.Http11NioProtocol - - - - org.apache.maven.plugins - maven-war-plugin - 2.6 - - false - - - false - - - ${maven.build.timestamp} - default - ${user.name} - Maven 3.0.5 - ${java.version} - ${os.name} - ${project.version} - ${basedir} - Korea Standard Project - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - UTF-8 - - - - org.codehaus.mojo - hibernate3-maven-plugin - 2.1 - - - - hbm2ddl - annotationconfiguration - - - - - - org.hsqldb - hsqldb - 2.3.2 - - - - - - - - + Index: development-project/project-standard/standard-server/src/main/java/egovframework/com/uss/ion/fbk/web/EgovFacebookController.java =================================================================== diff -u -r0c7635f0ac01fdbd111482b3bf45b7aad00364ca -r4bb1c91d523a0051f87344908936f42c8661dc03 --- development-project/project-standard/standard-server/src/main/java/egovframework/com/uss/ion/fbk/web/EgovFacebookController.java (.../EgovFacebookController.java) (revision 0c7635f0ac01fdbd111482b3bf45b7aad00364ca) +++ development-project/project-standard/standard-server/src/main/java/egovframework/com/uss/ion/fbk/web/EgovFacebookController.java (.../EgovFacebookController.java) (revision 4bb1c91d523a0051f87344908936f42c8661dc03) @@ -26,6 +26,9 @@ import egovframework.rivalwar.api.snsLogin.service.FacebookLoginService; import egovframework.rte.fdl.property.EgovPropertyService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.social.connect.Connection; import org.springframework.social.connect.ConnectionRepository; import org.springframework.social.facebook.api.Facebook; @@ -41,7 +44,7 @@ import javax.annotation.Resource; import javax.inject.Inject; import javax.servlet.http.HttpServletRequest; -import java.util.Locale; +import java.util.Arrays; /** * Facebook을 처리하는 Controller Class 구현 @@ -115,8 +118,14 @@ if (StringUtils.equals(resultString, "needTheNickname")) { request.getSession().setAttribute("resultString", "needTheNickname"); //return "egovframework/com/uss/ion/fbk/EgovFacebookHome"; + + springSecurityProcess(connection); + } else if (StringUtils.equals(resultString, "joinedAccount")) { request.getSession().setAttribute("resultString", "joinedAccount"); + + springSecurityProcess(connection); + //return "egovframework/com/uss/ion/fbk/EgovFacebookHome"; } else { request.getSession().setAttribute("resultString", "insertAccount"); @@ -125,6 +134,13 @@ return "redirect:/index.html"; } + private void springSecurityProcess(Connection connection) { + SecurityContextHolder.getContext().setAuthentication( + new UsernamePasswordAuthenticationToken( + connection.getDisplayName(), null, + Arrays.asList(new SimpleGrantedAuthority("ROLE_USER")))); + } + /** * facebook 담벼락 목록을 보여준다. * Index: development-project/project-standard/standard-server/standard-server.iml =================================================================== diff -u -rac874a0037a5cd5f0a9ca8ff4500ab2b1d652900 -r4bb1c91d523a0051f87344908936f42c8661dc03 --- development-project/project-standard/standard-server/standard-server.iml (.../standard-server.iml) (revision ac874a0037a5cd5f0a9ca8ff4500ab2b1d652900) +++ development-project/project-standard/standard-server/standard-server.iml (.../standard-server.iml) (revision 4bb1c91d523a0051f87344908936f42c8661dc03) @@ -243,6 +243,7 @@ +