[open-ils-commits] r9540 - in branches/acq-experiment: . Open-ILS/web/js/dojo/openils

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-05-08 17:31:28 -0400 (Thu, 08 May 2008)
New Revision: 9540

Modified:
   branches/acq-experiment/
   branches/acq-experiment/Open-ILS/web/js/dojo/openils/User.js
Log:
Merged revisions 9539 via svnmerge from 
svn://svn.open-ils.org/ILS/trunk

........
  r9539 | erickson | 2008-05-08 17:31:07 -0400 (Thu, 08 May 2008) | 1 line
  
  if optional authcookie is set for the user, the login authtoken will be stored at that cookie
........



Property changes on: branches/acq-experiment
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk:1-9535
   + /trunk:1-9539

Modified: branches/acq-experiment/Open-ILS/web/js/dojo/openils/User.js
===================================================================
--- branches/acq-experiment/Open-ILS/web/js/dojo/openils/User.js	2008-05-08 21:31:07 UTC (rev 9539)
+++ branches/acq-experiment/Open-ILS/web/js/dojo/openils/User.js	2008-05-08 21:31:28 UTC (rev 9540)
@@ -41,6 +41,7 @@
             this.authtime = kwargs.authtime || openils.User.authtime;
             this.login_type = kwargs.login_type;
             this.location = kwargs.location;
+            this.authcookie = kwargs.authcookie || openils.User.authcookie;
 
             if (this.authtoken) this.getBySession();
             else if (this.id && this.authtoken) this.user = this.getById( this.id );
@@ -115,6 +116,10 @@
                     _u.authtime = data.payload.authtime;
 					if (!openils.User.authtime) openils.User.authtime = _u.authtime;
                     _u.getBySession(onComplete);
+                    if(_u.authcookie) {
+                        dojo.require('dojo.cookie');
+                        dojo.cookie(_u.authcookie, _u.authtoken);
+                    }
                 }
                 authReq.send();
             }
@@ -151,6 +156,11 @@
             if (!openils.User.authtoken) openils.User.authtoken = _u.authtoken;
             _u.authtime = data.payload.authtime;
             if (!openils.User.authtime) openils.User.authtime = _u.authtime;
+
+            if(_u.authcookie) {
+                dojo.require('dojo.cookie');
+                dojo.cookie(_u.authcookie, _u.authtoken);
+            }
         },
 
     
@@ -241,7 +251,7 @@
 	openils.User.user = null;
 	openils.User.authtoken = null;
 	openils.User.authtime = null;
-
+    openils.User.authcookie = null;
 }