Replace get_path with dict indexing

[pithos-web-client] / snf-pithos-webclient / pithos_webclient / settings.py

diff --git a/snf-pithos-webclient/pithos_webclient/settings.py b/snf-pithos-webclient/pithos_webclient/settings.py
index c0f3208..7e75e8d 100644 (file)
--- a/snf-pithos-webclient/pithos_webclient/settings.py
+++ b/snf-pithos-webclient/pithos_webclient/settings.py
@@ -31,17 +31,55 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
+import pithos.api.settings as pithos_settings
+
+from pithos.api.settings import LazyAstakosUrl
 from django.conf import settings
+from synnefo.lib import join_urls, parse_base_url
+from pithos.api.services import pithos_services as vanilla_pithos_services
+from synnefo.lib.services import get_public_endpoint, fill_endpoints
+
+from copy import deepcopy
+
+# --------------------------------------------------------------------
+# Process Pithos settings
+
+# This code is shared between snf-pithos-app and snf-pithos-webclient since
+# they share the PITHOS_ settings prefix for most of their settings.
+BASE_URL = getattr(settings, 'PITHOS_BASE_URL',
+                   "https://object-store.example.synnefo.org/pithos/")
+
+BASE_HOST, BASE_PATH = parse_base_url(BASE_URL)
+
+pithos_services = deepcopy(vanilla_pithos_services)
+fill_endpoints(pithos_services, BASE_URL)
+PITHOS_PREFIX = pithos_services['pithos_object-store']['prefix']
+PUBLIC_PREFIX = pithos_services['pithos_public']['prefix']
+UI_PREFIX = pithos_services['pithos_ui']['prefix']
+
+if not BASE_PATH.startswith("/"):
+    BASE_PATH = "/" + BASE_PATH
+
+PITHOS_URL = get_public_endpoint(pithos_services, 'object-store', 'v1')
+PITHOS_UI_URL = get_public_endpoint(pithos_services, 'pithos_ui', '')
 
-# !!!!!ATTENTION!!!!!
-# loginUrl MUST end at "next=". You should not give the value of the next
-# parameter. It will be determined automatically
-LOGIN_URL = getattr(settings, 'PITHOS_UI_LOGIN_URL',
-                    'https://accounts.synnefo.org/astakos/im/login?next=')
-FEEDBACK_URL = getattr(settings, 'PITHOS_UI_FEEDBACK_URL',
-                       'https://accounts.synnefo.org/astakos/im/feedback')
 AUTH_COOKIE_NAME = getattr(settings, 'PITHOS_UI_AUTH_COOKIE_NAME',
                            '_pithos2_a')
-CLOUDBAR_ACTIVE_SERVICE = getattr(settings,
-                                  'PITHOS_UI_CLOUDBAR_ACTIVE_SERVICE',
-                                  'pithos')
+
+CLOUDBAR_ACTIVE_SERVICE = getattr(
+    settings,
+    'PITHOS_UI_CLOUDBAR_ACTIVE_SERVICE',
+    'pithos')
+
+
+# --------------------------------------------------------------------
+# Process Astakos settings
+
+ASTAKOS_ACCOUNT_PROXY_PATH = join_urls(
+    '/', pithos_settings.ASTAKOS_ACCOUNT_PROXY_PATH)
+ASTAKOS_UI_PROXY_PATH = join_urls(
+    '/', pithos_settings.ASTAKOS_UI_PROXY_PATH)
+
+USER_CATALOG_URL = join_urls(ASTAKOS_ACCOUNT_PROXY_PATH, 'user_catalogs')
+FEEDBACK_URL = join_urls(ASTAKOS_ACCOUNT_PROXY_PATH, 'feedback')
+LOGIN_URL = join_urls(ASTAKOS_UI_PROXY_PATH, 'login?next=')