Merge branch 'origin/main' into 'next-release/main'

Author: openclouders

services/proxy/pkg/middleware/oidc_auth.go

@@ -34,6 +34,7 @@ func NewOIDCAuthenticator(opts ...Option) *OIDCAuthenticator {
 		userInfoCache:           options.UserInfoCache,
 		HTTPClient:              options.HTTPClient,
 		OIDCIss:                 options.OIDCIss,
+		DefaultTokenCacheTTL:    options.DefaultAccessTokenTTL,
 		oidcClient:              options.OIDCClient,
 		AccessTokenVerifyMethod: options.AccessTokenVerifyMethod,
 		skipUserInfo:            options.SkipUserInfo,

services/proxy/pkg/middleware/oidc_auth_test.go

@@ -53,6 +53,14 @@ var _ = Describe("Authenticating requests", Label("OIDCAuthenticator"), func() {
 		}
 	})
 
+	It("should apply the default access token ttl option", func() {
+		ttl := 5 * time.Minute
+
+		authenticator := NewOIDCAuthenticator(DefaultAccessTokenTTL(ttl))
+
+		Expect(authenticator.DefaultTokenCacheTTL).To(Equal(ttl))
+	})
+
 	When("the request contains correct data", func() {
 		It("should successfully authenticate", func() {
 			req := httptest.NewRequest(http.MethodGet, "http://example.com/example/path", http.NoBody)