Revision 484a79a1 snf-astakos-app/astakos/im/settings.py

b/snf-astakos-app/astakos/im/settings.py
1 1
from django.conf import settings
2 2
from synnefo_branding import settings as synnefo_settings
3 3
from synnefo.lib import parse_base_url
4
from astakosclient import astakos_services
5
from synnefo.util.keypath import get_path
6

  
4 7

  
5 8
BASE_URL = getattr(settings, 'ASTAKOS_BASE_URL',
6 9
                   'https://accounts.example.synnefo.org')
......
8 11

  
9 12
BASE_HOST, BASE_PATH = parse_base_url(BASE_URL)
10 13

  
11
ACCOUNTS_PREFIX = getattr(settings, 'ASTAKOS_ACCOUNTS_PREFIX', 'accounts')
12
VIEWS_PREFIX = getattr(settings, 'ASTAKOS_VIEWS_PREFIX', 'im')
13
KEYSTONE_PREFIX = getattr(settings, 'ASTAKOS_ACCOUNTS_PREFIX', 'keystone')
14
ACCOUNTS_PREFIX = get_path(astakos_services, 'astakos_account.prefix')
15
VIEWS_PREFIX = get_path(astakos_services, 'astakos_ui.prefix')
16
KEYSTONE_PREFIX = get_path(astakos_services, 'astakos_keystone.prefix')
14 17

  
15 18
# Set the expiration time of newly created auth tokens
16 19
# to be this many hours after their creation time.
......
131 134
                                       'ASTAKOS_SHIBBOLETH_REQUIRE_NAME_INFO',
132 135
                                       False)
133 136

  
134
ACTIVATION_REDIRECT_URL = getattr(settings,
135
                                  'ASTAKOS_ACTIVATION_REDIRECT_URL',
136
                                  "/im/landing")
137
default_redirect_url = join_urls(ASTAKOS_BASE_URL, VIEWS_PREFIX, "landing")
138
ACTIVATION_REDIRECT_URL = getattr(settings, 'ASTAKOS_ACTIVATION_REDIRECT_URL',
139
                                  default_redirect_url)
137 140

  
138 141
# If true, this enables a ui compatibility layer for the introduction of UUIDs
139 142
# in identity management. WARNING: Setting to True will break your installation.
......
157 160
LINKEDIN_SECRET = getattr(settings, 'ASTAKOS_LINKEDIN_SECRET', '')
158 161

  
159 162
# URL to redirect the user after successful login when no next parameter is set
160
LOGIN_SUCCESS_URL = getattr(settings, 'ASTAKOS_LOGIN_SUCCESS_URL','/im/landing')
163
default_success_url = join_urls(ASTAKOS_BASE_URL, VIEWS_PREFIX, "landing")
164
LOGIN_SUCCESS_URL = getattr(settings, 'ASTAKOS_LOGIN_SUCCESS_URL',
165
                            default_redirect_url)
161 166

  
162 167
# Whether or not to display projects in astakos menu
163 168
PROJECTS_VISIBLE = getattr(settings, 'ASTAKOS_PROJECTS_VISIBLE', False)

Also available in: Unified diff