somang4819/itsm_ysm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://docs.nculture.org:30000/nculture/iams.nlib

Browse Source
This commit is contained in:
JSYOO 2021-08-31 16:31:42 +09:00
commit 681973fec8
2 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/nlib/cmm/session/SessionConfig.java
View File

@ -87,12 +87,25 @@ public class SessionConfig implements HttpSessionListener {
* @param sessionId * @param sessionId
* @return * @return
*/ */
public static OAuthUniversalUser popLoginInfo(String sessionId) { public static OAuthUniversalUser getLoginInfo(String sessionId) {
if(StringUtil.isEmpty(sessionId)) return null; if(StringUtil.isEmpty(sessionId)) return null;
OAuthUniversalUser ret = loginSessions.get(sessionId); return loginSessions.get(sessionId);
}
/**
* 지방문화원 해당 세션에 로그인 처리 가능한 SNS 유형 및 SNS ID 정보를 리턴하고 목록에서 삭제한다.
* 리턴유형 문자열 배열
* [0] : snsType
* [1] : snsId
*
* @param sessionId
* @return
*/
public static OAuthUniversalUser popLoginInfo(String sessionId) {
OAuthUniversalUser ret = getLoginInfo(sessionId);
removeLoginInfo(sessionId); removeLoginInfo(sessionId);
return ret; return ret;
@ -131,10 +144,20 @@ public class SessionConfig implements HttpSessionListener {
* @param sessionId * @param sessionId
* @return * @return
*/ */
public static OAuthUniversalUser popNewMemberInfo(String sessionId) { public static OAuthUniversalUser getNewMemberInfo(String sessionId) {
if(StringUtil.isEmpty(sessionId)) return null; if(StringUtil.isEmpty(sessionId)) return null;
OAuthUniversalUser ret = memberSessions.get(sessionId); return memberSessions.get(sessionId);
}
/**
* 지방문화원 해당 세션에 회원가입 처리 가능한 SNS 유형 및 SNS 프로파일 정보를 리턴한다.
*
* @param sessionId
* @return
*/
public static OAuthUniversalUser popNewMemberInfo(String sessionId) {
OAuthUniversalUser ret = getNewMemberInfo(sessionId);
removeNewMemberInfo(sessionId); removeNewMemberInfo(sessionId);
return ret; return ret;

8
src/main/resources/egovframework/spring/context-oauth.xml
View File

@ -8,9 +8,7 @@
<constructor-arg value="naver" /><!-- Service Name --> <constructor-arg value="naver" /><!-- Service Name -->
<constructor-arg value="jefkoYhSfrQ3TtZz5mTp" /><!-- naverClientID --> <constructor-arg value="jefkoYhSfrQ3TtZz5mTp" /><!-- naverClientID -->
<constructor-arg value="E2qAGaLEaG" /><!-- naverClientSecret --> <constructor-arg value="E2qAGaLEaG" /><!-- naverClientSecret -->
<!-- <constructor-arg value="https://nlib.nculture.org/nlib/login/naver/callback.do" /> --><!-- naverRedirectUrl --> <constructor-arg value="https://nlib.nculture.org/nlib/{callType}/{oauthServiceName}/callback.do" /><!-- naverRedirectUrl : callType(login|member) -->
<!-- callType : login, member / oauthServiceName : naver, google, kakao -->
<constructor-arg value="https://nlib.nculture.org/nlib/{callType}/{oauthServiceName}/callback.do" /><!-- naverRedirectUrl -->
</bean> </bean>
<!-- GOOGLE OAuth Configuration --> <!-- GOOGLE OAuth Configuration -->
@ -18,7 +16,7 @@
<constructor-arg value="google" /><!-- Service Name --> <constructor-arg value="google" /><!-- Service Name -->
<constructor-arg value="879126511006-jro7bld7b2epl3n5mkksp0p24k2inbpu.apps.googleusercontent.com" /><!-- googleClientID --> <constructor-arg value="879126511006-jro7bld7b2epl3n5mkksp0p24k2inbpu.apps.googleusercontent.com" /><!-- googleClientID -->
<constructor-arg value="F6T-ZV9jibLhKtcugxPUtBlN" /><!-- googleClientSecret --> <constructor-arg value="F6T-ZV9jibLhKtcugxPUtBlN" /><!-- googleClientSecret -->
<constructor-arg value="https://nlib.nculture.org/nlib/login/google/callback.do" /><!-- googleRedirectUrl --> <constructor-arg value="https://nlib.nculture.org/nlib/{callType}/{oauthServiceName}/callback.do" /><!-- googleRedirectUrl : callType(login|member) -->
</bean> </bean>
<!-- KAKAO OAuth Configuration --> <!-- KAKAO OAuth Configuration -->
@ -26,7 +24,7 @@
<constructor-arg value="kakao" /><!-- Service Name --> <constructor-arg value="kakao" /><!-- Service Name -->
<constructor-arg value="e74d25210853313dd1fead4c6c1f06ec" /><!-- kakaoClientID --> <constructor-arg value="e74d25210853313dd1fead4c6c1f06ec" /><!-- kakaoClientID -->
<constructor-arg value="AGxiWEwu2ytIifA1AY2PoqVSrdnRZiao" /><!-- kakaoClientSecret --> <constructor-arg value="AGxiWEwu2ytIifA1AY2PoqVSrdnRZiao" /><!-- kakaoClientSecret -->
<constructor-arg value="https://nlib.nculture.org/nlib/login/kakao/callback.do" /><!-- kakaoRedirectUrl --> <constructor-arg value="https://nlib.nculture.org/nlib/{callType}/{oauthServiceName}/callback.do" /><!-- kakaoRedirectUrl : callType(login|member) -->
</bean> </bean>
</beans> </beans>