0001-improve-application-s-webservices-config-22064.patch

Josué Kouka, 26 mars 2018 17:38

Voir les différences: en ligne côte à côte

Subject: [PATCH] improve application's webservices config (#22064)

 mandayejs/applications/__init__.py | 46 ++++++++++++++++++++++++++++----------
 mandayejs/applications/views.py    |  4 ++--
 2 files changed, 36 insertions(+), 14 deletions(-)

     def app_web_services(request, path):
         app = get_app_settings()
         if hasattr(app, 'urlpatterns'):
             view, args, kwargs = resolve(request.path, urlconf=app)
         if hasattr(app, 'SITE_WEBSERVICES'):
             view, args, kwargs = resolve(request.path, urlconf=app.SITE_WEBSERVICES)
             return view(request, *args, **kwargs)
         raise Http404
-...
             return slugify(type(self).__name__)
     class AppWebservice(object):
         '''- endpoints = [
             {'foo': 'https://example.org/foo/'},
             {'bar': 'https://example.org/bar/'},
+        ]
         - urlpatterns = [
             url('user/(?P<username>\w+)/$', views.myapp.user_details, name='user-details'),
             url('user/(?P<username>\w+/books/$)', views.myapp.user_books, name='user-books'),
+        ]
         '''
         def __init__(self, endpoints=None, urlpatterns=None):
             self.endpoints = endpoints
             self.urlpatterns = urlpatterns
         def get_endpoint(self, name):
             for endpoint in self.endpoints:
                 if endpoint.get(name, None):
                     return endpoint[name]
             return None
     # Test App Settings
     class Test(AppSettings):
         SITE_LOGIN_PATH = '/'
-...
         SITE_FORCE_REDIRECT_LOCATOR = '.connectBox'
         SITE_WS_ENDPOINT = {
             'account_details': '/DEFAULT/Ermes/Services/ILSClient.svc/RetrieveAccount',
+        }
         urlpatterns = [
             url(
                 r'account/(?P<username>\w+)/$',
                 views.archimed_account_details,
                 name='archimed-account-details'),
+        ]
         SITE_WEBSERVICES = AppWebservice(
+            [
                 {'account_details': '/DEFAULT/Ermes/Services/ILSClient.svc/RetrieveAccount'},
                 {'login_url': '/DEFAULT/Ermes/Recherche/logon.svc/logon'}
             ],
+            [
                 url(r'account/(?P<username>\w+)/$', views.archimed_account_details,
                     name='archimed-account-details')
+            ]
+        )
         SITE_LOGOUT_LOCATOR = '.account_logoff'

             logger = logging.getLogger(__name__)
             app_settings = get_app_settings()
             ws_uri = request.build_absolute_uri(
                 app_settings.SITE_WS_ENDPOINT['account_details'])
                 app_settings.SITE_WEBSERVICES.get_endpoint('account_details'))
             # mellon truncates username to 30 characters
             # thus the passed username must be truncated to 30 characters
-...
                 return Response('User %s is not associated' % username, status=status.HTTP_404_NOT_FOUND)
             login_url = request.build_absolute_uri(
                 '/DEFAULT/Ermes/Recherche/logon.svc/logon')
                 app_settings.SITE_WEBSERVICES.get_endpoint('login_url'))
             with requests.Session() as session:
                 login_info = credentials.to_login_info(decrypt=True)
+    -

Projet

Général

Profil

Produits Entr'ouvert » Mandaye

0001-improve-application-s-webservices-config-22064.patch