Commit: 97a17d6e4b639861e36668e548ca70712876f5df - allura (git)

allura

Commit MetaInfo

• Revision: 97a17d6e4b639861e36668e548ca70712876f5df (tree)
• Time: 2010-06-03 03:52:43
• Author: Wolf <wolf@geek...>
• Commiter: Wolf

Log Message

[#483] logout must include sfx logout

Change Summary

• modified: pyforge/pyforge/controllers/auth.py
• modified: pyforge/pyforge/lib/app_globals.py
• modified: pyforge/sandbox.ini

Incremental Difference

--- a/pyforge/pyforge/controllers/auth.py
+++ b/pyforge/pyforge/controllers/auth.py
@@ -171,7 +171,10 @@ class AuthController(object):
     @expose()
     def logout(self):
         plugin.AuthenticationProvider.get(request).logout()
-        redirect('/')
+        if config.get('auth.method', 'local') == 'sfx':
+            redirect(g.logout_url)
+        else:
+            redirect('/')
 
     @expose()
     def do_login(self, came_from=None, **kw):

--- a/pyforge/pyforge/lib/app_globals.py
+++ b/pyforge/pyforge/lib/app_globals.py
@@ -53,8 +53,9 @@ class Globals(object):
             self.solr = None
         self.use_queue = asbool(config.get('use_queue', False))
 
-        # Load login url
-        self.login_url = config.get('auth.login_url') # only used for SFX logins
+        # Load login/logout urls; only used for SFX logins
+        self.login_url = config.get('auth.login_url')
+        self.logout_url = config.get('auth.logout_url')
 
         # Setup RabbitMQ
         if asbool(config.get('amqp.mock')):

--- a/pyforge/sandbox.ini
+++ b/pyforge/sandbox.ini
@@ -31,6 +31,7 @@ beaker.session.validate_key = 714bfe3612c42390726f
 
 auth.method = sfx
 auth.login_url = /account/login.php
+auth.logout_url = /account/logout.php
 auth.sys_session_db_database=
 auth.sys_session_db_host=
 auth.sys_session_db_username=