oauth generic with buttons from zocial

bzr revid: al@openerp.com-20120815224708-rcge3914klkwrw6u

1 files changed, 5 insertions, 2 deletions

diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py
index a3f69954812..28f550b4bda 100644
--- a/addons/auth_oauth/controllers/main.py
+++ b/addons/auth_oauth/controllers/main.py
@@ -1,5 +1,6 @@
 import logging
 
+import simplejson
 import werkzeug.urls
 import werkzeug.utils
 
@@ -22,12 +23,14 @@ class OAuthController(openerpweb.Controller):
 
     @openerpweb.httprequest
     def signin(self, req, **kw):
-        dbname = kw.get("state")
+        state = simplejson.loads(kw['state'])
+        dbname = state['d']
+        provider = state['p']
         registry = openerp.modules.registry.RegistryManager.get(dbname)
         with registry.cursor() as cr:
             try:
                 u = registry.get('res.users')
-                credentials = u.auth_oauth(cr, 1, {}, kw)
+                credentials = u.auth_oauth(cr, 1, provider, kw)
                 cr.commit()
                 return openerp.addons.web.controllers.main.login_and_redirect(req, *credentials)
             except AttributeError: