Skip to content

support v3 and v4 #13

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
wistefan merged 2 commits into from
Jun 7, 2023
Merged

support v3 and v4 #13

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ed2d92
support v3 and v4
wistefan Jun 7, 2023
094d6d4
Merge branch 'main' into til-support
wistefan Jun 7, 2023
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
28 changes: 23 additions & 5 deletions tir/tirClient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import (
"github.com/fiware/VCVerifier/logging"
)

const ISSUERS_PATH = "v4/issuers"
const ISSUERS_V4_PATH = "v4/issuers"
const ISSUERS_V3_PATH = "v4/issuers"

var ErrorTirNoResponse = errors.New("no_response_from_tir")
var ErrorTirEmptyResponse = errors.New("empty_response_from_tir")
Expand Down Expand Up @@ -141,7 +142,15 @@ func (tc TirHttpClient) issuerExists(tirEndpoint string, did string) (trusted bo
}

func (tc TirHttpClient) requestIssuer(tirEndpoint string, did string) (response *http.Response, err error) {
resp, err := tc.client.Get(getIssuerUrl(tirEndpoint) + "/" + did)
response, err = tc.requestIssuerWithVersion(getIssuerV4Url(tirEndpoint), did)
if err != nil || response.StatusCode != 200 {
return tc.requestIssuerWithVersion(getIssuerV3Url(tirEndpoint), did)
}
return response, err
}

func (tc TirHttpClient) requestIssuerWithVersion(tirEndpoint string, did string) (response *http.Response, err error) {
resp, err := tc.client.Get(tirEndpoint + "/" + did)
if err != nil {
logging.Log().Warnf("Was not able to get the issuer %s from %s. Err: %v", did, tirEndpoint, err)
return resp, err
Expand All @@ -150,13 +159,22 @@ func (tc TirHttpClient) requestIssuer(tirEndpoint string, did string) (response
logging.Log().Warnf("Was not able to get any response for issuer %s from %s.", did, tirEndpoint)
return nil, ErrorTirNoResponse
}

return resp, err
}

func getIssuerUrl(tirEndpoint string) string {
func getIssuerV4Url(tirEndpoint string) string {
if strings.HasSuffix(tirEndpoint, "/") {
return tirEndpoint + ISSUERS_V4_PATH
} else {
return tirEndpoint + "/" + ISSUERS_V4_PATH
}
}

func getIssuerV3Url(tirEndpoint string) string {
if strings.HasSuffix(tirEndpoint, "/") {
return tirEndpoint + ISSUERS_PATH
return tirEndpoint + ISSUERS_V3_PATH
} else {
return tirEndpoint + "/" + ISSUERS_PATH
return tirEndpoint + "/" + ISSUERS_V3_PATH
}
}