Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

jwt 설정 값 추가. #92

Merged
merged 1 commit into from
Jul 29, 2016
Merged

jwt 설정 값 추가. #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions jakduk-web/src/main/java/com/jakduk/restcontroller/user/AuthRestController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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());

Expand Down
7 changes: 6 additions & 1 deletion jakduk-web/src/main/resources/config/application-production.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 6 additions & 1 deletion jakduk-web/src/main/resources/config/application-staging.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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