RetailCRM-Mirror/mg-transport-core
1
0
Fork 0
mirror of https://github.com/retailcrm/mg-transport-core.git synced 2024-11-22 05:06:04 +03:00
Code Issues Projects Releases Wiki Activity

Credentials backport

Browse Source
This commit is contained in:
Alex Lushpai 2021-12-13 16:52:45 +03:00 committed by GitHub
commit 7e21e73711
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 67 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
core/util/utils.go
View File

@ -31,10 +31,16 @@ var (
slashRegex = regexp.MustCompile(`/+$`) slashRegex = regexp.MustCompile(`/+$`)
) )
var DefaultScopes = []string{ var (
"integration_read", DefaultScopes = []string{
"integration_write", "integration_read",
} "integration_write",
}
DefaultCredentials = []string{
"/api/integration-modules/{code}",
"/api/integration-modules/{code}/edit",
}
)
var defaultCurrencies = map[string]string{ var defaultCurrencies = map[string]string{
"rub": "₽", "rub": "₽",
@ -123,7 +129,9 @@ func (u *Utils) GenerateToken() string {
} }
// GetAPIClient will initialize RetailCRM api client from url and key. // GetAPIClient will initialize RetailCRM api client from url and key.
func (u *Utils) GetAPIClient(url, key string, scopes []string) (*retailcrm.Client, int, error) { // Scopes will be used to determine if client is valid. If there are no scopes - credentials will be used instead.
func (u *Utils) GetAPIClient(
url, key string, scopes []string, credentials ...[]string) (*retailcrm.Client, int, error) {
client := retailcrm.New(url, key). client := retailcrm.New(url, key).
WithLogger(retailcrm.DebugLoggerAdapter(u.Logger)) WithLogger(retailcrm.DebugLoggerAdapter(u.Logger))
client.Debug = u.IsDebug client.Debug = u.IsDebug
@ -134,8 +142,15 @@ func (u *Utils) GetAPIClient(url, key string, scopes []string) (*retailcrm.Clien
} }
if res := u.checkScopes(cr.Scopes, scopes); len(res) != 0 { if res := u.checkScopes(cr.Scopes, scopes); len(res) != 0 {
u.Logger.Error(url, status, res) if len(credentials) == 0 || len(cr.Scopes) > 0 {
return nil, http.StatusBadRequest, errorutil.NewInsufficientScopesErr(res) u.Logger.Error(url, status, res)
return nil, http.StatusBadRequest, errorutil.NewInsufficientScopesErr(res)
}
if res := u.checkScopes(cr.Credentials, credentials[0]); len(res) != 0 {
u.Logger.Error(url, status, res)
return nil, http.StatusBadRequest, errorutil.NewInsufficientScopesErr(res)
}
} }
return client, 0, nil return client, 0, nil

46
core/util/utils_test.go
View File

@ -97,7 +97,7 @@ func (u *UtilsTest) Test_GetAPIClient_FailAPI() {
} }
} }
func (u *UtilsTest) Test_GetAPIClient_FailAPICredentials() { func (u *UtilsTest) Test_GetAPIClient_FailAPIScopes() {
resp := retailcrm.CredentialResponse{ resp := retailcrm.CredentialResponse{
Success: true, Success: true,
Scopes: []string{}, Scopes: []string{},
@ -120,6 +120,50 @@ func (u *UtilsTest) Test_GetAPIClient_FailAPICredentials() {
} }
} }
func (u *UtilsTest) Test_GetAPIClient_FailAPICredentials() {
resp := retailcrm.CredentialResponse{
Success: true,
Credentials: []string{DefaultCredentials[0]},
SiteAccess: "all",
SitesAvailable: []string{},
}
data, _ := json.Marshal(resp)
defer gock.Off()
gock.New(testCRMURL).
Get("/credentials").
Reply(http.StatusOK).
BodyString(string(data))
_, status, err := u.utils.GetAPIClient(testCRMURL, "key", DefaultScopes, DefaultCredentials)
assert.Equal(u.T(), http.StatusBadRequest, status)
if assert.NotNil(u.T(), err) {
assert.True(u.T(), errors.Is(err, errorutil.ErrInsufficientScopes))
}
}
func (u *UtilsTest) Test_GetAPIClient_SuccessCredentials() {
resp := retailcrm.CredentialResponse{
Success: true,
Credentials: DefaultCredentials,
SiteAccess: "all",
SitesAvailable: []string{"site"},
}
data, _ := json.Marshal(resp)
defer gock.Off()
gock.New(testCRMURL).
Get("/credentials").
Reply(http.StatusOK).
BodyString(string(data))
_, status, err := u.utils.GetAPIClient(testCRMURL, "key", DefaultScopes, DefaultCredentials)
require.NoError(u.T(), err)
assert.Equal(u.T(), 0, status)
}
func (u *UtilsTest) Test_GetAPIClient_Success() { func (u *UtilsTest) Test_GetAPIClient_Success() {
resp := retailcrm.CredentialResponse{ resp := retailcrm.CredentialResponse{
Success: true, Success: true,