Comment changes
This commit is contained in:
parent
4368fd323f
commit
549c6ec7d3
|
@ -15,6 +15,7 @@ from app.models import (
|
||||||
Subscription,
|
Subscription,
|
||||||
AppleSubscription,
|
AppleSubscription,
|
||||||
AdminAuditLog,
|
AdminAuditLog,
|
||||||
|
AuditLogActionEnum,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -50,9 +51,9 @@ class SLModelView(sqla.ModelView):
|
||||||
value = str(value)
|
value = str(value)
|
||||||
changes[attr.key] = value
|
changes[attr.key] = value
|
||||||
auditAction = (
|
auditAction = (
|
||||||
AdminAuditLog.ACTION_CREATE_OBJECT
|
AuditLogActionEnum.create_object
|
||||||
if is_created
|
if is_created
|
||||||
else AdminAuditLog.ACTION_UPDATE_OBJECT
|
else AuditLogActionEnum.update_object
|
||||||
)
|
)
|
||||||
AdminAuditLog.create(
|
AdminAuditLog.create(
|
||||||
admin_user_id=current_user.id,
|
admin_user_id=current_user.id,
|
||||||
|
@ -67,7 +68,7 @@ class SLModelView(sqla.ModelView):
|
||||||
admin_user_id=current_user.id,
|
admin_user_id=current_user.id,
|
||||||
model=model.__class__.__name__,
|
model=model.__class__.__name__,
|
||||||
model_id=model.id,
|
model_id=model.id,
|
||||||
action=AdminAuditLog.ACTION_DELETE_OBJECT,
|
action=AuditLogActionEnum.delete_object,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -226,6 +226,16 @@ class BlockBehaviourEnum(EnumE):
|
||||||
return_5xx = 1
|
return_5xx = 1
|
||||||
|
|
||||||
|
|
||||||
|
class AuditLogActionEnum(EnumE):
|
||||||
|
create_object = 0
|
||||||
|
update_object = 1
|
||||||
|
delete_object = 2
|
||||||
|
manual_upgrade = 3
|
||||||
|
extend_trial = 4
|
||||||
|
disable_2fa = 5
|
||||||
|
logged_as_user = 6
|
||||||
|
|
||||||
|
|
||||||
class Hibp(Base, ModelMixin):
|
class Hibp(Base, ModelMixin):
|
||||||
__tablename__ = "hibp"
|
__tablename__ = "hibp"
|
||||||
name = sa.Column(sa.String(), nullable=False, unique=True, index=True)
|
name = sa.Column(sa.String(), nullable=False, unique=True, index=True)
|
||||||
|
@ -2891,14 +2901,6 @@ class AdminAuditLog(Base):
|
||||||
|
|
||||||
admin = orm.relationship(User, foreign_keys=[admin_user_id])
|
admin = orm.relationship(User, foreign_keys=[admin_user_id])
|
||||||
|
|
||||||
ACTION_CREATE_OBJECT = 1
|
|
||||||
ACTION_UPDATE_OBJECT = 2
|
|
||||||
ACTION_DELETE_OBJECT = 3
|
|
||||||
ACTION_MANUAL_UPGRADE = 4
|
|
||||||
ACTION_EXTEND_TRIAL = 5
|
|
||||||
ACTION_DISABLE_2FA = 6
|
|
||||||
ACTION_LOGGED_AS_USER = 7
|
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def create(cls, **kw):
|
def create(cls, **kw):
|
||||||
r = cls(**kw)
|
r = cls(**kw)
|
||||||
|
@ -2912,7 +2914,7 @@ class AdminAuditLog(Base):
|
||||||
):
|
):
|
||||||
cls.create(
|
cls.create(
|
||||||
admin_user_id=admin_user_id,
|
admin_user_id=admin_user_id,
|
||||||
action=cls.ACTION_MANUAL_UPGRADE,
|
action=AuditLogActionEnum.manual_upgrade,
|
||||||
model="User",
|
model="User",
|
||||||
model_id=user_id,
|
model_id=user_id,
|
||||||
data={
|
data={
|
||||||
|
@ -2925,7 +2927,7 @@ class AdminAuditLog(Base):
|
||||||
def extend_trial_1w(cls, admin_user_id: int, user_id: int, trial_end: arrow.Arrow):
|
def extend_trial_1w(cls, admin_user_id: int, user_id: int, trial_end: arrow.Arrow):
|
||||||
cls.create(
|
cls.create(
|
||||||
admin_user_id=admin_user_id,
|
admin_user_id=admin_user_id,
|
||||||
action=cls.ACTION_EXTEND_TRIAL,
|
action=AuditLogActionEnum.extend_trial,
|
||||||
model="User",
|
model="User",
|
||||||
model_id=user_id,
|
model_id=user_id,
|
||||||
data={"trial_end": trial_end.format(arrow.FORMAT_RFC3339)},
|
data={"trial_end": trial_end.format(arrow.FORMAT_RFC3339)},
|
||||||
|
@ -2937,7 +2939,7 @@ class AdminAuditLog(Base):
|
||||||
):
|
):
|
||||||
cls.create(
|
cls.create(
|
||||||
admin_user_id=admin_user_id,
|
admin_user_id=admin_user_id,
|
||||||
action=cls.ACTION_DISABLE_2FA,
|
action=AuditLogActionEnum.disable_2fa,
|
||||||
model="User",
|
model="User",
|
||||||
model_id=user_id,
|
model_id=user_id,
|
||||||
data={"had_otp": had_otp, "had_fido": had_fido},
|
data={"had_otp": had_otp, "had_fido": had_fido},
|
||||||
|
@ -2947,7 +2949,7 @@ class AdminAuditLog(Base):
|
||||||
def logged_as_user(cls, admin_user_id: int, user_id: int):
|
def logged_as_user(cls, admin_user_id: int, user_id: int):
|
||||||
cls.create(
|
cls.create(
|
||||||
admin_user_id=admin_user_id,
|
admin_user_id=admin_user_id,
|
||||||
action=cls.ACTION_LOGGED_AS_USER,
|
action=AuditLogActionEnum.logged_as_user,
|
||||||
model="User",
|
model="User",
|
||||||
model_id=user_id,
|
model_id=user_id,
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue