Merge pull request #92 from JakduK/jwt

jwt 설정 값 추가.
JakduK · Jul 29, 2016 · 00e2b68 · 00e2b68
2 parents 96877a6 + 479a171
commit 00e2b68
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/jakduk-web/src/main/java/com/jakduk/restcontroller/user/AuthRestController.java b/jakduk-web/src/main/java/com/jakduk/restcontroller/user/AuthRestController.java
@@ -100,7 +100,7 @@ public class AuthRestController {
     @ApiOperation(value = "이메일 기반 로그인", produces = "application/json", response = AuthenticationResponse.class)
     @RequestMapping(value = "/login", method = RequestMethod.POST)
     public AuthenticationResponse loginSocialUser(@RequestBody LoginEmailUserForm form,
-                                             Device device) {
+                                                  Device device) {
 
         // Perform the authentication
         Authentication authentication = this.authenticationManager.authenticate(
@@ -135,10 +135,9 @@ public AuthenticationResponse refreshAndGetAuthenticationToken(HttpServletReques
 
     @ApiOperation(value = "SNS 기반 로그인", produces = "application/json", response = EmptyJsonResponse.class)
     @RequestMapping(value = "/login/social/{providerId}", method = RequestMethod.POST)
-    public EmptyJsonResponse loginSocialUser(
-            @PathVariable String providerId,
-            @Valid @RequestBody LoginSocialUserForm form,
-            NativeWebRequest request) {
+    public EmptyJsonResponse loginSocialUser(@PathVariable String providerId,
+                                             @Valid @RequestBody LoginSocialUserForm form,
+                                             NativeWebRequest request) {
 
         CommonConst.ACCOUNT_TYPE convertProviderId = CommonConst.ACCOUNT_TYPE.valueOf(providerId.toUpperCase());
 

diff --git a/jakduk-web/src/main/resources/config/application-production.properties b/jakduk-web/src/main/resources/config/application-production.properties
@@ -39,4 +39,9 @@ slack.board.channel = #jakduk_board_noti
 
 # swagger
 swagger.protocol = https
-swagger.host = api.jakduk.com
+swagger.host = api.jakduk.com
+
+# App configuration
+jwt.token.header=Authorization
+jwt.token.secret=JakduK11!
+jwt.token.expiration=604800
diff --git a/jakduk-web/src/main/resources/config/application-staging.properties b/jakduk-web/src/main/resources/config/application-staging.properties
@@ -39,4 +39,9 @@ slack.board.channel = #jakduk_board_noti
 
 # swagger
 swagger.protocol = https
-swagger.host = staging.jakduk.com:8080
+swagger.host = staging.jakduk.com:8080
+
+# App configuration
+jwt.token.header=Authorization
+jwt.token.secret=JakduK11!
+jwt.token.expiration=604800