From ea284b9292ca5356c99e6dba8ba672aa6ac0c2bc Mon Sep 17 00:00:00 2001 From: Damian Orzepowski Date: Fri, 8 Sep 2023 15:00:43 +0200 Subject: [PATCH 1/2] fix(BUX-218): do not send access key revoked at if it is not revoked --- go.mod | 2 +- mappings/access_keys.go | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index b6a787d9..0708cfeb 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/99designs/gqlgen v0.17.36 github.com/BuxOrg/bux v0.5.12 - github.com/BuxOrg/bux-models v0.1.2 + github.com/BuxOrg/bux-models v0.2.0 github.com/go-ozzo/ozzo-validation v3.6.0+incompatible github.com/go-redis/redis/v8 v8.11.5 github.com/gofrs/uuid v4.4.0+incompatible diff --git a/mappings/access_keys.go b/mappings/access_keys.go index 0829cb00..a6ce1270 100644 --- a/mappings/access_keys.go +++ b/mappings/access_keys.go @@ -2,6 +2,8 @@ package mappings import ( + "time" + "github.com/BuxOrg/bux" buxmodels "github.com/BuxOrg/bux-models" "github.com/BuxOrg/bux-server/mappings/common" @@ -13,11 +15,16 @@ func MapToAccessKeyContract(ac *bux.AccessKey) *buxmodels.AccessKey { return nil } + var revokedAt *time.Time + if !ac.RevokedAt.IsZero() { + revokedAt = &ac.RevokedAt.Time + } + return &buxmodels.AccessKey{ Model: *common.MapToContract(&ac.Model), ID: ac.ID, XpubID: ac.XpubID, - RevokedAt: ac.RevokedAt.Time, + RevokedAt: revokedAt, Key: ac.Key, } } From 58da7b6a1dead19a669594f50c398b391bde75ee Mon Sep 17 00:00:00 2001 From: Damian Orzepowski Date: Fri, 8 Sep 2023 15:40:19 +0200 Subject: [PATCH 2/2] fix(BUX-218): update go.sum --- go.sum | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go.sum b/go.sum index a87a7cb0..6a288ca4 100644 --- a/go.sum +++ b/go.sum @@ -42,8 +42,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/BuxOrg/bux v0.5.12 h1:lF75iwcR/VAQ5vjim3YJ2TsgtRSUUBrAbfgsFlhYIZY= github.com/BuxOrg/bux v0.5.12/go.mod h1:6iNxLzkECsFirgcIz6BIxqiBJUM+aGOqDKKqxxX4Jg8= -github.com/BuxOrg/bux-models v0.1.2 h1:MUtqwnhJuSNaXXglMtTltVh+QYTyQPV6wBERogQmMYM= -github.com/BuxOrg/bux-models v0.1.2/go.mod h1:nH3MOdsIPPerBPOiEvwA01yTeArYtBk+PtDo7E+vPCk= +github.com/BuxOrg/bux-models v0.2.0 h1:BC2Mcfa+3ZkZdHkFyP+8gFmJn6nRwzY5gzx///5drbU= +github.com/BuxOrg/bux-models v0.2.0/go.mod h1:nH3MOdsIPPerBPOiEvwA01yTeArYtBk+PtDo7E+vPCk= github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/DataDog/datadog-go v3.7.1+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=