Skip to content

fix(sso): honour sso_custom_domain_redirect_enabled in /sso/config #849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
libingtong wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(sso): honour sso_custom_domain_redirect_enabled in /sso/config #849

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion backend/app/api/sso.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,16 @@ async def get_sso_config(sid: uuid.UUID, request: Request, db: Any = None):
from app.models.tenant import Tenant
tenant_result = await query_dao.execute(db, select(Tenant).where(Tenant.id == session.tenant_id))
tenant_obj = tenant_result.scalar_one_or_none()
public_base = await platform_service.get_tenant_sso_base_url(db, tenant_obj, request)
# get_tenant_sso_base_url() expects the caller to pre-resolve this flag
# (see its docstring); app/api/auth.py does so already. Without it the
# default of True is used and the admin-facing
# `sso_custom_domain_redirect_enabled` setting is silently ignored.
from app.dao import system_setting_dao

sso_redirect_enabled = await system_setting_dao.is_sso_custom_domain_redirect_enabled()
public_base = await platform_service.get_tenant_sso_base_url(
db, tenant_obj, request, sso_redirect_enabled=sso_redirect_enabled
)
else:
public_base = await platform_service.get_public_base_url(db, request)

Expand Down