Merge pull request #2 from wxiaoguang/migrate-to-urfave-v3

Don't call newAuthService in init stage

Author: TheFox0x7

cmd/admin_auth_oauth.go

@@ -126,18 +126,22 @@ func oauthCLIFlags() []cli.Flag {
 
 func microcmdAuthAddOauth() *cli.Command {
 	return &cli.Command{
-		Name:   "add-oauth",
-		Usage:  "Add new Oauth authentication source",
-		Action: newAuthService().runAddOauth,
-		Flags:  oauthCLIFlags(),
+		Name:  "add-oauth",
+		Usage: "Add new Oauth authentication source",
+		Action: func(ctx context.Context, cmd *cli.Command) error {
+			return newAuthService().runAddOauth(ctx, cmd)
+		},
+		Flags: oauthCLIFlags(),
 	}
 }
 
 func microcmdAuthUpdateOauth() *cli.Command {
 	return &cli.Command{
-		Name:   "update-oauth",
-		Usage:  "Update existing Oauth authentication source",
-		Action: newAuthService().runUpdateOauth,
+		Name:  "update-oauth",
+		Usage: "Update existing Oauth authentication source",
+		Action: func(ctx context.Context, cmd *cli.Command) error {
+			return newAuthService().runUpdateOauth(ctx, cmd)
+		},
 		Flags: append(oauthCLIFlags()[:1], append([]cli.Flag{&cli.Int64Flag{
 			Name:  "id",
 			Usage: "ID of authentication source",

cmd/admin_auth_smtp.go

@@ -76,9 +76,11 @@ func smtpCLIFlags() []cli.Flag {
 
 func microcmdAuthUpdateSMTP() *cli.Command {
 	return &cli.Command{
-		Name:   "update-smtp",
-		Usage:  "Update existing SMTP authentication source",
-		Action: newAuthService().runUpdateSMTP,
+		Name:  "update-smtp",
+		Usage: "Update existing SMTP authentication source",
+		Action: func(ctx context.Context, cmd *cli.Command) error {
+			return newAuthService().runUpdateSMTP(ctx, cmd)
+		},
 		Flags: append(smtpCLIFlags()[:1], append([]cli.Flag{&cli.Int64Flag{
 			Name:  "id",
 			Usage: "ID of authentication source",
@@ -88,10 +90,12 @@ func microcmdAuthUpdateSMTP() *cli.Command {
 
 func microcmdAuthAddSMTP() *cli.Command {
 	return &cli.Command{
-		Name:   "add-smtp",
-		Usage:  "Add new SMTP authentication source",
-		Action: newAuthService().runAddSMTP,
-		Flags:  smtpCLIFlags(),
+		Name:  "add-smtp",
+		Usage: "Add new SMTP authentication source",
+		Action: func(ctx context.Context, cmd *cli.Command) error {
+			return newAuthService().runAddSMTP(ctx, cmd)
+		},
+		Flags: smtpCLIFlags(),
 	}
 }