Merge 'dev' into 'main'

2022-10-03 16:56:47 +03:00
parent 6271fa6d45
commit 5fd450382c
400 changed files with 14394 additions and 13407 deletions
--- a/pkg/cloudapi/account/add_user.go
+++ b/pkg/cloudapi/account/add_user.go
@@ -1,68 +1,58 @@
-package account
-
-import (
-	"context"
-	"errors"
-	"strconv"
-
-	"github.com/rudecs/decort-sdk/internal/validators"
-	"github.com/rudecs/decort-sdk/opts"
-	"github.com/rudecs/decort-sdk/typed"
-)
-
-type AddUserRequest struct {
-	AccountId  uint64 `url:"accountId"`
-	UserId     string `url:"userId"`
-	AccessType string `url:"accesstype"`
-}
-
-func (arq AddUserRequest) Validate() error {
-	if arq.AccountId == 0 {
-		return errors.New("validation-error: field AccountId can not be empty or equal to 0")
-	}
-
-	if arq.UserId == "" {
-		return errors.New("validation-error: field UserId can not be empty")
-	}
-
-	if arq.AccessType == "" {
-		return errors.New("validation-error: field AccessType can not be empty")
-	}
-
-	isValid := validators.StringInSlice(arq.AccessType, []string{"R", "RCX", "ARCXDU"})
-	if !isValid {
-		return errors.New("validation-error: field AccessType can be only R, RCX or ARCXDU")
-	}
-
-	return nil
-}
-
-func (a Account) AddUser(ctx context.Context, req AddUserRequest, options ...opts.DecortOpts) (bool, error) {
-	err := req.Validate()
-	if err != nil {
-		return false, err
-	}
-
-	url := "/account/addUser"
-	prefix := "/cloudapi"
-
-	option := opts.New(options)
-
-	if option != nil {
-		if option.IsAdmin {
-			prefix = "/" + option.AdminValue
-		}
-	}
-	url = prefix + url
-	res, err := a.client.DecortApiCall(ctx, typed.POST, url, req)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}
+package account
+
+import (
+	"context"
+	"errors"
+	"net/http"
+	"strconv"
+
+	"github.com/rudecs/decort-sdk/internal/validators"
+)
+
+type AddUserRequest struct {
+	AccountID  uint64 `url:"accountId"`
+	UserID     string `url:"userId"`
+	AccessType string `url:"accesstype"`
+}
+
+func (arq AddUserRequest) Validate() error {
+	if arq.AccountID == 0 {
+		return errors.New("validation-error: field AccountID can not be empty or equal to 0")
+	}
+
+	if arq.UserID == "" {
+		return errors.New("validation-error: field UserID can not be empty")
+	}
+
+	if arq.AccessType == "" {
+		return errors.New("validation-error: field AccessType can not be empty")
+	}
+
+	isValid := validators.StringInSlice(arq.AccessType, []string{"R", "RCX", "ARCXDU"})
+	if !isValid {
+		return errors.New("validation-error: field AccessType can be only R, RCX or ARCXDU")
+	}
+
+	return nil
+}
+
+func (a Account) AddUser(ctx context.Context, req AddUserRequest) (bool, error) {
+	err := req.Validate()
+	if err != nil {
+		return false, err
+	}
+
+	url := "/cloudapi/account/addUser"
+
+	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	if err != nil {
+		return false, err
+	}
+
+	result, err := strconv.ParseBool(string(res))
+	if err != nil {
+		return false, err
+	}
+
+	return result, nil
+}