From 0f4cfcd0d17cc61d48b2f0404fd321f1fcd8b757 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Sun, 24 Mar 2024 00:15:04 -0700 Subject: [PATCH] Add jwt token on confirmation. --- .../java/com/wisemapping/rest/AppController.java | 9 --------- .../com/wisemapping/rest/OAuth2Controller.java | 14 +++++++++++--- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/wise-api/src/main/java/com/wisemapping/rest/AppController.java b/wise-api/src/main/java/com/wisemapping/rest/AppController.java index cb8278ee..3cf11bc3 100644 --- a/wise-api/src/main/java/com/wisemapping/rest/AppController.java +++ b/wise-api/src/main/java/com/wisemapping/rest/AppController.java @@ -26,15 +26,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; - -// "config": { -// "apiBaseUrl": "http://localhost:3000", -// "analyticsAccount": "G-RSDEJH16YM", -// "clientType": "mock", -// "recaptcha2Enabled": false, -// "recaptcha2SiteKey": "6Lcat08kAAAAAIP-HjhzIa-Yq21PHgGa_ADWc-Ro", -// "googleOauth2Url": "https: //accounts.google.com/o/oauth2/v2/auth?redirect_uri=https://app.wisemapping.com/c/registration-google&prompt=consent&response_type=code&client_id=625682766634-cocbbbbb403iuvps1evecdk6d7phvbkf.apps.googleusercontent.com&scope=https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.profile%20https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.email&access_type=offline&state=wisemapping&include_granted_scopes=true" -// } @RestController @RequestMapping("/api/restful/app") public class AppController extends BaseController { diff --git a/wise-api/src/main/java/com/wisemapping/rest/OAuth2Controller.java b/wise-api/src/main/java/com/wisemapping/rest/OAuth2Controller.java index 06b8766c..7997f614 100644 --- a/wise-api/src/main/java/com/wisemapping/rest/OAuth2Controller.java +++ b/wise-api/src/main/java/com/wisemapping/rest/OAuth2Controller.java @@ -74,16 +74,24 @@ public class OAuth2Controller extends BaseController { @RequestMapping(method = RequestMethod.PUT, value = "confirmaccountsync", produces = {"application/json"}) @ResponseStatus(value = HttpStatus.OK) - public void confirmAccountSync(@NotNull @RequestParam String email, @NotNull @RequestParam String code, @NotNull HttpServletResponse response) throws WiseMappingException { + public RestOath2CallbackResponse confirmAccountSync(@NotNull @RequestParam String email, @NotNull @RequestParam String code, @NotNull HttpServletResponse response) throws WiseMappingException { logger.debug("confirmAccountSync:" + email + "-" + code); // Authenticate ... - userService.createAndAuthUserFromGoogle(code); + final Account user = userService.createAndAuthUserFromGoogle(code); // Update login userService.confirmAccountSync(email, code); // Add header ... - jwtTokenUtil.doLogin(response, email); + final String jwtToken = jwtTokenUtil.doLogin(response, email); + + // Response ... + final RestOath2CallbackResponse result = new RestOath2CallbackResponse(); + result.setEmail(user.getEmail()); + result.setGoogleSync(false); + result.setSyncCode(user.getSyncCode()); + result.setJwtToken(jwtToken); + return result; } }