odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[imp] modified login to only depend on the session_id to restore a session, this will make some bugs to user_context and password disapear 

bzr revid: nicolas.vanhoren@openerp.com-20110913102320-dhw4p91ohyk438d1
This commit is contained in:
niv-openerp 2011-09-13 12:23:20 +02:00
parent 10a8ef00cd
commit 71e7470847
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/web/controllers/main.py
View File

@ -299,6 +299,14 @@ class Session(openerpweb.Controller):
"context": ctx
}
@openerpweb.jsonrequest
def get_session_info(self, req):
ctx = req.session.get_context()
return {
"uid": req.session._uid,
"context": ctx,
"db": req.session._db
}
@openerpweb.jsonrequest
def change_password (self,req,fields):
old_password, new_password,confirm_password = operator.itemgetter('old_pwd', 'new_password','confirm_pwd')(
dict(map(operator.itemgetter('name', 'value'), fields)))

35
addons/web/static/src/js/core.js
View File

@ -349,9 +349,6 @@ openerp.web.Session = openerp.web.CallbackEnabled.extend( /** @lends openerp.web
this.port = (port == undefined) ? location.port : port;
this.rpc_mode = (server == location.hostname) ? "ajax" : "jsonp";
this.debug = (window.location.search.indexOf('?debug') !== -1);
this.db = "";
this.login = "";
this.password = "";
this.user_context= {};
this.uid = false;
this.session_id = false;
@ -474,14 +471,12 @@ openerp.web.Session = openerp.web.CallbackEnabled.extend( /** @lends openerp.web
},
session_login: function(db, login, password, success_callback) {
var self = this;
this.db = db;
this.login = login;
this.password = password;
var params = { db: this.db, login: this.login, password: this.password };
var params = { db: db, login: login, password: password };
this.rpc("/web/session/login", params, function(result) {
self.session_id = result.session_id;
self.uid = result.uid;
self.user_context = result.context;
self.db = result.db;
self.session_save();
self.on_session_valid();
return true;
@ -494,17 +489,17 @@ openerp.web.Session = openerp.web.CallbackEnabled.extend( /** @lends openerp.web
* Reloads uid and session_id from local storage, if they exist
*/
session_restore: function () {
this.uid = this.get_cookie('uid');
var self = this;
this.session_id = this.get_cookie('session_id');
this.db = this.get_cookie('db');
this.login = this.get_cookie('login');
this.user_context = this.get_cookie("user_context");
// we should do an rpc to confirm that this session_id is valid and if it is retrieve the information about db and login
// then call on_session_valid
if (this.uid)
this.on_session_valid();
else
this.on_session_invalid();
return this.rpc("/web/session/get_session_info", {}).then(function(result) {
self.uid = result.uid;
self.user_context = result.context;
self.db = result.db;
if (self.uid)
self.on_session_valid();
else
self.on_session_invalid();
});
},
/**
* Saves the session id and uid locally
@ -512,19 +507,13 @@ openerp.web.Session = openerp.web.CallbackEnabled.extend( /** @lends openerp.web
session_save: function () {
this.set_cookie('uid', this.uid);
this.set_cookie('session_id', this.session_id);
this.set_cookie('db', this.db);
this.set_cookie('login', this.login);
this.set_cookie('user_context', this.user_context);
},
logout: function() {
delete this.uid;
delete this.session_id;
delete this.db;
delete this.login;
this.set_cookie('uid', '');
this.set_cookie('session_id', '');
this.set_cookie('db', '');
this.set_cookie('login', '');
this.on_session_invalid(function() {});
},
/**