feat: fix by reviewer's comments

r.v.stupnikov · r.v.stupnikov · commit 5dcf2b26def6 · 2022-07-04T18:54:33.000+04:00
diff --git a/cmd/cli/handler_janitor.go b/cmd/cli/handler_janitor.go
@@ -57,7 +57,7 @@ func (_ *JanitorHandler) Args(cmd *cobra.Command, args []string) error {
 		!flagx.MustGetBool(cmd, OnlyGrants) &&
 		!flagx.MustGetBool(cmd, OnlyLoginSessions) {
 		return fmt.Errorf("%s\n%s\n", cmd.UsageString(),
-			"Janitor requires at least one of --tokens, --requests or --grants to be set")
+			"Janitor requires at least one of --tokens, --requests, --grants or --login-sessions to be set")
 	}
 
 	limit := flagx.MustGetInt(cmd, Limit)
diff --git a/persistence/sql/persister_consent.go b/persistence/sql/persister_consent.go
@@ -437,7 +437,7 @@ func (p *Persister) VerifyAndInvalidateLogoutRequest(ctx context.Context, verifi
 	})
 }
 
-func (p *Persister) FlushInactiveLoginSessions(ctx context.Context, _ time.Time, limit, batchSize int) error {
+func (p *Persister) FlushInactiveLoginSessions(ctx context.Context, _ time.Time, limit, _ int) error {
 	return p.transaction(ctx, func(ctx context.Context, c *pop.Connection) error {
 		// "hydra_oauth2_authentication_request"
 		var lr consent.LoginRequest

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ func (_ JanitorHandler) Args(cmd cobra.Command, args []string) error {`
`57`	`57`	`!flagx.MustGetBool(cmd, OnlyGrants) &&`
`58`	`58`	`!flagx.MustGetBool(cmd, OnlyLoginSessions) {`
`59`	`59`	`return fmt.Errorf("%s\n%s\n", cmd.UsageString(),`
`60`		`- "Janitor requires at least one of --tokens, --requests or --grants to be set")`
	`60`	`+ "Janitor requires at least one of --tokens, --requests, --grants or --login-sessions to be set")`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`limit := flagx.MustGetInt(cmd, Limit)`
Original file line number	Diff line number	Diff line change
`@@ -437,7 +437,7 @@ func (p *Persister) VerifyAndInvalidateLogoutRequest(ctx context.Context, verifi`
`437`	`437`	`})`
`438`	`438`	`}`
`439`	`439`
`440`		`-func (p *Persister) FlushInactiveLoginSessions(ctx context.Context, _ time.Time, limit, batchSize int) error {`
	`440`	`+func (p *Persister) FlushInactiveLoginSessions(ctx context.Context, _ time.Time, limit, _ int) error {`
`441`	`441`	`return p.transaction(ctx, func(ctx context.Context, c *pop.Connection) error {`
`442`	`442`	`// "hydra_oauth2_authentication_request"`
`443`	`443`	`var lr consent.LoginRequest`