maxkey-identitys rename maxkey-mxapis

This commit is contained in:
MaxKey 2023-01-14 17:06:07 +08:00
parent 826b1f5997
commit 93b284fe99
48 changed files with 85 additions and 66 deletions

View File

@ -1,4 +1,4 @@
description = "maxkey-identity-rest"
description = "maxkey-mxapi-rest"
apply plugin: 'java'
apply plugin: 'eclipse-wtp'

View File

@ -1,4 +1,4 @@
description = "maxkey-identity-scim"
description = "maxkey-mxapi-scim"
apply plugin: 'java'

View File

@ -15,7 +15,7 @@
*/
package org.maxkey.identity.scim.controller;
package org.maxkey.mxapis.identity.scim;
import java.io.IOException;
import java.util.ArrayList;
@ -26,11 +26,11 @@ import java.util.Set;
import org.apache.mybatis.jpa.persistence.JpaPageResults;
import org.maxkey.entity.Roles;
import org.maxkey.entity.UserInfo;
import org.maxkey.identity.scim.resources.ScimGroup;
import org.maxkey.identity.scim.resources.ScimMemberRef;
import org.maxkey.identity.scim.resources.ScimMeta;
import org.maxkey.identity.scim.resources.ScimParameters;
import org.maxkey.identity.scim.resources.ScimSearchResult;
import org.maxkey.mxapis.identity.scim.resources.ScimGroup;
import org.maxkey.mxapis.identity.scim.resources.ScimMemberRef;
import org.maxkey.mxapis.identity.scim.resources.ScimMeta;
import org.maxkey.mxapis.identity.scim.resources.ScimParameters;
import org.maxkey.mxapis.identity.scim.resources.ScimSearchResult;
import org.maxkey.persistence.service.RoleMemberService;
import org.maxkey.persistence.service.RolesService;
import org.maxkey.util.DateUtils;

View File

@ -15,7 +15,7 @@
*/
package org.maxkey.identity.scim.controller;
package org.maxkey.mxapis.identity.scim;
import java.io.IOException;
import java.util.ArrayList;
@ -23,10 +23,10 @@ import java.util.List;
import org.apache.mybatis.jpa.persistence.JpaPageResults;
import org.maxkey.entity.Organizations;
import org.maxkey.identity.scim.resources.ScimMeta;
import org.maxkey.identity.scim.resources.ScimOrganization;
import org.maxkey.identity.scim.resources.ScimParameters;
import org.maxkey.identity.scim.resources.ScimSearchResult;
import org.maxkey.mxapis.identity.scim.resources.ScimMeta;
import org.maxkey.mxapis.identity.scim.resources.ScimOrganization;
import org.maxkey.mxapis.identity.scim.resources.ScimParameters;
import org.maxkey.mxapis.identity.scim.resources.ScimSearchResult;
import org.maxkey.persistence.service.OrganizationsService;
import org.maxkey.util.DateUtils;
import org.maxkey.util.StringUtils;

View File

@ -15,7 +15,7 @@
*/
package org.maxkey.identity.scim.controller;
package org.maxkey.mxapis.identity.scim;
import com.fasterxml.jackson.annotation.JsonInclude;
import org.springframework.web.bind.annotation.RequestMapping;

View File

@ -15,7 +15,7 @@
*/
package org.maxkey.identity.scim.controller;
package org.maxkey.mxapis.identity.scim;
import java.io.IOException;
import java.util.ArrayList;
@ -24,18 +24,18 @@ import org.apache.mybatis.jpa.persistence.JpaPageResults;
import org.maxkey.constants.ConstsStatus;
import org.maxkey.entity.Roles;
import org.maxkey.entity.UserInfo;
import org.maxkey.identity.scim.resources.ScimEnterprise;
import org.maxkey.identity.scim.resources.ScimGroupRef;
import org.maxkey.identity.scim.resources.ScimManager;
import org.maxkey.identity.scim.resources.ScimMeta;
import org.maxkey.identity.scim.resources.ScimParameters;
import org.maxkey.identity.scim.resources.ScimSearchResult;
import org.maxkey.identity.scim.resources.ScimOrganizationEmail.UserEmailType;
import org.maxkey.identity.scim.resources.ScimOrganizationPhoneNumber.UserPhoneNumberType;
import org.maxkey.identity.scim.resources.ScimUser;
import org.maxkey.identity.scim.resources.ScimUserEmail;
import org.maxkey.identity.scim.resources.ScimFormattedName;
import org.maxkey.identity.scim.resources.ScimUserPhoneNumber;
import org.maxkey.mxapis.identity.scim.resources.ScimEnterprise;
import org.maxkey.mxapis.identity.scim.resources.ScimFormattedName;
import org.maxkey.mxapis.identity.scim.resources.ScimGroupRef;
import org.maxkey.mxapis.identity.scim.resources.ScimManager;
import org.maxkey.mxapis.identity.scim.resources.ScimMeta;
import org.maxkey.mxapis.identity.scim.resources.ScimParameters;
import org.maxkey.mxapis.identity.scim.resources.ScimSearchResult;
import org.maxkey.mxapis.identity.scim.resources.ScimUser;
import org.maxkey.mxapis.identity.scim.resources.ScimUserEmail;
import org.maxkey.mxapis.identity.scim.resources.ScimUserPhoneNumber;
import org.maxkey.mxapis.identity.scim.resources.ScimOrganizationEmail.UserEmailType;
import org.maxkey.mxapis.identity.scim.resources.ScimOrganizationPhoneNumber.UserPhoneNumberType;
import org.maxkey.persistence.service.RolesService;
import org.maxkey.persistence.service.UserInfoService;
import org.maxkey.util.DateUtils;

