diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7cfd8f5d6dc3f9b267c6511fdbffa66ff0fdb37..d6cb6aac83b824bad8a374607a019a3b1c2c9a81 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ before_script: - cd /go/src/gitlab.com/${CI_PROJECT_PATH} unit tests: - image: golang:1.20.2 + image: golang:1.20.4 stage: test tags: - amd64-docker @@ -18,7 +18,7 @@ unit tests: lint: - image: golangci/golangci-lint:v1.50.1 + image: golangci/golangci-lint:latest stage: test tags: - amd64-docker @@ -28,7 +28,7 @@ lint: - golangci-lint run govulncheck: - image: golang:1.20.2 + image: golang:1.20.4 stage: test tags: - amd64-docker diff --git a/errors/errors.go b/errors/errors.go index 2f1c0906a3da5f9b860c2587f9c5fdf9b18798b1..ffa1f25018d04aad8a8e7d1aee8c1585edda98e1 100644 --- a/errors/errors.go +++ b/errors/errors.go @@ -96,12 +96,12 @@ func New(args ...interface{}) error { case Kind: e.Kind = arg case *Error: - copy := *arg - e.Err = © - e.ID = copy.ID - innerKind = copy.Kind + errCopy := *arg + e.Err = &errCopy + e.ID = errCopy.ID + innerKind = errCopy.Kind if e.Message == "" { - e.Message = copy.Message + e.Message = errCopy.Message } case error: e.Err = arg diff --git a/graceful/graceful_test.go b/graceful/graceful_test.go index 5e0c60c1011fcfc5e6d6a2eb8bf5d7559f42a2ff..05933f39a75c01955c21f7d0f915849f03c2c6af 100644 --- a/graceful/graceful_test.go +++ b/graceful/graceful_test.go @@ -19,7 +19,7 @@ type handler struct { requestTime time.Duration } -func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { +func (h *handler) ServeHTTP(_ http.ResponseWriter, _ *http.Request) { time.Sleep(h.requestTime) } diff --git a/ocm/client.go b/ocm/client.go index 4d1b2fa5ba4f04a1cc49a8e6a443960ba927688a..4d8674af1f01dc844711c0cf0bec3539f9b82ab8 100644 --- a/ocm/client.go +++ b/ocm/client.go @@ -146,7 +146,7 @@ func (c *Client) findByPresentationID(ctx context.Context, presentationID string } v := url.Values{} - v.Add("presentationId", presentationID) + v.Add("proofRecordId", presentationID) req.URL.RawQuery = v.Encode() resp, err := c.httpClient.Do(req) diff --git a/ocm/types.go b/ocm/types.go index 4cda32299bd08399fc4b8d2047b90032a6f1c1b8..9a26a0e047077513f95ca7918e72f21a25945f1f 100644 --- a/ocm/types.go +++ b/ocm/types.go @@ -7,7 +7,7 @@ type LoginProofInvitationResponse struct { } type LoginProofInvitationResponseData struct { - PresentationID string `json:"presentationId"` + ProofRecordID string `json:"proofRecordId"` PresentationMessage string `json:"presentationMessage"` } @@ -18,11 +18,11 @@ type LoginProofResultResponse struct { } type LoginProofResultResponseData struct { - State string `json:"state"` - Data []Credential `json:"presentations"` + State string `json:"state"` + Presentations []Presentation `json:"presentations"` } -type Credential struct { +type Presentation struct { SchemaID string `json:"schemaId"` CredDefID string `json:"credDefId"` Claims map[string]interface{} `json:"credentialSubject"`