From fe3b1c9b52f584b0f045907585b206344fed55db Mon Sep 17 00:00:00 2001 From: "Shishkevich D." <135337715+shishkevichd@users.noreply.github.com> Date: Thu, 8 May 2025 21:20:58 +0700 Subject: chore: implement 2fa auth (#2968) * chore: implement 2fa auth from #2786 * chore: format code * chore: replace two factor token input with qr-code * chore: requesting confirmation of setting/removing two-factor authentication otpauth library was taken from cdnjs * chore: revert changes in `ClipboardManager` don't need it. * chore: removing twoFactor prop in settings page * chore: remove `twoFactorQr` object in `mounted` function --- web/service/setting.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'web/service/setting.go') diff --git a/web/service/setting.go b/web/service/setting.go index 5443760c..62d66c11 100644 --- a/web/service/setting.go +++ b/web/service/setting.go @@ -48,7 +48,8 @@ var defaultValueMap = map[string]string{ "tgBotLoginNotify": "true", "tgCpu": "80", "tgLang": "en-US", - "secretEnable": "false", + "twoFactorEnable": "false", + "twoFactorToken": "", "subEnable": "false", "subTitle": "", "subListen": "", @@ -166,8 +167,7 @@ func (s *SettingService) ResetSettings() error { return err } return db.Model(model.User{}). - Where("1 = 1"). - Update("login_secret", "").Error + Where("1 = 1").Error } func (s *SettingService) getSetting(key string) (*model.Setting, error) { @@ -318,6 +318,14 @@ func (s *SettingService) GetTgLang() (string, error) { return s.getString("tgLang") } +func (s *SettingService) GetTwoFactorEnable() (bool, error) { + return s.getBool("twoFactorEnable") +} + +func (s *SettingService) GetTwoFactorToken() (string, error) { + return s.getString("twoFactorToken") +} + func (s *SettingService) GetPort() (int, error) { return s.getInt("webPort") } @@ -358,14 +366,6 @@ func (s *SettingService) GetRemarkModel() (string, error) { return s.getString("remarkModel") } -func (s *SettingService) GetSecretStatus() (bool, error) { - return s.getBool("secretEnable") -} - -func (s *SettingService) SetSecretStatus(value bool) error { - return s.setBool("secretEnable", value) -} - func (s *SettingService) GetSecret() ([]byte, error) { secret, err := s.getString("secret") if secret == defaultValueMap["secret"] { -- cgit v1.2.3