Merge branch 'master' into feat_dev_grants_2x

ory · Nov 24, 2023 · b1fbd36 · b1fbd36
2 parents 0e6f5fa + dfa2c0a
commit b1fbd36
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/session.go b/session.go
@@ -52,9 +52,6 @@ func (s *DefaultSession) GetExpiresAt(key TokenType) time.Time {
 		s.ExpiresAt = make(map[TokenType]time.Time)
 	}
 
-	if _, ok := s.ExpiresAt[key]; !ok {
-		return time.Time{}
-	}
 	return s.ExpiresAt[key]
 }
 

diff --git a/session_test.go b/session_test.go
@@ -15,3 +15,11 @@ func TestSession(t *testing.T) {
 	assert.Empty(t, s.GetUsername())
 	assert.Nil(t, s.Clone())
 }
+
+func TestZeroSession(t *testing.T) {
+	var s *DefaultSession = new(DefaultSession)
+	assert.Empty(t, s.GetSubject())
+	assert.Empty(t, s.GetUsername())
+	assert.Empty(t, s.Clone())
+	assert.Empty(t, s.GetExpiresAt(AccessToken))
+}