github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-24 21:08:30 +00:00
Code Issues Projects Releases Wiki Activity

fix: 修改消息订阅 (#6789)

Browse Source 
Co-authored-by: xinwen <coderWen@126.com>
This commit is contained in:
fit2bot
2021-09-09 20:12:52 +08:00
committed by GitHub
parent dc742d1281
commit 81000953e2
12 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/users/models/user.py
View File

@@ -565,9 +565,17 @@ class MFAMixin:
def mfa_enabled_but_not_set(self):
if not self.mfa_enabled:
return False, None
if self.mfa_is_otp() and not self.otp_secret_key and not self.phone:
return True, reverse('authentication:user-otp-enable-start')
return False, None
if not self.mfa_is_otp():
return False, None
if self.mfa_is_otp() and self.otp_secret_key:
return False, None
if self.phone and settings.SMS_ENABLED and settings.XPACK_ENABLED:
return False, None
return True, reverse('authentication:user-otp-enable-start')
class User(AuthMixin, TokenMixin, RoleMixin, MFAMixin, AbstractUser):
@@ -661,6 +669,10 @@ class User(AuthMixin, TokenMixin, RoleMixin, MFAMixin, AbstractUser):
group_ids = list(group_ids)
return group_ids
@property
def receive_backends(self):
return self.user_msg_subscription.receive_backends
@property
def is_wecom_bound(self):
return bool(self.wecom_id)