fix(auth): allow auth module config to be injected (#538)

Author: laouji

auth/cli.go

@@ -22,7 +22,7 @@ func AddFlags(flags *flag.FlagSet) {
 	flags.String(AuthServiceFlag, "", "Service")
 }
 
-func defaultModuleConfig(cmd *cobra.Command) ModuleConfig {
+func ModuleConfigFromFlags(cmd *cobra.Command) ModuleConfig {
 	authEnabled, _ := cmd.Flags().GetBool(AuthEnabledFlag)
 	authIssuer, _ := cmd.Flags().GetString(AuthIssuerFlag)
 	authReadKeySetMaxRetries, _ := cmd.Flags().GetInt(AuthReadKeySetMaxRetriesFlag)
@@ -40,17 +40,17 @@ func defaultModuleConfig(cmd *cobra.Command) ModuleConfig {
 }
 
 func FXModuleFromFlags(cmd *cobra.Command) fx.Option {
-	return Module(defaultModuleConfig(cmd))
+	return Module(ModuleConfigFromFlags(cmd))
 }
 
 func OrganizationAwareFXModuleFromFlags(cmd *cobra.Command, fn OrganizationIDProvider) fx.Option {
-	cfg := defaultModuleConfig(cmd)
+	cfg := ModuleConfigFromFlags(cmd)
 	cfg.AdditionalChecks = append(cfg.AdditionalChecks, CheckOrganizationIDClaim(fn))
 	return Module(cfg)
 }
 
 func AdditionalChecksFXModuleFromFlags(cmd *cobra.Command, checks ...AdditionalCheck) fx.Option {
-	cfg := defaultModuleConfig(cmd)
+	cfg := ModuleConfigFromFlags(cmd)
 	cfg.AdditionalChecks = append(cfg.AdditionalChecks, checks...)
 	return Module(cfg)
 }

auth/module.go

@@ -22,20 +22,23 @@ type ModuleConfig struct {
 }
 
 func Module(cfg ModuleConfig) fx.Option {
-	options := make([]fx.Option, 0)
+	options := ModuleOptions()
+	options = append(options, fx.Provide(func() ModuleConfig {
+		return cfg
+	}))
+	return fx.Module("auth", options...)
+}
 
-	if !cfg.Enabled {
-		options = append(options,
-			fx.Provide(func() Authenticator {
-				return NewNoAuth()
-			}),
-		)
-		return fx.Module("auth", options...)
-	}
+func ModuleOptions() []fx.Option {
+	options := make([]fx.Option, 0)
 
 	options = append(options,
 		fx.Supply(http.DefaultClient),
-		fx.Provide(func(httpClient *http.Client) (oidc.KeySet, error) {
+		fx.Provide(func(cfg ModuleConfig, httpClient *http.Client) (oidc.KeySet, error) {
+			if !cfg.Enabled {
+				// this won't be used by the NoAuth
+				return oidc.NewStaticKeySet(), nil
+			}
 			retryableHttpClient := retryablehttp.NewClient()
 			retryableHttpClient.RetryMax = cfg.ReadKeySetMaxRetries
 			retryableHttpClient.HTTPClient = httpClient
@@ -54,7 +57,11 @@ func Module(cfg ModuleConfig) fx.Option {
 	)
 
 	options = append(options,
-		fx.Provide(func(keySet oidc.KeySet) Authenticator {
+		fx.Provide(func(cfg ModuleConfig, keySet oidc.KeySet) Authenticator {
+			if !cfg.Enabled {
+				return NewNoAuth()
+			}
+
 			return NewJWTAuth(
 				keySet,
 				cfg.Issuer,
@@ -64,5 +71,5 @@ func Module(cfg ModuleConfig) fx.Option {
 			)
 		}),
 	)
-	return fx.Module("auth", options...)
+	return options
 }