View File

@ -15,7 +15,7 @@
*/
package org.maxkey.identity.scim.resources;
package org.maxkey.mxapis.identity.scim.resources;
import java.io.Serializable;

View File

@ -15,7 +15,7 @@
*/
package org.maxkey.identity.scim.resources;
package org.maxkey.mxapis.identity.scim.resources;
import java.util.HashSet;

View File

@ -15,7 +15,7 @@
*/
package org.maxkey.identity.scim.resources;
package org.maxkey.mxapis.identity.scim.resources;
import java.io.Serializable;

View File

@ -15,7 +15,7 @@
*/
package org.maxkey.identity.scim.resources;
package org.maxkey.mxapis.identity.scim.resources;
import java.util.HashSet;
import java.util.Set;

View File

@ -15,7 +15,7 @@
*/
package org.maxkey.identity.scim.resources;
package org.maxkey.mxapis.identity.scim.resources;
public class ScimGroupRef extends ScimMultiValuedAttribute{

View File

@ -15,7 +15,7 @@
*/
package org.maxkey.identity.scim.resources;
package org.maxkey.mxapis.identity.scim.resources;
public class ScimManager {

View File

@ -15,7 +15,7 @@
*/
package org.maxkey.identity.scim.resources;
package org.maxkey.mxapis.identity.scim.resources;
public class ScimMemberRef extends ScimMultiValuedAttribute{

View File

@ -15,7 +15,7 @@
*/
package org.maxkey.identity.scim.resources;
package org.maxkey.mxapis.identity.scim.resources;
import java.io.Serializable;
import java.util.Date;

View File

@ -15,7 +15,7 @@
*/
package org.maxkey.identity.scim.resources;
package org.maxkey.mxapis.identity.scim.resources;
import java.io.Serializable;

View File

@ -15,7 +15,7 @@
*/
package org.maxkey.identity.scim.resources;
package org.maxkey.mxapis.identity.scim.resources;
import java.util.HashSet;
import java.util.List;

View File

@ -15,7 +15,7 @@
*/
package org.maxkey.identity.scim.resources;
package org.maxkey.mxapis.identity.scim.resources;
import java.io.Serializable;

View File

@ -15,7 +15,7 @@
*/
package org.maxkey.identity.scim.resources;
package org.maxkey.mxapis.identity.scim.resources;
import java.io.Serializable;

View File

@ -15,9 +15,9 @@
*/
package org.maxkey.identity.scim.resources;
package org.maxkey.mxapis.identity.scim.resources;
import org.maxkey.identity.scim.controller.ScimServiceProviderConfigController;
import org.maxkey.mxapis.identity.scim.ScimServiceProviderConfigController;
public class ScimParameters {
int startIndex = 1;

View File

@ -15,7 +15,7 @@
*/
package org.maxkey.identity.scim.resources;
package org.maxkey.mxapis.identity.scim.resources;
import java.io.Serializable;
import java.util.Set;

View File

@ -15,7 +15,7 @@
*/
package org.maxkey.identity.scim.resources;
package org.maxkey.mxapis.identity.scim.resources;
import java.util.ArrayList;
import java.util.Collections;

View File

@ -15,7 +15,7 @@
*/
package org.maxkey.identity.scim.resources;
package org.maxkey.mxapis.identity.scim.resources;
import java.util.HashSet;
import java.util.List;

View File

@ -15,7 +15,7 @@
*/
package org.maxkey.identity.scim.resources;
package org.maxkey.mxapis.identity.scim.resources;
import java.io.Serializable;

View File

@ -15,7 +15,7 @@
*/
package org.maxkey.identity.scim.resources;
package org.maxkey.mxapis.identity.scim.resources;
import java.io.Serializable;

View File

@ -15,7 +15,7 @@
*/
package org.maxkey.identity.scim.resources;
package org.maxkey.mxapis.identity.scim.resources;
import java.io.Serializable;

View File

@ -15,7 +15,7 @@
*/
package org.maxkey.identity.scim.resources;
package org.maxkey.mxapis.identity.scim.resources;
import java.io.Serializable;

View File

@ -15,7 +15,7 @@
*/
package org.maxkey.identity.scim.resources;
package org.maxkey.mxapis.identity.scim.resources;
import java.io.Serializable;

View File

@ -15,7 +15,7 @@
*/
package org.maxkey.identity.scim.resources;
package org.maxkey.mxapis.identity.scim.resources;
import java.io.Serializable;

View File

@ -15,7 +15,7 @@
*/
package org.maxkey.identity.scim.resources;
package org.maxkey.mxapis.identity.scim.resources;
import java.io.Serializable;

View File

@ -15,7 +15,7 @@
*/
package org.maxkey.identity.scim.resources;
package org.maxkey.mxapis.identity.scim.resources;
import java.io.Serializable;

View File

@ -15,7 +15,7 @@
*/
package org.maxkey.identity.scim.resources;
package org.maxkey.mxapis.identity.scim.resources;
import java.io.Serializable;

View File

@ -15,7 +15,7 @@
*/
package org.maxkey.identity.scim.resources;
package org.maxkey.mxapis.identity.scim.resources;
import java.io.Serializable;

View File

@ -17,6 +17,7 @@
package org.maxkey.identity.scim.resources;
import org.maxkey.mxapis.identity.scim.resources.ScimEnterpriseUser;
import org.maxkey.pretty.impl.JsonPretty;
import org.maxkey.util.JsonUtils;

View File

@ -20,6 +20,13 @@ package org.maxkey.identity.scim.resources;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import org.maxkey.mxapis.identity.scim.resources.ScimEnterprise;
import org.maxkey.mxapis.identity.scim.resources.ScimEnterpriseUser;
import org.maxkey.mxapis.identity.scim.resources.ScimFormattedName;
import org.maxkey.mxapis.identity.scim.resources.ScimMeta;
import org.maxkey.mxapis.identity.scim.resources.ScimUserEmail;
import org.maxkey.mxapis.identity.scim.resources.ScimUserPhoneNumber;
import org.maxkey.pretty.impl.JsonPretty;
import org.maxkey.util.JsonUtils;

View File

@ -17,6 +17,7 @@
package org.maxkey.identity.scim.resources;
import org.maxkey.mxapis.identity.scim.resources.ScimGroup;
import org.maxkey.pretty.impl.JsonPretty;
import org.maxkey.util.JsonUtils;

View File

@ -21,6 +21,9 @@ import java.util.Date;
import java.util.HashSet;
import java.util.Set;
import org.maxkey.mxapis.identity.scim.resources.ScimGroup;
import org.maxkey.mxapis.identity.scim.resources.ScimMemberRef;
import org.maxkey.mxapis.identity.scim.resources.ScimMeta;
import org.maxkey.pretty.impl.JsonPretty;
import org.maxkey.util.JsonUtils;

View File

@ -17,6 +17,7 @@
package org.maxkey.identity.scim.resources;
import org.maxkey.mxapis.identity.scim.resources.ScimUser;
import org.maxkey.pretty.impl.JsonPretty;
import org.maxkey.util.JsonUtils;

View File

@ -20,6 +20,12 @@ package org.maxkey.identity.scim.resources;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import org.maxkey.mxapis.identity.scim.resources.ScimFormattedName;
import org.maxkey.mxapis.identity.scim.resources.ScimMeta;
import org.maxkey.mxapis.identity.scim.resources.ScimUser;
import org.maxkey.mxapis.identity.scim.resources.ScimUserEmail;
import org.maxkey.mxapis.identity.scim.resources.ScimUserPhoneNumber;
import org.maxkey.pretty.impl.JsonPretty;
import org.maxkey.util.JsonUtils;

View File

@ -17,9 +17,9 @@ dependencies {
implementation project(":maxkey-protocols:maxkey-protocol-oauth-2.0")
implementation project(":maxkey-protocols:maxkey-protocol-saml-2.0")
//identity
implementation project(":maxkey-identitys:maxkey-identity-scim")
implementation project(":maxkey-identitys:maxkey-identity-rest")
//rest apis
implementation project(":maxkey-mxapis:maxkey-mxapi-scim")
implementation project(":maxkey-mxapis:maxkey-mxapi-rest")
//synchronizers
implementation project(":maxkey-synchronizers:maxkey-synchronizer")

View File

@ -39,9 +39,9 @@ import org.springframework.context.annotation.ComponentScan;
"org.maxkey.entity",
"org.maxkey.entity.apps",
"org.maxkey.entity.userinfo",
"org.maxkey.identity.kafka",
"org.maxkey.identity.rest",
"org.maxkey.identity.scim.controller",
"org.maxkey.mxapis.identity.kafka",
"org.maxkey.mxapis.identity.rest",
"org.maxkey.mxapis.identity.scim",
"org.maxkey.persistence",
"org.maxkey.provision",
"org.maxkey.synchronizer",

View File

@ -32,9 +32,9 @@ include (
'maxkey-authentications:maxkey-authentication-otp',
'maxkey-authentications:maxkey-authentication-provider',
'maxkey-authentications:maxkey-authentication-sms',
//identity
'maxkey-identitys:maxkey-identity-scim',
'maxkey-identitys:maxkey-identity-rest',
//rest apis
'maxkey-mxapis:maxkey-mxapi-scim',
'maxkey-mxapis:maxkey-mxapi-rest',
//synchronizers
'maxkey-synchronizers:maxkey-synchronizer',
'maxkey-synchronizers:maxkey-synchronizer-reorgdept',