ZhouXY108
/
wisemapping-open-source
mirror of https://github.com/wisemapping/wisemapping-open-source.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add login.

main
Paulo Gustavo Veiga 2024-03-23 23:07:14 -07:00
parent 16e2829598
commit 12d67d42ea
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wise-api/src/main/java/com/wisemapping/model/Account.java
View File

@ -22,6 +22,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import jakarta.persistence.*; import jakarta.persistence.*;
import java.io.Serializable; import java.io.Serializable;
import java.util.Calendar; import java.util.Calendar;
@ -164,7 +165,7 @@ public class Account
} }
public Boolean getGoogleSync() { public Boolean getGoogleSync() {
return googleSync!=null && googleSync; return googleSync != null && googleSync;
} }
public void setGoogleSync(Boolean googleSync) { public void setGoogleSync(Boolean googleSync) {

2
wise-api/src/main/java/com/wisemapping/rest/OAuth2Controller.java
View File

@ -56,7 +56,7 @@ public class OAuth2Controller extends BaseController {
@RequestMapping(method = RequestMethod.POST, value = "googlecallback", produces = {"application/json"}) @RequestMapping(method = RequestMethod.POST, value = "googlecallback", produces = {"application/json"})
@ResponseStatus(value = HttpStatus.OK) @ResponseStatus(value = HttpStatus.OK)
public RestOath2CallbackResponse processGoogleCallback(@NotNull @RequestParam String code, @NotNull HttpServletResponse response, @NotNull HttpServletRequest request) throws WiseMappingException { public RestOath2CallbackResponse processGoogleCallback(@NotNull @RequestParam String code, @NotNull HttpServletResponse response, @NotNull HttpServletRequest request) throws WiseMappingException {
Account user = userService.createAndAuthUserFromGoogle(code); final Account user = userService.createAndAuthUserFromGoogle(code);
if (user.getGoogleSync()) { if (user.getGoogleSync()) {
jwtTokenUtil.doLogin(response, user.getEmail()); jwtTokenUtil.doLogin(response, user.getEmail());
} }

1
wise-api/src/main/java/com/wisemapping/security/JwtTokenUtil.java
View File

@ -75,6 +75,7 @@ public class JwtTokenUtil implements Serializable {
@NotNull @NotNull
public String doLogin(@NotNull HttpServletResponse response, @NotNull String email) { public String doLogin(@NotNull HttpServletResponse response, @NotNull String email) {
logger.debug("Performing login:" + email);
final UserDetails userDetails = userDetailsService.loadUserByUsername(email); final UserDetails userDetails = userDetailsService.loadUserByUsername(email);
// Add JWT in the HTTP header ... // Add JWT in the HTTP header ...