speatzle/go-passbolt
1
0
Fork 0
mirror of https://github.com/passbolt/go-passbolt.git synced 2025-05-09 17:48:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #42 from Nelwhix/Nelwhix-main-5

Browse source 
feat: deprecating api-version query param in api calls
This commit is contained in:
Samuel Lorch 2025-03-06 13:09:08 +01:00 • committed by GitHub
commit 03ce37a1a2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
api/api.go
View file

@ -33,9 +33,14 @@ func (c *Client) DoCustomRequest(ctx context.Context, method, path, version stri
// DoCustomRequestAndReturnRawResponse Executes a Custom Request and returns a APIResponse and the Raw HTTP Response
func (c *Client) DoCustomRequestAndReturnRawResponse(ctx context.Context, method, path, version string, body interface{}, opts interface{}) (*http.Response, *APIResponse, error) {
// version is no longer used and is ignored.
return c.DoCustomRequestAndReturnRawResponseV5(ctx, method, path, body, opts)
}
func (c *Client) DoCustomRequestAndReturnRawResponseV5(ctx context.Context, method, path string, body interface{}, opts interface{}) (*http.Response, *APIResponse, error) {
firstTime := true
start:
u, err := generateURL(*c.baseURL, path, version, opts)
u, err := generateURL(*c.baseURL, path, opts)
if err != nil {
return nil, nil, fmt.Errorf("Generating Path: %w", err)
}

7
api/client.go
View file

@ -169,17 +169,14 @@ func (c *Client) log(msg string, args ...interface{}) {
fmt.Printf("[go-passbolt] "+msg+"\n", args...)
}
func generateURL(base url.URL, p, version string, opt interface{}) (string, error) {
func generateURL(base url.URL, p string, opt interface{}) (string, error) {
base.Path = path.Join(base.Path, p)
vs, err := query.Values(opt)
if err != nil {
return "", fmt.Errorf("Getting URL Query Values: %w", err)
}
if version != "" {
vs.Add("api-version", version)
}
base.RawQuery = vs.Encode()
return base.String(), nil
}