Merge branch 'main' into eddsa2022

trustbloc · Sep 25, 2024 · f5dd761 · f5dd761
2 parents 32a1807 + b6ca73e
commit f5dd761
Show file tree

Hide file tree

Showing 21 changed files with 228 additions and 32 deletions.
diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@ ALPINE_IMAGE 	?=alpine
 OPENSSL_IMAGE ?=frapsoft/openssl
 GOPROXY ?= https://proxy.golang.org
 
-VC_FRAMEWORK_VERSION				= 444d6c8795171bf09c5838f54019ecf3f0b0d23a
+VC_FRAMEWORK_VERSION				= 62cdfe76225e3bec435d678a331a064e602a4dcf
 KMS_FRAMEWORK_VERSION 				= 59c2830d27fd44f9a3a663242a4aa61544ce622e
 DID_GO_VERSION						= aa500e57d8bdf51c90c20d3a6c815fdc76f716c3
 SIDE_TREE_VERSION							= f4260aff710479ba5fa3f0c61b51d451d9041225

diff --git a/cmd/vc-rest/go.mod b/cmd/vc-rest/go.mod
@@ -25,7 +25,7 @@ require (
 	github.com/trustbloc/did-go v1.3.1-0.20240910130808-bf0188fdfe70
 	github.com/trustbloc/logutil-go v1.0.0
 	github.com/trustbloc/sidetree-go v1.0.1-0.20240219121130-f4260aff7104
-	github.com/trustbloc/vc-go v1.2.1-0.20240923151258-444d6c879517
+	github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e
 	github.com/trustbloc/vcs v0.0.0
 	github.com/trustbloc/vcs/component/credentialstatus v0.0.0-00010101000000-000000000000
 	github.com/trustbloc/vcs/component/echo v0.0.0-00010101000000-000000000000

diff --git a/cmd/vc-rest/go.sum b/cmd/vc-rest/go.sum
@@ -676,8 +676,8 @@ github.com/trustbloc/logutil-go v1.0.0 h1:KzNs9TRbnmn+M3oYw9UkrtOjNd3ZGO8aLgfYtt
 github.com/trustbloc/logutil-go v1.0.0/go.mod h1:JlxT0oZfNKgIlSNtgc001WEeDMxlnAvOM43gNm8DQVc=
 github.com/trustbloc/sidetree-go v1.0.1-0.20240219121130-f4260aff7104 h1:0IW4muaGvhjJ4OkG6/PQG3DGf5POWxlA1wwEYsxWQ+4=
 github.com/trustbloc/sidetree-go v1.0.1-0.20240219121130-f4260aff7104/go.mod h1:3yChjB5KOT7B9eZe0W1XaIx3MNUuC1Oe9nR/GCtI1W0=
-github.com/trustbloc/vc-go v1.2.1-0.20240923151258-444d6c879517 h1:vSErEdByzxtFERDCuj+apO17aBM/qloaNWfnkdkzn6w=
-github.com/trustbloc/vc-go v1.2.1-0.20240923151258-444d6c879517/go.mod h1:mjjE1cfzbV5s1NTXhi10YceDyg7c+EBl70LUYcX1mYo=
+github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e h1:m2C6rWOMPzFjvjzv/1uuz8RlVd8uIMlOCfcWX9cRvtk=
+github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e/go.mod h1:mjjE1cfzbV5s1NTXhi10YceDyg7c+EBl70LUYcX1mYo=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=

diff --git a/component/credentialstatus/go.mod b/component/credentialstatus/go.mod
@@ -18,7 +18,7 @@ require (
 	github.com/trustbloc/kms-go v1.1.2
 	github.com/trustbloc/logutil-go v1.0.0
 	github.com/trustbloc/sidetree-go v1.0.1-0.20240219121130-f4260aff7104
-	github.com/trustbloc/vc-go v1.2.1-0.20240923151258-444d6c879517
+	github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e
 	github.com/trustbloc/vcs v0.0.0-00010101000000-000000000000
 )
 

diff --git a/component/credentialstatus/go.sum b/component/credentialstatus/go.sum
@@ -472,8 +472,8 @@ github.com/trustbloc/logutil-go v1.0.0 h1:KzNs9TRbnmn+M3oYw9UkrtOjNd3ZGO8aLgfYtt
 github.com/trustbloc/logutil-go v1.0.0/go.mod h1:JlxT0oZfNKgIlSNtgc001WEeDMxlnAvOM43gNm8DQVc=
 github.com/trustbloc/sidetree-go v1.0.1-0.20240219121130-f4260aff7104 h1:0IW4muaGvhjJ4OkG6/PQG3DGf5POWxlA1wwEYsxWQ+4=
 github.com/trustbloc/sidetree-go v1.0.1-0.20240219121130-f4260aff7104/go.mod h1:3yChjB5KOT7B9eZe0W1XaIx3MNUuC1Oe9nR/GCtI1W0=
-github.com/trustbloc/vc-go v1.2.1-0.20240923151258-444d6c879517 h1:vSErEdByzxtFERDCuj+apO17aBM/qloaNWfnkdkzn6w=
-github.com/trustbloc/vc-go v1.2.1-0.20240923151258-444d6c879517/go.mod h1:mjjE1cfzbV5s1NTXhi10YceDyg7c+EBl70LUYcX1mYo=
+github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e h1:m2C6rWOMPzFjvjzv/1uuz8RlVd8uIMlOCfcWX9cRvtk=
+github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e/go.mod h1:mjjE1cfzbV5s1NTXhi10YceDyg7c+EBl70LUYcX1mYo=
 github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
 github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=

diff --git a/component/event/go.mod b/component/event/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/stretchr/testify v1.9.0
 	github.com/trustbloc/cmdutil-go v1.0.0
 	github.com/trustbloc/logutil-go v1.0.0
-	github.com/trustbloc/vc-go v1.2.1-0.20240923151258-444d6c879517
+	github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e
 	github.com/trustbloc/vcs v0.0.0-00010101000000-000000000000
 	go.opentelemetry.io/otel/trace v1.29.0
 )

