Stop using deprecated "jwt.StandardClaims".

strukturag · Jul 7, 2022 · 924fce6 · 924fce6
1 parent 8a97fa7
commit 924fce6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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,
 		},
 	}