feat: fix by reviewer's comments

r.v.stupnikov · aeneasr · commit 7a7d55fba25d · 2022-12-06T18:52:30.000+01:00
diff --git a/cmd/cli/handler_janitor.go b/cmd/cli/handler_janitor.go
@@ -70,7 +70,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
@@ -608,7 +608,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
`@@ -70,7 +70,7 @@ func (_ JanitorHandler) Args(cmd cobra.Command, args []string) error {`
`70`	`70`	`!flagx.MustGetBool(cmd, OnlyGrants) &&`
`71`	`71`	`!flagx.MustGetBool(cmd, OnlyLoginSessions) {`
`72`	`72`	`return fmt.Errorf("%s\n%s\n", cmd.UsageString(),`
`73`		`- "Janitor requires at least one of --tokens, --requests or --grants to be set")`
	`73`	`+ "Janitor requires at least one of --tokens, --requests, --grants or --login-sessions to be set")`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`limit := flagx.MustGetInt(cmd, Limit)`
Original file line number	Diff line number	Diff line change
`@@ -608,7 +608,7 @@ func (p *Persister) VerifyAndInvalidateLogoutRequest(ctx context.Context, verifi`
`608`	`608`	`})`
`609`	`609`	`}`
`610`	`610`
`611`		`-func (p *Persister) FlushInactiveLoginSessions(ctx context.Context, _ time.Time, limit, batchSize int) error {`
	`611`	`+func (p *Persister) FlushInactiveLoginSessions(ctx context.Context, _ time.Time, limit, _ int) error {`
`612`	`612`	`return p.transaction(ctx, func(ctx context.Context, c *pop.Connection) error {`
`613`	`613`	`// "hydra_oauth2_authentication_request"`
`614`	`614`	`var lr consent.LoginRequest`