diff --git a/component/event/go.sum b/component/event/go.sum
@@ -454,8 +454,8 @@ github.com/trustbloc/kms-go v1.1.2 h1:nAlhDoHkSyX1eQFRz/sJsdgmJuNadyX7FJEy/9ROwy
 github.com/trustbloc/kms-go v1.1.2/go.mod h1:OKOtsLbE6W5s4mpjWkvk8XEqcmt9vTgVmDNkHELpWO0=
 github.com/trustbloc/logutil-go v1.0.0 h1:KzNs9TRbnmn+M3oYw9UkrtOjNd3ZGO8aLgfYttMypcE=
 github.com/trustbloc/logutil-go v1.0.0/go.mod h1:JlxT0oZfNKgIlSNtgc001WEeDMxlnAvOM43gNm8DQVc=
-github.com/trustbloc/vc-go v1.2.1-0.20240923151258-444d6c879517 h1:vSErEdByzxtFERDCuj+apO17aBM/qloaNWfnkdkzn6w=
-github.com/trustbloc/vc-go v1.2.1-0.20240923151258-444d6c879517/go.mod h1:mjjE1cfzbV5s1NTXhi10YceDyg7c+EBl70LUYcX1mYo=
+github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e h1:m2C6rWOMPzFjvjzv/1uuz8RlVd8uIMlOCfcWX9cRvtk=
+github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e/go.mod h1:mjjE1cfzbV5s1NTXhi10YceDyg7c+EBl70LUYcX1mYo=
 github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
 github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=

