2 files changed, 20 insertions, 15 deletions
diff --git a/addons/auth_oauth/static/src/css/auth_oauth.css b/addons/auth_oauth/static/src/css/auth_oauth.css
index ed6130e3123..0489229042a 100644
--- a/addons/auth_oauth/static/src/css/auth_oauth.css
+++ b/addons/auth_oauth/static/src/css/auth_oauth.css
@@ -9,7 +9,6 @@
 }
 
 .openerp a.zocial.openerp {
-    float: right;
     border: 1px solid #222222;
     color: white;
     margin: 0;
diff --git a/addons/auth_oauth/static/src/js/auth_oauth.js b/addons/auth_oauth/static/src/js/auth_oauth.js
index 2aa66877d42..c24dab3d55a 100644
--- a/addons/auth_oauth/static/src/js/auth_oauth.js
+++ b/addons/auth_oauth/static/src/js/auth_oauth.js
@@ -35,27 +35,33 @@ openerp.auth_oauth = function(instance) {
         on_oauth_sign_in: function(ev) {
             ev.preventDefault();
             var index = $(ev.target).data('index');
-            var p = this.oauth_providers[index];
-            var ret = _.str.sprintf('%s//%s/auth_oauth/signin', location.protocol, location.host);
+            var provider = this.oauth_providers[index];
+            return this.do_oauth_sign_in(provider);
+        },
+        do_oauth_sign_in: function(provider) {
+            var return_url = _.str.sprintf('%s//%s/auth_oauth/signin', location.protocol, location.host);
             if (instance.session.debug) {
-                ret += '?debug';
+                return_url += '?debug';
             }
-            var dbname = self.$("form [name=db]").val();
-            var state_object = {
-                d: dbname,
-                p: p.id
-            };
-            var state = JSON.stringify(state_object);
+            var state = this._oauth_state(provider);
             var params = {
                 response_type: 'token',
-                client_id: p.client_id,
-                redirect_uri: ret,
-                scope: p.scope,
-                state: state,
+                client_id: provider.client_id,
+                redirect_uri: return_url,
+                scope: provider.scope,
+                state: JSON.stringify(state),
             };
-            var url = p.auth_endpoint + '?' + $.param(params);
+            var url = provider.auth_endpoint + '?' + $.param(params);
             window.location = url;
         },
+        _oauth_state: function(provider) {
+            // return the state object sent back with the redirected uri
+            var dbname = this.$("form [name=db]").val();
+            return {
+                d: dbname,
+                p: provider.id,
+            };
+        },
     });
 
 };