Update remaining datatypes from review feedback.

Author: uoe-pjackson

REFERENCE.md

@@ -11362,7 +11362,7 @@ Struct[{
     Optional['OAuthIntrospectionEndpointMethod']           => Enum['POST', 'GET'],
     Optional['OAuthIntrospectionEndpointParams']           => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
     Optional['OAuthIntrospectionTokenParamName']           => String[1],
-    Optional['OAuthTokenExpiryClaim']                      => Pattern[/^[A-Za-z0-9\-\._]+\s?((absolute|relative)+(\s(mandatory|optional))?)?$/],
+    Optional['OAuthTokenExpiryClaim']                      => Pattern[/^[A-Za-z0-9\-\._]+(\s(absolute|relative))?(\s(mandatory|optional))?$/],
     Optional['OAuthTokenIntrospectionInterval']            => Integer[-1],
     Optional['OAuthSSLValidateServer']                     => Apache::OnOff,
     Optional['OAuthVerifySharedKeys']                      => String[1],
@@ -11412,7 +11412,7 @@ Struct[{
     Optional['RemoteUserClaim']                            => String[1],
     Optional['PassIDTokenAs']                              => Pattern[/^((claims|payload|serialized)\s?)+$/],
     Optional['PassUserInfoAs']                             => Pattern[/^((claims|json(:([A-Za-z0-9\-\._])+)?|(signed_)?jwt(:([A-Za-z0-9\-\._])+)?)\s?)+$/],
-    Optional['PassClaimsAs']                               => Enum['none', 'headers', 'environment', 'both'],
+    Optional['PassClaimsAs']                               => Pattern[/^(none|headers|environment|both)?\s?(latin1|base64url|none)?$/],
     Optional['AuthNHeader']                                => String[1],
     Optional['HTTPTimeoutLong']                            => Integer[-1],
     Optional['HTTPTimeoutShort']                           => Integer[-1],

types/oidcsettings.pp

@@ -57,7 +57,7 @@
     Optional['OAuthIntrospectionEndpointMethod']           => Enum['POST', 'GET'],
     Optional['OAuthIntrospectionEndpointParams']           => Pattern[/^[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+(&[A-Za-z0-9\-\._%]+=[A-Za-z0-9\-\._%]+)*$/],
     Optional['OAuthIntrospectionTokenParamName']           => String[1],
-    Optional['OAuthTokenExpiryClaim']                      => Pattern[/^[A-Za-z0-9\-\._]+\s?((absolute|relative)+(\s(mandatory|optional))?)?$/],
+    Optional['OAuthTokenExpiryClaim']                      => Pattern[/^[A-Za-z0-9\-\._]+(\s(absolute|relative))?(\s(mandatory|optional))?$/],
     Optional['OAuthTokenIntrospectionInterval']            => Integer[-1],
     Optional['OAuthSSLValidateServer']                     => Apache::OnOff,
     Optional['OAuthVerifySharedKeys']                      => String[1],
@@ -107,7 +107,7 @@
     Optional['RemoteUserClaim']                            => String[1],
     Optional['PassIDTokenAs']                              => Pattern[/^((claims|payload|serialized)\s?)+$/],
     Optional['PassUserInfoAs']                             => Pattern[/^((claims|json(:([A-Za-z0-9\-\._])+)?|(signed_)?jwt(:([A-Za-z0-9\-\._])+)?)\s?)+$/],
-    Optional['PassClaimsAs']                               => Enum['none', 'headers', 'environment', 'both'],
+    Optional['PassClaimsAs']                               => Pattern[/^(none|headers|environment|both)?\s?(latin1|base64url|none)?$/],
     Optional['AuthNHeader']                                => String[1],
     Optional['HTTPTimeoutLong']                            => Integer[-1],
     Optional['HTTPTimeoutShort']                           => Integer[-1],