diff --git a/addons/auth_oauth/__openerp__.py b/addons/auth_oauth/__openerp__.py index 76f15687eb9..64068fa9b5e 100644 --- a/addons/auth_oauth/__openerp__.py +++ b/addons/auth_oauth/__openerp__.py @@ -31,7 +31,7 @@ Allow users to login through OAuth2 Provider. 'author': 'OpenERP s.a.', 'maintainer': 'OpenERP s.a.', 'website': 'http://www.openerp.com', - 'depends': ['base', 'web', 'base_setup'], + 'depends': ['base', 'web', 'base_setup', 'auth_signup'], 'data': [ 'res_users.xml', 'auth_oauth_data.xml', diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py index e660fd8363b..2672d95ccde 100644 --- a/addons/auth_oauth/controllers/main.py +++ b/addons/auth_oauth/controllers/main.py @@ -61,10 +61,14 @@ class OAuthLogin(openerp.addons.web.controllers.main.Home): return providers def get_state(self, provider): - return dict( + state = dict( d=request.session.db, p=provider['id'] ) + token = request.params.get('token') + if token: + state['t'] = token + return state @http.route() def web_login(self, *args, **kw): @@ -88,6 +92,26 @@ class OAuthLogin(openerp.addons.web.controllers.main.Home): return response + @http.route() + def web_auth_signup(self, *args, **kw): + providers = self.list_providers() + if len(providers) == 1: + werkzeug.exceptions.abort(werkzeug.utils.redirect(providers[0]['auth_link'], 303)) + response = super(OAuthLogin, self).web_auth_signup(*args, **kw) + if isinstance(response, LazyResponse): + response.params['values'].update(providers=providers) + return response + + @http.route() + def web_auth_reset_password(self, *args, **kw): + providers = self.list_providers() + if len(providers) == 1: + werkzeug.exceptions.abort(werkzeug.utils.redirect(providers[0]['auth_link'], 303)) + response = super(OAuthLogin, self).web_auth_reset_password(*args, **kw) + if isinstance(response, LazyResponse): + response.params['values'].update(providers=providers) + return response + class OAuthController(http.Controller): @http.route('/auth_oauth/signin', type='http', auth='none') diff --git a/addons/auth_oauth/res_users.py b/addons/auth_oauth/res_users.py index f58473b24a4..8d57a23f702 100644 --- a/addons/auth_oauth/res_users.py +++ b/addons/auth_oauth/res_users.py @@ -6,6 +6,7 @@ import urllib2 import simplejson import openerp +from openerp.addons.auth_signup.res_users import SignupError from openerp.osv import osv, fields from openerp import SUPERUSER_ID @@ -55,14 +56,37 @@ class res_users(osv.Model): This method can be overridden to add alternative signin methods. """ - oauth_uid = validation['user_id'] - user_ids = self.search(cr, uid, [("oauth_uid", "=", oauth_uid), ('oauth_provider_id', '=', provider)]) - if not user_ids: - raise openerp.exceptions.AccessDenied() - assert len(user_ids) == 1 - user = self.browse(cr, uid, user_ids[0], context=context) - user.write({'oauth_access_token': params['access_token']}) - return user.login + try: + oauth_uid = validation['user_id'] + user_ids = self.search(cr, uid, [("oauth_uid", "=", oauth_uid), ('oauth_provider_id', '=', provider)]) + if not user_ids: + raise openerp.exceptions.AccessDenied() + assert len(user_ids) == 1 + user = self.browse(cr, uid, user_ids[0], context=context) + user.write({'oauth_access_token': params['access_token']}) + return user.login + except openerp.exceptions.AccessDenied, access_denied_exception: + if context and context.get('no_user_creation'): + return None + state = simplejson.loads(params['state']) + token = state.get('t') + oauth_uid = validation['user_id'] + email = validation.get('email', 'provider_%s_user_%s' % (provider, oauth_uid)) + name = validation.get('name', email) + values = { + 'name': name, + 'login': email, + 'email': email, + 'oauth_provider_id': provider, + 'oauth_uid': oauth_uid, + 'oauth_access_token': params['access_token'], + 'active': True, + } + try: + _, login, _ = self.signup(cr, uid, values, token, context=context) + return login + except SignupError: + raise access_denied_exception def auth_oauth(self, cr, uid, provider, params, context=None): # Advice by Google (to avoid Confused Deputy Problem) diff --git a/addons/auth_oauth/views/auth_oauth_login.xml b/addons/auth_oauth/views/auth_oauth_login.xml index f969d2f5eed..6c5deca924c 100644 --- a/addons/auth_oauth/views/auth_oauth_login.xml +++ b/addons/auth_oauth/views/auth_oauth_login.xml @@ -3,15 +3,35 @@ --> + + + + + + diff --git a/addons/auth_oauth_signup/__init__.py b/addons/auth_oauth_signup/__init__.py deleted file mode 100644 index 7c73af367bd..00000000000 --- a/addons/auth_oauth_signup/__init__.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2012-today OpenERP SA () -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see -# -############################################################################## - -import res_users -import controllers diff --git a/addons/auth_oauth_signup/__openerp__.py b/addons/auth_oauth_signup/__openerp__.py deleted file mode 100644 index d3660f7c052..00000000000 --- a/addons/auth_oauth_signup/__openerp__.py +++ /dev/null @@ -1,41 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2010-2014 OpenERP SA (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -{ - 'name': 'Signup with OAuth2 Authentication', - 'version': '1.0', - 'category': 'Hidden', - 'description': """ -Allow users to sign up through OAuth2 Provider. -=============================================== -""", - 'author': 'OpenERP SA', - 'website': 'http://www.openerp.com', - 'depends': ['auth_oauth', 'auth_signup'], - 'data': [ - 'views/auth_oauth_signup.xml', - ], - 'js': [], - 'css': [], - 'qweb': [], - 'installable': True, - 'auto_install': True, -} diff --git a/addons/auth_oauth_signup/controllers/__init__.py b/addons/auth_oauth_signup/controllers/__init__.py deleted file mode 100644 index e11f9ba81bb..00000000000 --- a/addons/auth_oauth_signup/controllers/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -import main - -# vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/auth_oauth_signup/controllers/main.py b/addons/auth_oauth_signup/controllers/main.py deleted file mode 100644 index 0b8ab22cdaa..00000000000 --- a/addons/auth_oauth_signup/controllers/main.py +++ /dev/null @@ -1,20 +0,0 @@ -import openerp -import werkzeug - -from openerp.http import request - -class OAuthSignupLogin(openerp.addons.web.controllers.main.Home): - def list_providers(self): - providers = super(OAuthSignupLogin, self).list_providers() - if len(providers) == 1 and request.params.get('mode') == 'signup': - werkzeug.exceptions.abort(werkzeug.utils.redirect(providers[0]['auth_link'], 303)) - return providers - - def get_state(self, provider): - state = super(OAuthSignupLogin, self).get_state(provider) - token = request.params.get('token') - if token: - state['t'] = token - return state - -# vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/auth_oauth_signup/i18n/ar.po b/addons/auth_oauth_signup/i18n/ar.po deleted file mode 100644 index 9eeabd19d8b..00000000000 --- a/addons/auth_oauth_signup/i18n/ar.po +++ /dev/null @@ -1,23 +0,0 @@ -# Arabic translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-11-26 18:16+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Arabic \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "المستخدمين" diff --git a/addons/auth_oauth_signup/i18n/auth_oauth_signup.pot b/addons/auth_oauth_signup/i18n/auth_oauth_signup.pot deleted file mode 100644 index d4c0a829a7b..00000000000 --- a/addons/auth_oauth_signup/i18n/auth_oauth_signup.pot +++ /dev/null @@ -1,22 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * auth_oauth_signup -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 7.0alpha\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2012-12-21 17:05+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "" - diff --git a/addons/auth_oauth_signup/i18n/cs.po b/addons/auth_oauth_signup/i18n/cs.po deleted file mode 100644 index bf6f59f24fa..00000000000 --- a/addons/auth_oauth_signup/i18n/cs.po +++ /dev/null @@ -1,23 +0,0 @@ -# Czech translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2014-02-03 16:54+0000\n" -"Last-Translator: Jakub Drozd \n" -"Language-Team: Czech \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-04 05:51+0000\n" -"X-Generator: Launchpad (build 16916)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Uživatelé" diff --git a/addons/auth_oauth_signup/i18n/da.po b/addons/auth_oauth_signup/i18n/da.po deleted file mode 100644 index 75b7032c1de..00000000000 --- a/addons/auth_oauth_signup/i18n/da.po +++ /dev/null @@ -1,23 +0,0 @@ -# Danish translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-09-15 20:08+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Danish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Bruger" diff --git a/addons/auth_oauth_signup/i18n/de.po b/addons/auth_oauth_signup/i18n/de.po deleted file mode 100644 index 57580243777..00000000000 --- a/addons/auth_oauth_signup/i18n/de.po +++ /dev/null @@ -1,23 +0,0 @@ -# German translation for openobject-addons -# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2012-12-27 22:22+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: German \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Benutzer" diff --git a/addons/auth_oauth_signup/i18n/en_GB.po b/addons/auth_oauth_signup/i18n/en_GB.po deleted file mode 100644 index 699939d57b7..00000000000 --- a/addons/auth_oauth_signup/i18n/en_GB.po +++ /dev/null @@ -1,23 +0,0 @@ -# English (United Kingdom) translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-02-06 14:33+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: English (United Kingdom) \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Users" diff --git a/addons/auth_oauth_signup/i18n/es.po b/addons/auth_oauth_signup/i18n/es.po deleted file mode 100644 index 072378eeaa7..00000000000 --- a/addons/auth_oauth_signup/i18n/es.po +++ /dev/null @@ -1,23 +0,0 @@ -# Spanish translation for openobject-addons -# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2012-12-27 11:38+0000\n" -"Last-Translator: Pedro Manuel Baeza \n" -"Language-Team: Spanish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Usuarios" diff --git a/addons/auth_oauth_signup/i18n/et.po b/addons/auth_oauth_signup/i18n/et.po deleted file mode 100644 index 25c2888fea1..00000000000 --- a/addons/auth_oauth_signup/i18n/et.po +++ /dev/null @@ -1,23 +0,0 @@ -# Estonian translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-10-09 14:34+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Estonian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Kasutajad" diff --git a/addons/auth_oauth_signup/i18n/fr.po b/addons/auth_oauth_signup/i18n/fr.po deleted file mode 100644 index 02544f189c5..00000000000 --- a/addons/auth_oauth_signup/i18n/fr.po +++ /dev/null @@ -1,23 +0,0 @@ -# French translation for openobject-addons -# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2012-12-29 16:08+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: French \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Utilisateurs" diff --git a/addons/auth_oauth_signup/i18n/gl.po b/addons/auth_oauth_signup/i18n/gl.po deleted file mode 100644 index 463caea11c3..00000000000 --- a/addons/auth_oauth_signup/i18n/gl.po +++ /dev/null @@ -1,23 +0,0 @@ -# Galician translation for openobject-addons -# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2014. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2014-02-05 16:37+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Galician \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-06 05:33+0000\n" -"X-Generator: Launchpad (build 16916)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Usuarios" diff --git a/addons/auth_oauth_signup/i18n/hr.po b/addons/auth_oauth_signup/i18n/hr.po deleted file mode 100644 index c3cc0238ca0..00000000000 --- a/addons/auth_oauth_signup/i18n/hr.po +++ /dev/null @@ -1,23 +0,0 @@ -# Croatian translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-01-24 12:30+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Croatian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Korisnici" diff --git a/addons/auth_oauth_signup/i18n/hu.po b/addons/auth_oauth_signup/i18n/hu.po deleted file mode 100644 index eaed110eeeb..00000000000 --- a/addons/auth_oauth_signup/i18n/hu.po +++ /dev/null @@ -1,23 +0,0 @@ -# Hungarian translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-03-19 18:13+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Hungarian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Felhasználók" diff --git a/addons/auth_oauth_signup/i18n/it.po b/addons/auth_oauth_signup/i18n/it.po deleted file mode 100644 index 4c01dc40d00..00000000000 --- a/addons/auth_oauth_signup/i18n/it.po +++ /dev/null @@ -1,23 +0,0 @@ -# Italian translation for openobject-addons -# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2012-12-27 09:12+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Italian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Utenti" diff --git a/addons/auth_oauth_signup/i18n/lt.po b/addons/auth_oauth_signup/i18n/lt.po deleted file mode 100644 index 6cf0153f69f..00000000000 --- a/addons/auth_oauth_signup/i18n/lt.po +++ /dev/null @@ -1,23 +0,0 @@ -# Lithuanian translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-04-24 18:21+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Lithuanian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Naudotojai" diff --git a/addons/auth_oauth_signup/i18n/mk.po b/addons/auth_oauth_signup/i18n/mk.po deleted file mode 100644 index 3afed5fe7b3..00000000000 --- a/addons/auth_oauth_signup/i18n/mk.po +++ /dev/null @@ -1,23 +0,0 @@ -# Macedonian translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-02-28 14:54+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Macedonian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Корисници" diff --git a/addons/auth_oauth_signup/i18n/mn.po b/addons/auth_oauth_signup/i18n/mn.po deleted file mode 100644 index 8c45059310f..00000000000 --- a/addons/auth_oauth_signup/i18n/mn.po +++ /dev/null @@ -1,23 +0,0 @@ -# Mongolian translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-02-06 07:44+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Mongolian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Хэрэглэгчид" diff --git a/addons/auth_oauth_signup/i18n/nl.po b/addons/auth_oauth_signup/i18n/nl.po deleted file mode 100644 index 5029138c5d9..00000000000 --- a/addons/auth_oauth_signup/i18n/nl.po +++ /dev/null @@ -1,23 +0,0 @@ -# Dutch translation for openobject-addons -# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2012-12-27 09:12+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Dutch \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Gebruikers" diff --git a/addons/auth_oauth_signup/i18n/nl_BE.po b/addons/auth_oauth_signup/i18n/nl_BE.po deleted file mode 100644 index 2366d0844f2..00000000000 --- a/addons/auth_oauth_signup/i18n/nl_BE.po +++ /dev/null @@ -1,23 +0,0 @@ -# Dutch (Belgium) translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-04-15 16:01+0000\n" -"Last-Translator: Els Van Vossel (Foxy) \n" -"Language-Team: Dutch (Belgium) \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Gebruikers" diff --git a/addons/auth_oauth_signup/i18n/pl.po b/addons/auth_oauth_signup/i18n/pl.po deleted file mode 100644 index c0e6153a430..00000000000 --- a/addons/auth_oauth_signup/i18n/pl.po +++ /dev/null @@ -1,23 +0,0 @@ -# Polish translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-11-14 12:00+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Polish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Użytkownicy" diff --git a/addons/auth_oauth_signup/i18n/pt.po b/addons/auth_oauth_signup/i18n/pt.po deleted file mode 100644 index c0664b109b7..00000000000 --- a/addons/auth_oauth_signup/i18n/pt.po +++ /dev/null @@ -1,23 +0,0 @@ -# Portuguese translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-01-08 17:56+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Portuguese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Utilizadores" diff --git a/addons/auth_oauth_signup/i18n/pt_BR.po b/addons/auth_oauth_signup/i18n/pt_BR.po deleted file mode 100644 index 2d50e76837a..00000000000 --- a/addons/auth_oauth_signup/i18n/pt_BR.po +++ /dev/null @@ -1,23 +0,0 @@ -# Brazilian Portuguese translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-01-02 11:56+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Brazilian Portuguese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Usuários" diff --git a/addons/auth_oauth_signup/i18n/ro.po b/addons/auth_oauth_signup/i18n/ro.po deleted file mode 100644 index 5d2593b66b4..00000000000 --- a/addons/auth_oauth_signup/i18n/ro.po +++ /dev/null @@ -1,23 +0,0 @@ -# Romanian translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-01-14 19:07+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Romanian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Utilizatori" diff --git a/addons/auth_oauth_signup/i18n/ru.po b/addons/auth_oauth_signup/i18n/ru.po deleted file mode 100644 index e60c290f8e3..00000000000 --- a/addons/auth_oauth_signup/i18n/ru.po +++ /dev/null @@ -1,23 +0,0 @@ -# Russian translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-02-13 09:46+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Russian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Пользователи" diff --git a/addons/auth_oauth_signup/i18n/sl.po b/addons/auth_oauth_signup/i18n/sl.po deleted file mode 100644 index a7acd1ceacc..00000000000 --- a/addons/auth_oauth_signup/i18n/sl.po +++ /dev/null @@ -1,23 +0,0 @@ -# Slovenian translation for openobject-addons -# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2012-12-30 09:36+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Slovenian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Uporabniki" diff --git a/addons/auth_oauth_signup/i18n/sv.po b/addons/auth_oauth_signup/i18n/sv.po deleted file mode 100644 index 93350614b98..00000000000 --- a/addons/auth_oauth_signup/i18n/sv.po +++ /dev/null @@ -1,23 +0,0 @@ -# Swedish translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-01-17 23:47+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Swedish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Användare" diff --git a/addons/auth_oauth_signup/i18n/tr.po b/addons/auth_oauth_signup/i18n/tr.po deleted file mode 100644 index 4b61dc5a190..00000000000 --- a/addons/auth_oauth_signup/i18n/tr.po +++ /dev/null @@ -1,23 +0,0 @@ -# Turkish translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-02-03 12:07+0000\n" -"Last-Translator: Ahmet Altınışık \n" -"Language-Team: Turkish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Kullanıcılar" diff --git a/addons/auth_oauth_signup/i18n/vi.po b/addons/auth_oauth_signup/i18n/vi.po deleted file mode 100644 index 086df785f57..00000000000 --- a/addons/auth_oauth_signup/i18n/vi.po +++ /dev/null @@ -1,23 +0,0 @@ -# Vietnamese translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-06-27 06:49+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Vietnamese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "Người dùng" diff --git a/addons/auth_oauth_signup/i18n/zh_CN.po b/addons/auth_oauth_signup/i18n/zh_CN.po deleted file mode 100644 index f3009f88142..00000000000 --- a/addons/auth_oauth_signup/i18n/zh_CN.po +++ /dev/null @@ -1,23 +0,0 @@ -# Chinese (Simplified) translation for openobject-addons -# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-01-02 10:59+0000\n" -"Last-Translator: Oliver Yuan \n" -"Language-Team: Chinese (Simplified) \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "用户" diff --git a/addons/auth_oauth_signup/i18n/zh_TW.po b/addons/auth_oauth_signup/i18n/zh_TW.po deleted file mode 100644 index 0e3e0b23c3b..00000000000 --- a/addons/auth_oauth_signup/i18n/zh_TW.po +++ /dev/null @@ -1,23 +0,0 @@ -# Chinese (Traditional) translation for openobject-addons -# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-01-30 13:18+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Chinese (Traditional) \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n" -"X-Generator: Launchpad (build 16914)\n" - -#. module: auth_oauth_signup -#: model:ir.model,name:auth_oauth_signup.model_res_users -msgid "Users" -msgstr "使用者" diff --git a/addons/auth_oauth_signup/res_users.py b/addons/auth_oauth_signup/res_users.py deleted file mode 100644 index a06968fa46f..00000000000 --- a/addons/auth_oauth_signup/res_users.py +++ /dev/null @@ -1,60 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2010-2012 OpenERP SA (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -import logging -import simplejson - -import openerp -from openerp.addons.auth_signup.res_users import SignupError -from openerp.osv import osv, fields - -_logger = logging.getLogger(__name__) - -class res_users(osv.Model): - _inherit = 'res.users' - - def _auth_oauth_signin(self, cr, uid, provider, validation, params, context=None): - # overridden to use signup method if regular oauth signin fails - try: - login = super(res_users, self)._auth_oauth_signin(cr, uid, provider, validation, params, context=context) - - except openerp.exceptions.AccessDenied, access_denied_exception: - if context and context.get('no_user_creation'): - return None - state = simplejson.loads(params['state']) - token = state.get('t') - oauth_uid = validation['user_id'] - email = validation.get('email', 'provider_%s_user_%s' % (provider, oauth_uid)) - name = validation.get('name', email) - values = { - 'name': name, - 'login': email, - 'email': email, - 'oauth_provider_id': provider, - 'oauth_uid': oauth_uid, - 'oauth_access_token': params['access_token'], - 'active': True, - } - try: - _, login, _ = self.signup(cr, uid, values, token, context=context) - except SignupError: - raise access_denied_exception - return login diff --git a/addons/auth_oauth_signup/views/auth_oauth_signup.xml b/addons/auth_oauth_signup/views/auth_oauth_signup.xml deleted file mode 100644 index 139f36a4c0f..00000000000 --- a/addons/auth_oauth_signup/views/auth_oauth_signup.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - -