From 0ad793476824da30da645ca3542825d377900491 Mon Sep 17 00:00:00 2001 From: MaxKey Date: Thu, 18 Nov 2021 12:10:23 +0800 Subject: [PATCH] =?UTF-8?q?GET=EF=BC=8CSCIM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scim/controller/ScimGroupController.java | 2 +- .../ScimOrganizationController.java | 2 +- .../scim/controller/ScimUserController.java | 2 +- maxkey-lib/mybatis-jpa-extra-2.6.jar | Bin 81706 -> 81781 bytes .../provider/endpoint/TokenEndpoint.java | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) 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 9df35cf9..a52b9c79 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 @@ -124,7 +124,7 @@ public class ScimGroupController { new ScimSearchResult( resultList, orgResults.getRecords(), - requestParameters.getCount(), + queryModel.getPageSize(), requestParameters.getStartIndex()); return new MappingJacksonValue(scimSearchResult); } 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 e33c6187..d7dac81b 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 @@ -117,7 +117,7 @@ public class ScimOrganizationController { new ScimSearchResult( resultList, orgResults.getRecords(), - requestParameters.getCount(), + queryModel.getPageSize(), requestParameters.getStartIndex()); return new MappingJacksonValue(scimSearchResult); 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 5cda3572..fae9b1fc 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 @@ -129,7 +129,7 @@ public class ScimUserController { new ScimSearchResult( resultList, orgResults.getRecords(), - requestParameters.getCount(), + queryModel.getPageSize(), requestParameters.getStartIndex()); return new MappingJacksonValue(scimSearchResult); } diff --git a/maxkey-lib/mybatis-jpa-extra-2.6.jar b/maxkey-lib/mybatis-jpa-extra-2.6.jar index 5b84c4674469b871b49e470125d5125462f461be..17b0569db69da84cc82da591b40f1ccbf02d1cfb 100644 GIT binary patch delta 3278 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 delta 3099 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 QNqJ8mhd{oFQtlGu|Kb*1=Kufz diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/TokenEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/TokenEndpoint.java index b1d6cf17..acb01884 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/TokenEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/TokenEndpoint.java @@ -79,7 +79,7 @@ public class TokenEndpoint extends AbstractEndpoint { private OAuth2RequestValidator oAuth2RequestValidator = new DefaultOAuth2RequestValidator(); - private Set allowedRequestMethods = new HashSet(Arrays.asList(HttpMethod.POST)); + private Set allowedRequestMethods = new HashSet(Arrays.asList(HttpMethod.POST,HttpMethod.GET)); /** * must use HTTP POST Method to get token