Changeset 10405

Timestamp:

5 Jul 2013, 10:38:08 (11 years ago)

Author:

uli

Message:

Change set_session_cookie API to be more consistent with other funcs. Minor restructuring.

Location:

main/waeup.cas/trunk/waeup/cas

Files:

• server.py (modified) (3 diffs)
• tests/test_server.py (modified) (1 diff)

main/waeup.cas/trunk/waeup/cas/server.py

@@ -87 +87 @@
 
 
-def set_session_cookie(response, db):
+def set_session_cookie(db, response):
     """Create a session cookie (ticket granting cookie) on `response`.
 
@@ -165 +165 @@
     resp = Response(html)
     if not sso:
-        resp = set_session_cookie(resp, db)
+        resp = set_session_cookie(db, resp)
     return resp
 
@@ -212 +212 @@
         valid_lt = check_login_ticket(self.db, req.POST.get('lt'))
         tgc = check_session_cookie(self.db, req.cookies.get('cas-tgc', None))
-        if username and password and valid_lt or tgc:
+        if tgc:
+            if service:
+                return login_redirect_service(self.db, service)
+            else:
+                return login_success_no_service(
+                    self.db, 'You logged in already.', True)
+        if username and password and valid_lt:
             # act as credentials acceptor
-            if tgc:
-                cred_ok, reason = True, ''
-                if not service:
-                    msg = 'You logged in already.'
-            else:
-                cred_ok, reason = self.auth.check_credentials(
-                    username, password)
+            cred_ok, reason = self.auth.check_credentials(
+                username, password)
             if cred_ok:
                 if service is None:
                     # show logged-in screen
-                    sso = (tgc is not None)
-                    return login_success_no_service(self.db, msg, sso)
+                    return login_success_no_service(self.db, msg, False)
                 else:
                     # safely redirect to service given

main/waeup.cas/trunk/waeup/cas/tests/test_server.py

@@ -289 +289 @@
         # make sure we can add session cookies to responses
         db = DB('sqlite:///')
-        resp = set_session_cookie(Response(), db)
+        resp = set_session_cookie(db, Response())
         assert 'Set-Cookie' in resp.headers
         cookie = resp.headers['Set-Cookie']