Merge "support cancel operation while signing in"

diff --git a/utils/test/testapi/3rd_party/static/testapi-ui/shared/alerts/alertModalFactory.js b/utils/test/testapi/3rd_party/static/testapi-ui/shared/alerts/alertModalFactory.js
index 3ce76c9..929f543 100644 (file)
--- a/utils/test/testapi/3rd_party/static/testapi-ui/shared/alerts/alertModalFactory.js
+++ b/utils/test/testapi/3rd_party/static/testapi-ui/shared/alerts/alertModalFactory.js
@@ -28,7 +28,7 @@
     function raiseAlert($uibModal) {
         return function(mode, title, text) {
             $uibModal.open({
-                templateUrl: '/shared/alerts/alertModal.html',
+                templateUrl: 'testapi-ui/shared/alerts/alertModal.html',
                 controller: 'RaiseAlertModalController as alert',
                 backdrop: true,
                 keyboard: true,

diff --git a/utils/test/testapi/opnfv_testapi/router/url_mappings.py b/utils/test/testapi/opnfv_testapi/router/url_mappings.py
index aea85a4..a2312de 100644 (file)
--- a/utils/test/testapi/opnfv_testapi/router/url_mappings.py
+++ b/utils/test/testapi/opnfv_testapi/router/url_mappings.py
@@ -55,7 +55,7 @@ mappings = [
     (r"/api/v1/scenarios/([^/]+)", scenario_handlers.ScenarioGURHandler),
 
     # static path
-    (r'/(.*\.(css|png|gif|js|html|json|map))',
+    (r'/(.*\.(css|png|gif|js|html|json|map|woff2|woff|ttf))',
      tornado.web.StaticFileHandler,
      {'path': config.Config().static_path}),
 

diff --git a/utils/test/testapi/opnfv_testapi/ui/auth/sign.py b/utils/test/testapi/opnfv_testapi/ui/auth/sign.py
index 7319084..6a9d94e 100644 (file)
--- a/utils/test/testapi/opnfv_testapi/ui/auth/sign.py
+++ b/utils/test/testapi/opnfv_testapi/ui/auth/sign.py
@@ -32,6 +32,9 @@ class SigninHandler(base.BaseHandler):
 
 class SigninReturnHandler(base.BaseHandler):
     def get(self):
+        if self.get_query_argument(const.OPENID_MODE) == 'cancel':
+            self._auth_failure('Authentication canceled.')
+
         openid = self.get_query_argument(const.OPENID_CLAIMED_ID)
         user_info = {
             'openid': openid,
@@ -44,6 +47,12 @@ class SigninReturnHandler(base.BaseHandler):
             self.set_secure_cookie('openid', openid)
         self.redirect(url=CONF.ui_url)
 
+    def _auth_failure(self, message):
+        params = {'message': message}
+        url = parse.urljoin(CONF.ui_url,
+                            '/#/auth_failure?' + parse.urlencode(params))
+        self.redirect(url)
+
 
 class SignoutHandler(base.BaseHandler):
     def get(self):