author | Laszlo Peter <laszlo.peter@oracle.com> |
Wed, 07 Sep 2016 14:48:42 -0700 | |
changeset 6856 | 356aeea98c39 |
permissions | -rw-r--r-- |
6856
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
1 |
Patch to prevent Horizon from redirecting to an non-existant logout |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
2 |
page. Fixed in upstream via Launchpad bug 1558917 and changeset |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
3 |
9399680106b4448c975b87a8b93f2188157a42ce. |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
4 |
|
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
5 |
commit 9399680106b4448c975b87a8b93f2188157a42ce |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
6 |
Author: Kenji Ishii <[email protected]> |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
7 |
Date: Fri Mar 18 14:37:13 2016 +0900 |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
8 |
|
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
9 |
Fix the issue which redirect to Not Found page |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
10 |
|
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
11 |
If a session is timeout and then a user request ajax request, |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
12 |
Horizon redirect to Not found page because the url is incorrect. |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
13 |
This patch fix it in the correct url. |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
14 |
|
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
15 |
Change-Id: I25b9e07b4f97594d05b0cdae931af9f142a18168 |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
16 |
Closes-bug: #1558917 |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
17 |
|
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
18 |
diff --git a/horizon/static/framework/framework.module.js b/horizon/static/framework/framework.module.js |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
19 |
index 7a06bb0..fd6ba43 100644 |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
20 |
--- a/horizon/static/framework/framework.module.js |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
21 |
+++ b/horizon/static/framework/framework.module.js |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
22 |
@@ -64,7 +64,8 @@ |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
23 |
return { |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
24 |
responseError: function (error) { |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
25 |
if (error.status === 401) { |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
26 |
- $windowProvider.$get().location.replace('/auth/logout'); |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
27 |
+ var $window = $windowProvider.$get(); |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
28 |
+ $window.location.replace($window.WEBROOT + 'auth/logout'); |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
29 |
} |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
30 |
return $q.reject(error); |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
31 |
} |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
32 |
diff --git a/horizon/static/framework/framework.module.spec.js b/horizon/static/framework/framework.module.spec.js |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
33 |
index d12f76a..2028cd2 100644 |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
34 |
--- a/horizon/static/framework/framework.module.spec.js |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
35 |
+++ b/horizon/static/framework/framework.module.spec.js |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
36 |
@@ -36,11 +36,11 @@ |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
37 |
|
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
38 |
describe('when unauthorized', function() { |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
39 |
it('should redirect to /auth/logout', inject(function($http, $httpBackend, $window) { |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
40 |
- |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
41 |
+ $window.WEBROOT = '/dashboard/'; |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
42 |
$httpBackend.when('GET', '/api').respond(401, ''); |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
43 |
|
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
44 |
$http.get('/api').error(function() { |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
45 |
- expect($window.location.replace).toHaveBeenCalledWith('/auth/logout'); |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
46 |
+ expect($window.location.replace).toHaveBeenCalledWith('/dashboard/auth/logout'); |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
47 |
}); |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
48 |
$httpBackend.flush(); |
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
49 |
})); |