From d00421ccfd179962d06544fb6a1499a704012b72 Mon Sep 17 00:00:00 2001 From: MaxKey Date: Fri, 26 Feb 2021 18:09:13 +0800 Subject: [PATCH] api --- .../rest/RestOrganizationController.java | 2 +- .../identity/rest/RestUserInfoController.java | 20 ++++++++++++++++++- .../scim/controller/ScimGroupController.java | 2 +- .../ScimOrganizationController.java | 2 +- .../ScimServiceProviderConfigController.java | 2 +- .../scim/controller/ScimUserController.java | 2 +- 6 files changed, 24 insertions(+), 6 deletions(-) diff --git a/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestOrganizationController.java b/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestOrganizationController.java index d3ffc4686..fb8d264c9 100644 --- a/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestOrganizationController.java +++ b/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestOrganizationController.java @@ -34,7 +34,7 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.util.UriComponentsBuilder; @Controller -@RequestMapping(value={"/identity/api/org"}) +@RequestMapping(value={"/im/api/Organization"}) public class RestOrganizationController { @Autowired diff --git a/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestUserInfoController.java b/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestUserInfoController.java index c3db68454..8f538e2f5 100644 --- a/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestUserInfoController.java +++ b/maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestUserInfoController.java @@ -35,7 +35,7 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.util.UriComponentsBuilder; @Controller -@RequestMapping(value={"/identity/api/userinfo"}) +@RequestMapping(value={"/im/api/Users"}) public class RestUserInfoController { @Autowired @@ -66,6 +66,24 @@ public class RestUserInfoController { } return userInfo; } + + @RequestMapping(method = RequestMethod.POST) + @ResponseBody + public String changePassword( + @RequestParam(required = true) String username, + @RequestParam(required = true) String password, + UriComponentsBuilder builder) throws IOException { + UserInfo loadUserInfo = userInfoService.loadByUsername(username); + if(loadUserInfo != null) { + UserInfo changePassword = new UserInfo(); + changePassword.setId(loadUserInfo.getId()); + changePassword.setUsername(username); + changePassword.setPassword(password); + changePassword.setDecipherable(loadUserInfo.getDecipherable()); + userInfoService.changePassword(changePassword); + } + return "true"; + } @RequestMapping(value = "/{id}", method = RequestMethod.PUT) @ResponseBody diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimGroupController.java b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimGroupController.java index fdc20c501..73a0fde2d 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimGroupController.java +++ b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimGroupController.java @@ -19,7 +19,7 @@ package org.maxkey.identity.scim.controller; import org.springframework.web.bind.annotation.RequestMapping; -@RequestMapping(value = "/identity/scim/v2/Groups") +@RequestMapping(value = "/im/scim/v2/Groups") public class ScimGroupController { } diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimOrganizationController.java b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimOrganizationController.java index f8f6570fd..790b66f71 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimOrganizationController.java +++ b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimOrganizationController.java @@ -45,7 +45,7 @@ import org.springframework.web.util.UriComponentsBuilder; * http://tools.ietf.org/html/draft-ietf-scim-api-00#section-3 */ @RestController -@RequestMapping(value = "/identity/scim/v2/Organization") +@RequestMapping(value = "/im/scim/v2/Organization") public class ScimOrganizationController { @RequestMapping(value = "/{id}", method = RequestMethod.GET) diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimServiceProviderConfigController.java b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimServiceProviderConfigController.java index e4ddd5dc5..319c3f1f8 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimServiceProviderConfigController.java +++ b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimServiceProviderConfigController.java @@ -26,7 +26,7 @@ import java.util.HashSet; import java.util.Set; @RestController -@RequestMapping(value = "/identity/scim/v2/ServiceProviderConfig") +@RequestMapping(value = "/im/scim/v2/ServiceProviderConfig") public class ScimServiceProviderConfigController { public static final int MAX_RESULTS = 100; diff --git a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimUserController.java b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimUserController.java index 356f49f5b..87fd4e324 100644 --- a/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimUserController.java +++ b/maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimUserController.java @@ -44,7 +44,7 @@ import org.springframework.web.util.UriComponentsBuilder; * http://tools.ietf.org/html/draft-ietf-scim-api-00#section-3 */ @RestController -@RequestMapping(value = "/identity/scim/v2/Users") +@RequestMapping(value = "/im/scim/v2/Users") public class ScimUserController { @RequestMapping(value = "/{id}", method = RequestMethod.GET)