Merge pull request #2578 from gcoxmoz/fix-UserInfoRefreshInterval

puppetlabs · Nov 18, 2024 · 3fa5260 · 3fa5260
2 parents c4310ce + 722653a
commit 3fa5260
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -11473,7 +11473,7 @@ Struct[{
     Optional['Scope']                                      => Pattern[/^\"?[A-Za-z0-9\-\._\s]+\"?$/],
     Optional['AuthRequestParams']                          => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
     Optional['SSLValidateServer']                          => Apache::OnOff ,
-    Optional['UserInfoRefreshInterval']                    => Pattern[/^[0-9]+(\s+(logout_on_error|authenticate_on_error|502_on_error))?$/],
+    Optional['UserInfoRefreshInterval']                    => Variant[Integer[-1], Pattern[/^[0-9]+(\s+(logout_on_error|authenticate_on_error|502_on_error))?$/]],
     Optional['JWKSRefreshInterval']                        => Integer[-1],
     Optional['UserInfoTokenMethod']                        => Enum['authz_header', 'post_param'],
     Optional['ProviderAuthRequestMethod']                  => Enum['GET', 'POST', 'PAR'],

diff --git a/types/oidcsettings.pp b/types/oidcsettings.pp
@@ -20,7 +20,7 @@
     Optional['Scope']                                      => Pattern[/^\"?[A-Za-z0-9\-\._\s]+\"?$/],
     Optional['AuthRequestParams']                          => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
     Optional['SSLValidateServer']                          => Apache::OnOff ,
-    Optional['UserInfoRefreshInterval']                    => Pattern[/^[0-9]+(\s+(logout_on_error|authenticate_on_error|502_on_error))?$/],
+    Optional['UserInfoRefreshInterval']                    => Variant[Integer[-1], Pattern[/^[0-9]+(\s+(logout_on_error|authenticate_on_error|502_on_error))?$/]],
     Optional['JWKSRefreshInterval']                        => Integer[-1],
     Optional['UserInfoTokenMethod']                        => Enum['authz_header', 'post_param'],
     Optional['ProviderAuthRequestMethod']                  => Enum['GET', 'POST', 'PAR'],