# HG changeset patch
# User paulb
# Date 1132165627 0
# Node ID b0e8a3b6a06f75cf7721cb32582cb45399baf8d2
# Parent  eb9d8fab5631f5095e201e3e38ce818f4eb89c90
[project @ 2005-11-16 18:27:07 by paulb]
Updated resources to use the redirect transaction method.

diff -r eb9d8fab5631 -r b0e8a3b6a06f WebStack/Resources/Login.py
--- a/WebStack/Resources/Login.py	Wed Nov 16 18:26:51 2005 +0000
+++ b/WebStack/Resources/Login.py	Wed Nov 16 18:27:07 2005 +0000
@@ -88,7 +88,7 @@
         if fields_body.has_key("login"):
             if self.authenticator.authenticate(trans):
                 self._redirect(trans, app, path, qs)
-                return
+                # The above method does not return.
 
         # Otherwise, show the login form.
 
@@ -101,13 +101,13 @@
         details.
         """
 
-        if self.use_redirect:
-            trans.set_header_value("Location", app + trans.encode_path(path, self.urlencoding) + qs)
-            trans.set_response_code(302) # was 307
-
         # Show the success page anyway.
 
         self._show_success(trans, app, path, qs)
+        if self.use_redirect:
+            trans.redirect(app + trans.encode_path(path, self.urlencoding) + qs)
+        else:
+            raise WebStack.Generic.EndOfResponse
 
     def _show_login(self, trans, app, path, qs):
 
diff -r eb9d8fab5631 -r b0e8a3b6a06f WebStack/Resources/LoginRedirect.py
--- a/WebStack/Resources/LoginRedirect.py	Wed Nov 16 18:26:51 2005 +0000
+++ b/WebStack/Resources/LoginRedirect.py	Wed Nov 16 18:27:07 2005 +0000
@@ -116,14 +116,12 @@
             qs = trans.get_query_string()
             if qs:
                 qs = "?" + qs
-
-            trans.set_header_value("Location", "%s?app=%s&path=%s&qs=%s" % (
+            trans.redirect("%s?app=%s&path=%s&qs=%s" % (
                 self.login_url,
                 trans.encode_path(self.app_url, self.urlencoding),
                 trans.encode_path(path, self.urlencoding),
                 trans.encode_path(qs, self.urlencoding))
-            )
-            trans.set_response_code(302) # was 307
+                )
 
     def _show_logout(self, trans, redirect):
 
diff -r eb9d8fab5631 -r b0e8a3b6a06f WebStack/Resources/ResourceMap.py
--- a/WebStack/Resources/ResourceMap.py	Wed Nov 16 18:26:51 2005 +0000
+++ b/WebStack/Resources/ResourceMap.py	Wed Nov 16 18:27:07 2005 +0000
@@ -163,9 +163,6 @@
         query_string = trans.get_query_string()
         if query_string:
             query_string = "?" + query_string
-
-        trans.set_response_code(302)
-        trans.set_header_value("Location", trans.encode_path(path_without_query, self.urlencoding) + "/" + query_string)
-        raise WebStack.Generic.EndOfResponse
+        trans.redirect(trans.encode_path(path_without_query, self.urlencoding) + "/" + query_string)
 
 # vim: tabstop=4 expandtab shiftwidth=4