@@ -269,7 +269,7 @@ func (t *TOTP) PostConfirm(w http.ResponseWriter, r *http.Request) error {
269
269
if ! ok {
270
270
data := authboss.HTMLData {
271
271
authboss .DataValidation : map [string ][]string {FormValueCode : {
272
- t .Localize (r .Context (), authboss .TxtInvalid2FACode ),
272
+ t .Localizef (r .Context (), authboss .TxtInvalid2FACode ),
273
273
}},
274
274
DataTOTPSecret : totpSecret ,
275
275
}
@@ -325,11 +325,11 @@ func (t *TOTP) PostRemove(w http.ResponseWriter, r *http.Request) error {
325
325
user , status , err := t .validate (r )
326
326
switch {
327
327
case err == errNoTOTPEnabled :
328
- data := authboss.HTMLData {authboss .DataErr : t .Localize (r .Context (), authboss .TxtTOTP2FANotActive )}
328
+ data := authboss.HTMLData {authboss .DataErr : t .Localizef (r .Context (), authboss .TxtTOTP2FANotActive )}
329
329
return t .Authboss .Core .Responder .Respond (w , r , http .StatusOK , PageTOTPRemove , data )
330
330
case err != nil :
331
331
return err
332
- case status != t .Localize (r .Context (), authboss .TxtSuccess ):
332
+ case status != t .Localizef (r .Context (), authboss .TxtSuccess ):
333
333
logger .Infof ("user %s totp 2fa removal failure (%s)" , user .GetPID (), status )
334
334
data := authboss.HTMLData {
335
335
authboss .DataValidation : map [string ][]string {FormValueCode : {status }},
@@ -368,12 +368,12 @@ func (t *TOTP) PostValidate(w http.ResponseWriter, r *http.Request) error {
368
368
switch {
369
369
case err == errNoTOTPEnabled :
370
370
logger .Infof ("user %s totp failure (not enabled)" , user .GetPID ())
371
- data := authboss.HTMLData {authboss .DataErr : t .Localize (
371
+ data := authboss.HTMLData {authboss .DataErr : t .Localizef (
372
372
r .Context (), authboss .TxtTOTP2FANotActive )}
373
373
return t .Authboss .Core .Responder .Respond (w , r , http .StatusOK , PageTOTPValidate , data )
374
374
case err != nil :
375
375
return err
376
- case status != t .Localize (r .Context (), authboss .TxtSuccess ):
376
+ case status != t .Localizef (r .Context (), authboss .TxtSuccess ):
377
377
r = r .WithContext (context .WithValue (r .Context (), authboss .CTXKeyUser , user ))
378
378
handled , err := t .Authboss .Events .FireAfter (authboss .EventAuthFail , w , r )
379
379
if err != nil {
@@ -471,25 +471,25 @@ func (t *TOTP) validate(r *http.Request) (User, string, error) {
471
471
return nil , "" , err
472
472
}
473
473
} else {
474
- return user , t .Localize (r .Context (), authboss .TxtInvalid2FACode ), nil
474
+ return user , t .Localizef (r .Context (), authboss .TxtInvalid2FACode ), nil
475
475
}
476
476
477
- return user , t .Localize (r .Context (), authboss .TxtSuccess ), nil
477
+ return user , t .Localizef (r .Context (), authboss .TxtSuccess ), nil
478
478
}
479
479
480
480
input := totpCodeValues .GetCode ()
481
481
482
482
if oneTime , ok := user .(UserOneTime ); ok {
483
483
oldCode := oneTime .GetTOTPLastCode ()
484
484
if oldCode == input {
485
- return user , t .Localize (r .Context (), authboss .TxtRepeated2FACode ), nil
485
+ return user , t .Localizef (r .Context (), authboss .TxtRepeated2FACode ), nil
486
486
}
487
487
oneTime .PutTOTPLastCode (input )
488
488
}
489
489
490
490
if ! totp .Validate (input , secret ) {
491
- return user , t .Localize (r .Context (), authboss .TxtInvalid2FACode ), nil
491
+ return user , t .Localizef (r .Context (), authboss .TxtInvalid2FACode ), nil
492
492
}
493
493
494
- return user , t .Localize (r .Context (), authboss .TxtSuccess ), nil
494
+ return user , t .Localizef (r .Context (), authboss .TxtSuccess ), nil
495
495
}
0 commit comments