move logic to more relevant function

internal/auth/options.go

@@ -180,6 +180,13 @@ func (o *Options) Validate() error {
 		msgs = append(msgs, "missing setting: required-host-header")
 	}
 
+	if len(o.OrgName) > 0 {
+		o.OrgName = strings.Trim(o.OrgName, `"`)
+	}
+	if len(o.ProviderServerID) > 0 {
+		o.ProviderServerID = strings.Trim(o.ProviderServerID, `"`)
+	}
+
 	o.redirectURL, msgs = parseURL(o.RedirectURL, "redirect", msgs)
 
 	msgs = validateEndpoints(o, msgs)
@@ -290,9 +297,7 @@ func newProvider(o *Options) (providers.Provider, error) {
 		o.GroupsCacheStopFunc = cache.Stop
 		singleFlightProvider = providers.NewSingleFlightProvider(googleProvider)
 	case providers.OktaProviderName:
-		orgName := strings.Trim(o.OrgName, "\"")
-		providerServerID := strings.Trim(o.ProviderServerID, "\"")
-		oktaProvider, err := providers.NewOktaProvider(p, orgName, providerServerID)
+		oktaProvider, err := providers.NewOktaProvider(p, o.OrgName, o.ProviderServerID)
 		if err != nil {
 			return nil, err
 		}