From 924fce6713e57b05e370e4edbdf71c3a2ee2b3a3 Mon Sep 17 00:00:00 2001
From: Joachim Bauch <bauch@struktur.de>
Date: Thu, 7 Jul 2022 17:12:21 +0200
Subject: [PATCH] Stop using deprecated "jwt.StandardClaims".

---
 api_proxy.go               | 2 +-
 mcu_proxy.go               | 4 ++--
 proxy/proxy_server.go      | 2 +-
 proxy/proxy_server_test.go | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/api_proxy.go b/api_proxy.go
index 0e98850..3e79c1c 100644
--- a/api_proxy.go
+++ b/api_proxy.go
@@ -127,7 +127,7 @@ func (r *ProxyServerMessage) CloseAfterSend(session Session) bool {
 // Type "hello"
 
 type TokenClaims struct {
-	jwt.StandardClaims
+	jwt.RegisteredClaims
 }
 
 type HelloProxyClientMessage struct {
diff --git a/mcu_proxy.go b/mcu_proxy.go
index 1a227cd..befac70 100644
--- a/mcu_proxy.go
+++ b/mcu_proxy.go
@@ -951,8 +951,8 @@ func (c *mcuProxyConnection) sendHello() error {
 		msg.Hello.ResumeId = c.sessionId
 	} else {
 		claims := &TokenClaims{
-			jwt.StandardClaims{
-				IssuedAt: time.Now().Unix(),
+			jwt.RegisteredClaims{
+				IssuedAt: jwt.NewNumericDate(time.Now()),
 				Issuer:   c.proxy.tokenId,
 			},
 		}
diff --git a/proxy/proxy_server.go b/proxy/proxy_server.go
index ef878dc..d5de159 100644
--- a/proxy/proxy_server.go
+++ b/proxy/proxy_server.go
@@ -890,7 +890,7 @@ func (s *ProxyServer) NewSession(hello *signaling.HelloProxyClientMessage) (*Pro
 	}
 
 	minIssuedAt := time.Now().Add(-maxTokenAge)
-	if issuedAt := time.Unix(claims.IssuedAt, 0); issuedAt.Before(minIssuedAt) {
+	if issuedAt := claims.IssuedAt; issuedAt != nil && issuedAt.Before(minIssuedAt) {
 		statsTokenErrorsTotal.WithLabelValues("expired").Inc()
 		return nil, TokenExpired
 	}
diff --git a/proxy/proxy_server_test.go b/proxy/proxy_server_test.go
index dba5a74..69c4acc 100644
--- a/proxy/proxy_server_test.go
+++ b/proxy/proxy_server_test.go
@@ -96,8 +96,8 @@ func TestTokenInFuture(t *testing.T) {
 	server, key := newProxyServerForTest(t)
 
 	claims := &signaling.TokenClaims{
-		StandardClaims: jwt.StandardClaims{
-			IssuedAt: time.Now().Add(time.Hour).Unix(),
+		RegisteredClaims: jwt.RegisteredClaims{
+			IssuedAt: jwt.NewNumericDate(time.Now().Add(time.Hour)),
 			Issuer:   TokenIdForTest,
 		},
 	}