hobo: add idp_url (& friends) variables even for IdP marked secondary (#30360)

This commit is contained in:
Frédéric Péters 2019-02-04 14:23:28 +01:00
parent ddc1437a96
commit 423c17a425
1 changed files with 9 additions and 3 deletions

View File

@ -395,8 +395,16 @@ class CmdCheckHobos(Command):
continue
api_secrets[domain] = self.shared_secret(current_service.get('secret_key'), service.get('secret_key'))
if service.get('service-id') == 'authentic':
variables['idp_url'] = service_url
variables['idp_account_url'] = service_url + 'accounts/'
variables['idp_api_url'] = service_url + 'api/'
variables['idp_registration_url'] = service_url + 'accounts/register/'
if service.get('secondary'):
continue
if service.get('service-id') == 'combo':
if service.get('template_name') == 'portal-agent':
variables['portal_agent_url'] = service_url
@ -407,9 +415,7 @@ class CmdCheckHobos(Command):
variables['portal_user_title'] = service.get('title')
config.set('options', 'theme_skeleton_url',
service.get('base_url') + '__skeleton__/')
if service.get('service-id') == 'authentic':
variables['idp_account_url'] = service_url + 'accounts/'
variables['idp_registration_url'] = service_url + 'accounts/register/'
if self.all_services.get('variables'):
for key, value in self.all_services.get('variables').items():
variables[key] = value