arangodb
diff --git a/‎integrations/authentication/v1/implementation.go
Lines changed: 7 additions & 4 deletions b/‎integrations/authentication/v1/implementation.go
Lines changed: 7 additions & 4 deletions
diff --git a/‎integrations/authentication/v1/service_test.go
Lines changed: 53 additions & 0 deletions b/‎integrations/authentication/v1/service_test.go
Lines changed: 53 additions & 0 deletions
@@ -165,13 +165,13 @@ func (i *implementation) CreateToken(ctx context.Context, request *pbAuthenticat
 		return nil, err
 	}
 
-	user, exp, err := i.extractTokenDetails(cache, signedToken)
+	user, _, err = i.extractTokenDetails(cache, signedToken)
 	if err != nil {
 		return nil, err
 	}
 
 	return &pbAuthenticationV1.CreateTokenResponse{
-		Lifetime: durationpb.New(exp),
+		Lifetime: durationpb.New(duration),
 		User:     user,
 		Token:    signedToken,
 	}, nil
@@ -195,8 +195,11 @@ func (i *implementation) extractTokenDetails(cache *cache, t string) (string, ti
 	duration := DefaultTokenMaxTTL
 
 	if v, ok := p[token.ClaimEXP]; ok {
-		if s, ok := v.(int64); ok {
-			duration = time.Until(time.Unix(s, 0))
+		switch o := v.(type) {
+		case int64:
+			duration = time.Until(time.Unix(o, 0))
+		case float64:
+			duration = time.Until(time.Unix(int64(o), 0))
 		}
 	}
 
 
@@ -23,8 +23,10 @@ package v1
 import (
 	"context"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
+	"google.golang.org/protobuf/types/known/durationpb"
 
 	pbAuthenticationV1 "github.com/arangodb/kube-arangodb/integrations/authentication/v1/definition"
 	"github.com/arangodb/kube-arangodb/pkg/util"
@@ -189,3 +191,54 @@ func Test_Service_AskForDefaultIfBlocked(t *testing.T) {
 	})
 	require.EqualError(t, err, "rpc error: code = Unknown desc = User blocked is not allowed")
 }
+
+func Test_Service_WithTTL(t *testing.T) {
+	ctx, c := context.WithCancel(context.Background())
+	defer c()
+
+	client, directory := Client(t, ctx)
+
+	reSaveJWTTokens(t, directory, generateJWTToken())
+
+	extract := func(t *testing.T, duration time.Duration) (time.Duration, time.Duration) {
+		token, err := client.CreateToken(ctx, &pbAuthenticationV1.CreateTokenRequest{
+			Lifetime: durationpb.New(duration),
+		})
+		require.NoError(t, err)
+
+		valid, err := client.Validate(ctx, &pbAuthenticationV1.ValidateRequest{
+			Token: token.Token,
+		})
+		require.NoError(t, err)
+
+		require.NotNil(t, token.Lifetime)
+		require.True(t, valid.IsValid)
+		require.NotNil(t, valid.Details)
+
+		return token.Lifetime.AsDuration(), valid.Details.Lifetime.AsDuration()
+	}
+
+	t.Run("10h", func(t *testing.T) {
+		base, current := extract(t, 10*time.Hour)
+		require.EqualValues(t, time.Hour, base)
+		require.True(t, base-time.Second < current)
+	})
+
+	t.Run("1h", func(t *testing.T) {
+		base, current := extract(t, time.Hour)
+		require.EqualValues(t, time.Hour, base)
+		require.True(t, base-time.Second < current)
+	})
+
+	t.Run("1min", func(t *testing.T) {
+		base, current := extract(t, time.Minute)
+		require.EqualValues(t, time.Minute, base)
+		require.True(t
6268
, base-time.Second < current)
+	})
+
+	t.Run("1sec", func(t *testing.T) {
+		base, current := extract(t, time.Second)
+		require.EqualValues(t, time.Minute, base)
+		require.True(t, base-time.Second < current)
+	})
+}