Merge lp:~gary/charms/precise/juju-gui/authtoken2 into lp:~juju-gui/charms/precise/juju-gui/trunk
Proposed by
Gary Poster
Status: | Merged |
---|---|
Merged at revision: | 137 |
Proposed branch: | lp:~gary/charms/precise/juju-gui/authtoken2 |
Merge into: | lp:~juju-gui/charms/precise/juju-gui/trunk |
Prerequisite: | lp:~gary/charms/precise/juju-gui/authtoken1 |
Diff against target: |
170 lines (+40/-9) 7 files modified
server/guiserver/apps.py (+3/-0) server/guiserver/auth.py (+3/-1) server/guiserver/handlers.py (+6/-4) server/guiserver/tests/test_apps.py (+7/-0) server/guiserver/tests/test_auth.py (+6/-1) server/guiserver/tests/test_handlers.py (+9/-3) server/guiserver/tests/test_utils.py (+6/-0) |
To merge this branch: | bzr merge lp:~gary/charms/precise/juju-gui/authtoken2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
charmers | Pending | ||
Review via email: mp+196351@code.launchpad.net |
Description of the change
No-op integration of AuthenticationT
This branch simply hooks up the AuthenticationT
To post a comment you must log in.
Reviewers: mp+196351_ code.launchpad. net,
Message:
Please take a look.
Description: okenHandler
No-op integration of AuthenticationT
This branch simply hooks up the AuthenticationT okenHandler everywhere it
needs to be. It isn't actually utilized yet. That will be the next
branch (which has been sketched but will not arrive within the next 30
minutes :-) ). No QA.
https:/ /code.launchpad .net/~gary/ charms/ precise/ juju-gui/ authtoken2/ +merge/ 196351
Requires: /code.launchpad .net/~gary/ charms/ precise/ juju-gui/ authtoken1/ +merge/ 196347
https:/
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/30980044/
Affected files (+42, -9 lines): guiserver/ apps.py guiserver/ auth.py guiserver/ handlers. py guiserver/ tests/test_ apps.py guiserver/ tests/test_ auth.py guiserver/ tests/test_ handlers. py guiserver/ tests/test_ utils.py
A [revision details]
M server/
M server/
M server/
M server/
M server/
M server/
M server/
Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>
Index: server/ guiserver/ apps.py guiserver/ apps.py' guiserver/ apps.py 2013-11-14 14:08:23 +0000 guiserver/ apps.py 2013-11-22 15:53:02 +0000 handlers = [] tionTokenHandle r()
websocket_ handler_ options = {
'apiurl' : options.apiurl,
'auth_backend' : auth.get_ backend( options. apiversion) ,
'deployer' : deployer,
server_ handlers. append(
=== modified file 'server/
--- server/
+++ server/
@@ -44,6 +44,7 @@
# Set up handlers.
server_
if not options.sandbox:
+ tokens = auth.Authentica
# The Juju API backend url.
@@ -51,6 +52,8 @@
# The Juju deployer to use for importing bundles.
+ # The tokens collection for authentication token requests.
+ 'tokens': tokens,
}
# Handle WebSocket connections.
Index: server/ guiserver/ auth.py guiserver/ auth.py' guiserver/ auth.py 2013-11-22 18:06:17 +0000 guiserver/ auth.py 2013-11-22 18:10:50 +0000
=== modified file 'server/
--- server/
+++ server/
@@ -71,9 +71,11 @@
user logs out, there is no need to handle the log out process.
"""
- def __init__(self, user, backend):
self. _user = user
self. _backend = backend
self. _request_ id = None
+ def __init__(self, user, backend, tokens, write_message):
+ self._tokens = tokens
+ self._write_message = write_message
def in_progress(self):
Index: server/ guiserver/ handlers. py guiserver/ handlers. py' guiserver/ handlers. py 2013-11-07 18:04:32 +0000 guiserver/ handlers. py 2013-11-22 15:53:02 +0000
=== modified file 'server/
--- server/
+++ server/
@@ -69,7 +69,7 @@
"""
@ gen.coroutine
"""Initializ e the WebSocket server.
- def initialize(self, apiurl, auth_backend, deployer, io_loop=None):
+ def initialize(self, apiurl, auth_backend, deployer, tokens,
io_loop=None):
...