Add IsvCreateUser && prevent delete group that contain users && add role isv

api/iam.proto

@@ -31,6 +31,9 @@ service AccountManager {
 	rpc CreatePasswordReset (CreatePasswordResetRequest) returns (CreatePasswordResetResponse) {
 		option (google.api.http) = { post: "/v1/users/password:reset" body: "*" };
 	};
+	rpc IsvCreateUser (IsvCreateUserRequest) returns (IsvCreateUserResponse) {
+		option (google.api.http) = { post: "/v1/isv_users" body: "*" };
+	};
 
 	// admin permission
 	rpc CreateUser (CreateUserRequest) returns (CreateUserResponse) {
@@ -192,6 +195,16 @@ message CreateUserRequest {
 message CreateUserResponse {
 	google.protobuf.StringValue user_id = 1;
 }
+message IsvCreateUserRequest {
+	google.protobuf.StringValue email = 1;
+	google.protobuf.StringValue phone_number = 2;
+	google.protobuf.StringValue password = 3;
+	google.protobuf.StringValue role = 4; // default is user
+	google.protobuf.StringValue description = 5;
+}
+message IsvCreateUserResponse {
+	google.protobuf.StringValue user_id = 1;
+}
 
 message ValidateUserPasswordRequest {
 	string email = 1;

pkg/constants/common.go

@@ -210,17 +210,18 @@ const (
 	RetryInterval = 3 * time.Second
 )
 
-var SupportRoles = []string{
+var AllRoles = []string{
 	RoleUser,
+	RoleIsv,
 	RoleDeveloper,
 	RoleGlobalAdmin,
 }
-var AllRoles = []string{
-	RoleUser,
-	RoleDeveloper,
+var AllIsvRoles = []string{
+	RoleIsv,
 	RoleGlobalAdmin,
 }
 var AllDeveloperRoles = []string{
+	RoleIsv,
 	RoleDeveloper,
 	RoleGlobalAdmin,
 }

pkg/gerr/message.go

@@ -387,4 +387,9 @@ var (
 		en:   "illegal BankAccountNumber format [%s]",
 		zhCN: "非法的银行账号格式[%s]",
 	}
+	ErrorGroupHadMembers = ErrorMessage{
+		Name: "group_had_members",
+		en:   "group had members",
+		zhCN: "组内还有成员",
+	}
 )

pkg/models/attachment.go

@@ -14,9 +14,12 @@ import (
 	"openpitrix.io/openpitrix/pkg/util/pbutil"
 )
 
+const AttachmentIdPrefix = "att-"
+
 func NewAttachmentId() string {
 	return fmt.Sprintf(
-		"att-%s-%s",
+		"%s%s-%s",
+		AttachmentIdPrefix,
 		idutil.GetAttachmentPrefix(),
 		idutil.GetUuid(""),
 	)