diff options
| author |   SerenaFeng <feng.xiaowei@zte.com.cn> | 2017-05-19 16:24:45 +0800 |
|---|---|---|
| committer | SerenaFeng <feng.xiaowei@zte.com.cn> | 2017-05-20 15:35:51 +0800 |
| commit | ff3b3116de42dbd63fe8952700de7fa2a7134502 (patch) | |
| tree | 343eb46f8c15f15fa1eb4371980b2cc8b97b0822 | |
| parent | 94fd99430ff0c13803fea0f464d5175194e1c32e (diff) | |
support cancel operation while signing in
support the cancel operation in the
https://openstackid.org/accounts/user/consent
Change-Id: I06a1f130a3115774f2e88fc25dad522a7cf53e36
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
| -rw-r--r-- | testapi/3rd_party/static/testapi-ui/shared/alerts/alertModalFactory.js | 2 | ||||
| -rw-r--r-- | testapi/opnfv_testapi/router/url_mappings.py | 2 | ||||
| -rw-r--r-- | testapi/opnfv_testapi/ui/auth/sign.py | 9 |
3 files changed, 11 insertions, 2 deletions
diff --git a/testapi/3rd_party/static/testapi-ui/shared/alerts/alertModalFactory.js b/testapi/3rd_party/static/testapi-ui/shared/alerts/alertModalFactory.js index 3ce76c9..929f543 100644 --- a/testapi/3rd_party/static/testapi-ui/shared/alerts/alertModalFactory.js +++ b/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/testapi/opnfv_testapi/router/url_mappings.py b/testapi/opnfv_testapi/router/url_mappings.py index aea85a4..a2312de 100644 --- a/testapi/opnfv_testapi/router/url_mappings.py +++ b/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/testapi/opnfv_testapi/ui/auth/sign.py b/testapi/opnfv_testapi/ui/auth/sign.py index 7319084..6a9d94e 100644 --- a/testapi/opnfv_testapi/ui/auth/sign.py +++ b/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): |