diff --git a/component/profile/reader/file/go.mod b/component/profile/reader/file/go.mod
@@ -125,7 +125,7 @@ require (
 	github.com/tidwall/pretty v1.2.1 // indirect
 	github.com/tidwall/sjson v1.2.5 // indirect
 	github.com/trustbloc/bbs-signature-go v1.0.2 // indirect
-	github.com/trustbloc/vc-go v1.2.1-0.20240923151258-444d6c879517 // indirect
+	github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasttemplate v1.2.2 // indirect
 	github.com/veraison/go-cose v1.3.0-rc.1 // indirect

diff --git a/component/profile/reader/file/go.sum b/component/profile/reader/file/go.sum
@@ -476,8 +476,8 @@ github.com/trustbloc/logutil-go v1.0.0 h1:KzNs9TRbnmn+M3oYw9UkrtOjNd3ZGO8aLgfYtt
 github.com/trustbloc/logutil-go v1.0.0/go.mod h1:JlxT0oZfNKgIlSNtgc001WEeDMxlnAvOM43gNm8DQVc=
 github.com/trustbloc/sidetree-go v1.0.1-0.20240219121130-f4260aff7104 h1:0IW4muaGvhjJ4OkG6/PQG3DGf5POWxlA1wwEYsxWQ+4=
 github.com/trustbloc/sidetree-go v1.0.1-0.20240219121130-f4260aff7104/go.mod h1:3yChjB5KOT7B9eZe0W1XaIx3MNUuC1Oe9nR/GCtI1W0=
-github.com/trustbloc/vc-go v1.2.1-0.20240923151258-444d6c879517 h1:vSErEdByzxtFERDCuj+apO17aBM/qloaNWfnkdkzn6w=
-github.com/trustbloc/vc-go v1.2.1-0.20240923151258-444d6c879517/go.mod h1:mjjE1cfzbV5s1NTXhi10YceDyg7c+EBl70LUYcX1mYo=
+github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e h1:m2C6rWOMPzFjvjzv/1uuz8RlVd8uIMlOCfcWX9cRvtk=
+github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e/go.mod h1:mjjE1cfzbV5s1NTXhi10YceDyg7c+EBl70LUYcX1mYo=
 github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
 github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=

diff --git a/component/wallet-cli/go.mod b/component/wallet-cli/go.mod
@@ -28,7 +28,7 @@ require (
 	github.com/trustbloc/kms-go v1.1.2
 	github.com/trustbloc/logutil-go v1.0.0
 	github.com/trustbloc/sidetree-go v1.0.1-0.20240219121130-f4260aff7104
-	github.com/trustbloc/vc-go v1.2.1-0.20240923151258-444d6c879517
+	github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e
 	github.com/trustbloc/vcs v0.0.0-00010101000000-000000000000
 	github.com/valyala/fastjson v1.6.4
 	github.com/veraison/go-cose v1.3.0-rc.1

diff --git a/component/wallet-cli/go.sum b/component/wallet-cli/go.sum
@@ -624,8 +624,8 @@ github.com/trustbloc/logutil-go v1.0.0 h1:KzNs9TRbnmn+M3oYw9UkrtOjNd3ZGO8aLgfYtt
 github.com/trustbloc/logutil-go v1.0.0/go.mod h1:JlxT0oZfNKgIlSNtgc001WEeDMxlnAvOM43gNm8DQVc=
 github.com/trustbloc/sidetree-go v1.0.1-0.20240219121130-f4260aff7104 h1:0IW4muaGvhjJ4OkG6/PQG3DGf5POWxlA1wwEYsxWQ+4=
 github.com/trustbloc/sidetree-go v1.0.1-0.20240219121130-f4260aff7104/go.mod h1:3yChjB5KOT7B9eZe0W1XaIx3MNUuC1Oe9nR/GCtI1W0=
-github.com/trustbloc/vc-go v1.2.1-0.20240923151258-444d6c879517 h1:vSErEdByzxtFERDCuj+apO17aBM/qloaNWfnkdkzn6w=
-github.com/trustbloc/vc-go v1.2.1-0.20240923151258-444d6c879517/go.mod h1:mjjE1cfzbV5s1NTXhi10YceDyg7c+EBl70LUYcX1mYo=
+github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e h1:m2C6rWOMPzFjvjzv/1uuz8RlVd8uIMlOCfcWX9cRvtk=
+github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e/go.mod h1:mjjE1cfzbV5s1NTXhi10YceDyg7c+EBl70LUYcX1mYo=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=

diff --git a/go.mod b/go.mod
@@ -45,7 +45,7 @@ require (
 	github.com/trustbloc/did-go v1.3.1-0.20240910130808-bf0188fdfe70
 	github.com/trustbloc/kms-go v1.1.2
 	github.com/trustbloc/logutil-go v1.0.0-rc1
-	github.com/trustbloc/vc-go v1.2.1-0.20240923151258-444d6c879517
+	github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e
 	github.com/valyala/fastjson v1.6.4
 	github.com/veraison/go-cose v1.3.0-rc.1
 	github.com/xeipuuv/gojsonschema v1.2.0

diff --git a/go.sum b/go.sum
@@ -637,8 +637,8 @@ github.com/trustbloc/kms-go v1.1.2 h1:nAlhDoHkSyX1eQFRz/sJsdgmJuNadyX7FJEy/9ROwy
 github.com/trustbloc/kms-go v1.1.2/go.mod h1:OKOtsLbE6W5s4mpjWkvk8XEqcmt9vTgVmDNkHELpWO0=
 github.com/trustbloc/logutil-go v1.0.0-rc1 h1:rRJbvgQfrlUfyej+mY0nuQJymGqjRW4oZEwKi544F4c=
 github.com/trustbloc/logutil-go v1.0.0-rc1/go.mod h1:JlxT0oZfNKgIlSNtgc001WEeDMxlnAvOM43gNm8DQVc=
-github.com/trustbloc/vc-go v1.2.1-0.20240923151258-444d6c879517 h1:vSErEdByzxtFERDCuj+apO17aBM/qloaNWfnkdkzn6w=
-github.com/trustbloc/vc-go v1.2.1-0.20240923151258-444d6c879517/go.mod h1:mjjE1cfzbV5s1NTXhi10YceDyg7c+EBl70LUYcX1mYo=
+github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e h1:m2C6rWOMPzFjvjzv/1uuz8RlVd8uIMlOCfcWX9cRvtk=
+github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e/go.mod h1:mjjE1cfzbV5s1NTXhi10YceDyg7c+EBl70LUYcX1mYo=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=

diff --git a/pkg/service/refresh/refresh.go b/pkg/service/refresh/refresh.go
@@ -11,6 +11,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"time"
 
 	"github.com/davecgh/go-spew/spew"
 	"github.com/google/uuid"
@@ -202,6 +203,12 @@ func (s *Service) GetRefreshedCredential(
 	credConfig.OIDCCredentialFormat = config.Format
 	credConfig.CredentialTemplate = template
 
+	if template.CredentialDefaultExpirationDuration != nil {
+		credConfig.CredentialExpiresAt = lo.ToPtr(time.Now().UTC().Add(*template.CredentialDefaultExpirationDuration))
+	} else {
+		credConfig.CredentialExpiresAt = lo.ToPtr(time.Now().UTC().Add(365 * 24 * time.Hour))
+	}
+
 	refreshServiceEnabled := false
 	if issuer.VCConfig != nil {
 		refreshServiceEnabled = true

diff --git a/test/bdd/attestation/go.mod b/test/bdd/attestation/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/gorilla/mux v1.8.0
 	github.com/trustbloc/cmdutil-go v1.0.0
 	github.com/trustbloc/did-go v1.3.1-0.20240910130808-bf0188fdfe70
-	github.com/trustbloc/vc-go v1.2.1-0.20240923151258-444d6c879517
+	github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e
 	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b
 )
 

diff --git a/test/bdd/attestation/go.sum b/test/bdd/attestation/go.sum
@@ -232,8 +232,8 @@ github.com/trustbloc/kms-go v1.1.2 h1:nAlhDoHkSyX1eQFRz/sJsdgmJuNadyX7FJEy/9ROwy
 github.com/trustbloc/kms-go v1.1.2/go.mod h1:OKOtsLbE6W5s4mpjWkvk8XEqcmt9vTgVmDNkHELpWO0=
 github.com/trustbloc/logutil-go v0.0.0-20221124174025-c46110e3ea42 h1:Mzg9wvEoUIWPoI/GHz3YlVbd4nKWeSPGc6+3l95eOZU=
 github.com/trustbloc/logutil-go v0.0.0-20221124174025-c46110e3ea42/go.mod h1:HRaXVV1caceumbDBwLO3ByiCcAc18KwrNvZ7JQBvDIQ=
-github.com/trustbloc/vc-go v1.2.1-0.20240923151258-444d6c879517 h1:vSErEdByzxtFERDCuj+apO17aBM/qloaNWfnkdkzn6w=
-github.com/trustbloc/vc-go v1.2.1-0.20240923151258-444d6c879517/go.mod h1:mjjE1cfzbV5s1NTXhi10YceDyg7c+EBl70LUYcX1mYo=
+github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e h1:m2C6rWOMPzFjvjzv/1uuz8RlVd8uIMlOCfcWX9cRvtk=
+github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e/go.mod h1:mjjE1cfzbV5s1NTXhi10YceDyg7c+EBl70LUYcX1mYo=
 github.com/veraison/go-cose v1.1.1-0.20240126165338-2300d5c96dbd h1:QhdCHSW1/oosJbzBTEYLU6xcKxXbQzzqFnhCtW2UWbA=
 github.com/veraison/go-cose v1.1.1-0.20240126165338-2300d5c96dbd/go.mod h1:D1wnviyjdmcF8AO5Y9kVGU6OGuvXUMGiE0Auo/fYRYo=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=