Merge pull request #296 from 4chain-ag/fix/bux-218-access-key-revoked-at

fix(BUX-218): do not send access key revoked at if it is not revoked
bitcoin-sv · Sep 8, 2023 · 6a01236 · 6a01236
2 parents a7d34e1 + 58da7b6
commit 6a01236
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git 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,
 	}
 }