Added soft deletes to all deletion functions and added deleted_at filters as required
This commit is contained in:
@@ -42,7 +42,7 @@ class ExternalAuthService:
|
||||
provider_type_str = provider_type.value if isinstance(provider_type, AuthMethodType) else provider_type
|
||||
|
||||
app_config = ApplicationProviderConfig.query.filter_by(
|
||||
provider_type=provider_type_str
|
||||
provider_type=provider_type_str, deleted_at=None
|
||||
).first()
|
||||
|
||||
if not app_config:
|
||||
@@ -64,6 +64,7 @@ class ExternalAuthService:
|
||||
org_override_obj = OrganizationProviderOverride.query.filter_by(
|
||||
organization_id=organization_id,
|
||||
provider_type=provider_type_str,
|
||||
deleted_at=None,
|
||||
).first()
|
||||
|
||||
if org_override_obj and not org_override_obj.is_enabled:
|
||||
|
||||
@@ -14,7 +14,7 @@ def create_app_provider_config(
|
||||
**kwargs,
|
||||
) -> ApplicationProviderConfig:
|
||||
existing = ApplicationProviderConfig.query.filter_by(
|
||||
provider_type=provider_type
|
||||
provider_type=provider_type, deleted_at=None
|
||||
).first()
|
||||
|
||||
if existing:
|
||||
@@ -51,7 +51,7 @@ def update_app_provider_config(
|
||||
**updates,
|
||||
) -> ApplicationProviderConfig:
|
||||
config = ApplicationProviderConfig.query.filter_by(
|
||||
provider_type=provider_type
|
||||
provider_type=provider_type, deleted_at=None
|
||||
).first()
|
||||
|
||||
if not config:
|
||||
@@ -90,7 +90,7 @@ def update_app_provider_config(
|
||||
|
||||
def get_app_provider_config(provider_type: str) -> ApplicationProviderConfig:
|
||||
config = ApplicationProviderConfig.query.filter_by(
|
||||
provider_type=provider_type
|
||||
provider_type=provider_type, deleted_at=None
|
||||
).first()
|
||||
|
||||
if not config:
|
||||
@@ -104,13 +104,13 @@ def get_app_provider_config(provider_type: str) -> ApplicationProviderConfig:
|
||||
|
||||
|
||||
def list_app_provider_configs() -> list:
|
||||
configs = ApplicationProviderConfig.query.all()
|
||||
configs = ApplicationProviderConfig.query.filter_by(deleted_at=None).all()
|
||||
return [config.to_dict() for config in configs]
|
||||
|
||||
|
||||
def delete_app_provider_config(provider_type: str) -> bool:
|
||||
config = ApplicationProviderConfig.query.filter_by(
|
||||
provider_type=provider_type
|
||||
provider_type=provider_type, deleted_at=None
|
||||
).first()
|
||||
|
||||
if not config:
|
||||
|
||||
@@ -219,10 +219,11 @@ def authenticate_with_provider(
|
||||
auth_method = AuthenticationMethod.query.filter_by(
|
||||
method_type=provider_type,
|
||||
provider_user_id=user_info["provider_user_id"],
|
||||
deleted_at=None,
|
||||
).first()
|
||||
|
||||
if not auth_method:
|
||||
existing_user = User.query.filter_by(email=user_info["email"]).first()
|
||||
existing_user = User.query.filter_by(email=user_info["email"], deleted_at=None).first()
|
||||
|
||||
if existing_user:
|
||||
AuditService.log_external_auth_login_failed(
|
||||
@@ -286,12 +287,13 @@ def unlink_provider(
|
||||
auth_method = AuthenticationMethod.query.filter_by(
|
||||
user_id=user_id,
|
||||
method_type=provider_type,
|
||||
deleted_at=None,
|
||||
).first()
|
||||
|
||||
if not auth_method:
|
||||
raise ExternalAuthError("Provider not linked", "PROVIDER_NOT_LINKED", 400)
|
||||
|
||||
other_methods = AuthenticationMethod.query.filter_by(user_id=user_id).count()
|
||||
other_methods = AuthenticationMethod.query.filter_by(user_id=user_id, deleted_at=None).count()
|
||||
if other_methods <= 1:
|
||||
raise ExternalAuthError(
|
||||
"Cannot unlink the last authentication method",
|
||||
|
||||
@@ -16,7 +16,7 @@ def create_org_provider_override(
|
||||
**kwargs,
|
||||
) -> OrganizationProviderOverride:
|
||||
app_config = ApplicationProviderConfig.query.filter_by(
|
||||
provider_type=provider_type
|
||||
provider_type=provider_type, deleted_at=None
|
||||
).first()
|
||||
|
||||
if not app_config:
|
||||
@@ -29,6 +29,7 @@ def create_org_provider_override(
|
||||
existing = OrganizationProviderOverride.query.filter_by(
|
||||
organization_id=organization_id,
|
||||
provider_type=provider_type,
|
||||
deleted_at=None,
|
||||
).first()
|
||||
|
||||
if existing:
|
||||
@@ -69,6 +70,7 @@ def update_org_provider_override(
|
||||
override = OrganizationProviderOverride.query.filter_by(
|
||||
organization_id=organization_id,
|
||||
provider_type=provider_type,
|
||||
deleted_at=None,
|
||||
).first()
|
||||
|
||||
if not override:
|
||||
@@ -110,6 +112,7 @@ def get_org_provider_override(
|
||||
override = OrganizationProviderOverride.query.filter_by(
|
||||
organization_id=organization_id,
|
||||
provider_type=provider_type,
|
||||
deleted_at=None,
|
||||
).first()
|
||||
|
||||
if not override:
|
||||
@@ -124,7 +127,7 @@ def get_org_provider_override(
|
||||
|
||||
def list_org_provider_overrides(organization_id: str) -> list:
|
||||
overrides = OrganizationProviderOverride.query.filter_by(
|
||||
organization_id=organization_id
|
||||
organization_id=organization_id, deleted_at=None
|
||||
).all()
|
||||
return [override.to_dict() for override in overrides]
|
||||
|
||||
@@ -133,6 +136,7 @@ def delete_org_provider_override(organization_id: str, provider_type: str) -> bo
|
||||
override = OrganizationProviderOverride.query.filter_by(
|
||||
organization_id=organization_id,
|
||||
provider_type=provider_type,
|
||||
deleted_at=None,
|
||||
).first()
|
||||
|
||||
if not override:
|
||||
|
||||
Reference in New Issue
Block a user