habsi/authentik
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

enterprise: fix read_only activating when no license is installed (cherry-pick #8697) (#8698)

Browse Source 
enterprise: fix read_only activating when no license is installed (#8697)

Signed-off-by: Jens Langhammer <jens@goauthentik.io>
Co-authored-by: Jens L <jens@goauthentik.io>
This commit is contained in:
gcp-cherry-pick-bot[bot]
2024-02-26 18:59:18 +01:00
committed by GitHub
parent 4e4923ad0e
commit 5ed3e879a2
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
authentik/enterprise/license.py
View File

@ -188,20 +188,21 @@ class LicenseKey:
def summary(self) -> LicenseSummary: def summary(self) -> LicenseSummary:
"""Summary of license status""" """Summary of license status"""
has_license = License.objects.all().count() > 0
last_valid = LicenseKey.last_valid_date() last_valid = LicenseKey.last_valid_date()
show_admin_warning = last_valid < now() - timedelta(weeks=2) show_admin_warning = last_valid < now() - timedelta(weeks=2)
show_user_warning = last_valid < now() - timedelta(weeks=4) show_user_warning = last_valid < now() - timedelta(weeks=4)
read_only = last_valid < now() - timedelta(weeks=6) read_only = last_valid < now() - timedelta(weeks=6)
latest_valid = datetime.fromtimestamp(self.exp) latest_valid = datetime.fromtimestamp(self.exp)
return LicenseSummary( return LicenseSummary(
show_admin_warning=show_admin_warning, show_admin_warning=show_admin_warning and has_license,
show_user_warning=show_user_warning, show_user_warning=show_user_warning and has_license,
read_only=read_only, read_only=read_only and has_license,
latest_valid=latest_valid, latest_valid=latest_valid,
internal_users=self.internal_users, internal_users=self.internal_users,
external_users=self.external_users, external_users=self.external_users,
valid=self.is_valid(), valid=self.is_valid(),
has_license=License.objects.all().count() > 0, has_license=has_license,
) )
@staticmethod @staticmethod