这是indexloc提供的服务，不要输入任何密码
Skip to content

bug: fixes stringify json #258 #259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 11, 2023
Merged

bug: fixes stringify json #258 #259

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 6 additions & 16 deletions internal/client/appgroups/appgroups.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
package appgroups

import (
"encoding/base64"
"encoding/json"
"errors"
"fmt"
Expand Down Expand Up @@ -82,7 +81,7 @@ func Create(name string, channelURI string, channelID string, displayName string
if len(attrs) == 0 {
attrs = make(map[string]string)
}
attrs["__apigee_reserved__developer_details"] = getDeveloperDetails(devs)
attrs["__apigee_reserved__developer_details"] = strings.ReplaceAll(getDeveloperDetails(devs), "\"", "\\\"")
}

if len(attrs) != 0 {
Expand Down Expand Up @@ -374,20 +373,11 @@ func getDeveloperDetails(devs map[string]string) string {
for k, v := range devs {
developerDetails = append(developerDetails, "{ \"developerId\":\""+k+"\", \"roles\":[ \""+v+"\" ] }")
}
return base64.StdEncoding.EncodeToString([]byte("[" + strings.Join(developerDetails, ",") + "]"))
}

func getDeveloperDetailsObject(developerDetailsEncoded string) ([]devDetail, error) {
devDetailList := []devDetail{}
developerDetails, err := base64.StdEncoding.DecodeString(developerDetailsEncoded)
if err != nil {
return nil, err
}
err = json.Unmarshal([]byte(developerDetails), &devDetailList)
if err != nil {
return nil, err
}
return devDetailList, nil
// The docs https://cloud.google.com/apigee/docs/reference/apis/apigee/rest/v1/organizations.appgroups/create
// called for base64 encoding. However, it appears the Apigee Durpal implementation does not require it.
// return base64.StdEncoding.EncodeToString([]byte("[" + strings.Join(developerDetails, ",") + "]"))
developerDetailsString := "[" + strings.Join(developerDetails, ",") + "]"
return developerDetailsString
}

func convertToAttributes(a map[string]string) []attribute {
Expand Down