Reformat password_security to match tests

Set requirements in the root of projects

.flake8

@@ -5,6 +5,7 @@ max-complexity = 16
 # B9 = bugbear opinionated (incl line length)
 select = C,E,F,W,B,B9
 # E203: whitespace before ':' (black behaviour)
+# E231: missing whitespace after ',' (black behaviour)
 # E501: flake8 line length (covered by bugbear B950)
 # W503: line break before binary operator (black behaviour)
-ignore = E203,E501,W503
+ignore = E203,E231,E501,W503

password_security/__init__.py

@@ -1,5 +1,4 @@
 # Copyright 2015 LasLabs Inc.
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
-from . import controllers
-from . import models
+from . import controllers, models

password_security/__manifest__.py

@@ -3,35 +3,26 @@
 # Copyright 2019 initOS GmbH
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 {
-
-    'name': 'Password Security',
+    "name": "Password Security",
     "summary": "Allow admin to set password security requirements.",
-    'version': '13.0.1.0.0',
-    'author':
-        "LasLabs, "
-        "Kaushal Prajapati, "
-        "Tecnativa, "
-        "initOS GmbH, "
-        "Omar Nasr, "
-        "Odoo Community Association (OCA)",
-    'category': 'Base',
-    'depends': [
-        'auth_signup',
-        'auth_password_policy_signup',
-    ],
+    "version": "13.0.1.0.0",
+    "author": "LasLabs, "
+    "Kaushal Prajapati, "
+    "Tecnativa, "
+    "initOS GmbH, "
+    "Omar Nasr, "
+    "Odoo Community Association (OCA)",
+    "category": "Base",
+    "depends": ["auth_signup", "auth_password_policy_signup",],
     "website": "https://github.com/OCA/server-auth",
-    'external_dependencies': {
-        'python': ['zxcvbn'],
-    },
+    "external_dependencies": {"python": ["zxcvbn"],},
     "license": "LGPL-3",
     "data": [
-        'views/password_security.xml',
-        'views/res_config_settings_views.xml',
-        'security/ir.model.access.csv',
-        'security/res_users_pass_history.xml',
-    ],
-    "demo": [
-        'demo/res_users.xml',
+        "views/password_security.xml",
+        "views/res_config_settings_views.xml",
+        "security/ir.model.access.csv",
+        "security/res_users_pass_history.xml",
     ],
-    'installable': True,
+    "demo": ["demo/res_users.xml",],
+    "installable": True,
 }

password_security/controllers/main.py

@@ -5,35 +5,34 @@
 
 from odoo import http
 from odoo.http import request
+
 from odoo.addons.auth_signup.controllers.main import AuthSignupHome
-from odoo.addons.web.controllers.main import ensure_db, Session
+from odoo.addons.web.controllers.main import Session, ensure_db
 
 from ..exceptions import PassError
 
 
 class PasswordSecuritySession(Session):
-
     @http.route()
     def change_password(self, fields):
-        new_password = operator.itemgetter('new_password')(
-            dict(list(map(operator.itemgetter('name', 'value'), fields)))
+        new_password = operator.itemgetter("new_password")(
+            dict(list(map(operator.itemgetter("name", "value"), fields)))
         )
         user_id = request.env.user
         user_id._check_password(new_password)
         return super(PasswordSecuritySession, self).change_password(fields)
 
 
 class PasswordSecurityHome(AuthSignupHome):
-
     def do_signup(self, qcontext):
-        password = qcontext.get('password')
+        password = qcontext.get("password")
         user_id = request.env.user
         user_id._check_password(password)
         return super(PasswordSecurityHome, self).do_signup(qcontext)
 
-    @http.route('/password_security/estimate', auth='none', type='json')
+    @http.route("/password_security/estimate", auth="none", type="json")
     def estimate(self, password):
-        return request.env['res.users'].get_estimation(password)
+        return request.env["res.users"].get_estimation(password)
 
     @http.route()
     def web_login(self, *args, **kw):
@@ -48,45 +47,35 @@ def web_login(self, *args, **kw):
         request.env.user.action_expire_password()
         request.session.logout(keep_db=True)
         # I was kicked out, so set login_success in request params to False
-        request.params['login_success'] = False
+        request.params["login_success"] = False
         redirect = request.env.user.partner_id.signup_url
         return http.redirect_with_hash(redirect)
 
     @http.route()
     def web_auth_signup(self, *args, **kw):
         try:
-            return super(PasswordSecurityHome, self).web_auth_signup(
-                *args, **kw
-            )
+            return super(PasswordSecurityHome, self).web_auth_signup(*args, **kw)
         except PassError as e:
             qcontext = self.get_auth_signup_qcontext()
-            qcontext['error'] = str(e)
-            return request.render('auth_signup.signup', qcontext)
+            qcontext["error"] = str(e)
+            return request.render("auth_signup.signup", qcontext)
 
     @http.route()
     def web_auth_reset_password(self, *args, **kw):
-        """ It provides hook to disallow front-facing resets inside of min
+        """It provides hook to disallow front-facing resets inside of min
         Unfortuantely had to reimplement some core logic here because of
         nested logic in parent
         """
         qcontext = self.get_auth_signup_qcontext()
         if (
-            request.httprequest.method == 'POST' and
-            qcontext.get('login') and
-            'error' not in qcontext and
-            'token' not in qcontext
+            request.httprequest.method == "POST"
+            and qcontext.get("login")
+            and "error" not in qcontext
+            and "token" not in qcontext
         ):
-            login = qcontext.get('login')
-            user_ids = request.env.sudo().search(
-                [('login', '=', login)],
-                limit=1,
-            )
+            login = qcontext.get("login")
+            user_ids = request.env.sudo().search([("login", "=", login)], limit=1,)
             if not user_ids:
-                user_ids = request.env.sudo().search(
-                    [('email', '=', login)],
-                    limit=1,
-                )
+                user_ids = request.env.sudo().search([("email", "=", login)], limit=1,)
             user_ids._validate_pass_reset()
-        return super(PasswordSecurityHome, self).web_auth_reset_password(
-            *args, **kw
-        )
+        return super(PasswordSecurityHome, self).web_auth_reset_password(*args, **kw)

password_security/demo/res_users.xml

@@ -1,16 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+<?xml version="1.0" encoding="UTF-8" ?>
 <!--
     Copyright 2016 LasLabs Inc.
     License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 -->
-
 <odoo>
-
     <record id="base.user_root" model="res.users">
-        <field name="password_write_date"
-               eval="datetime.now()"
-               />
+        <field name="password_write_date" eval="datetime.now()" />
     </record>
-
 </odoo>

password_security/exceptions.py

@@ -6,6 +6,7 @@
 
 class PassError(UserError):
     """ Example: When you try to create an insecure password."""
+
     def __init__(self, msg):
         self.message = msg
         super(PassError, self).__init__(msg)

password_security/models/__init__.py

@@ -1,7 +1,4 @@
 # Copyright 2015 LasLabs Inc.
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
-from . import res_users
-from . import res_company
-from . import res_users_pass_history
-from . import res_config_settings
+from . import res_company, res_config_settings, res_users, res_users_pass_history

password_security/models/res_company.py

@@ -2,61 +2,49 @@
 # Copyright 2017 Kaushal Prajapati <kbprajapati@live.com>.
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
-from odoo import api, models, fields, _
+from odoo import _, api, fields, models
 from odoo.exceptions import ValidationError
 
 
 class ResCompany(models.Model):
-    _inherit = 'res.company'
+    _inherit = "res.company"
 
     password_expiration = fields.Integer(
-        'Days',
-        default=60,
-        help='How many days until passwords expire',
+        "Days", default=60, help="How many days until passwords expire",
     )
     password_length = fields.Integer(
-        'Characters',
-        default=12,
-        help='Minimum number of characters',
+        "Characters", default=12, help="Minimum number of characters",
     )
     password_lower = fields.Integer(
-        'Lowercase',
-        default=1,
-        help='Require number of lowercase letters',
+        "Lowercase", default=1, help="Require number of lowercase letters",
     )
     password_upper = fields.Integer(
-        'Uppercase',
-        default=1,
-        help='Require number of uppercase letters',
+        "Uppercase", default=1, help="Require number of uppercase letters",
     )
     password_numeric = fields.Integer(
-        'Numeric',
-        default=1,
-        help='Require number of numeric digits',
+        "Numeric", default=1, help="Require number of numeric digits",
     )
     password_special = fields.Integer(
-        'Special',
-        default=1,
-        help='Require number of unique special characters',
+        "Special", default=1, help="Require number of unique special characters",
     )
     password_estimate = fields.Integer(
-        'Estimation',
+        "Estimation",
         default=3,
-        help='Required score for the strength estimation. Between 0 and 4',
+        help="Required score for the strength estimation. Between 0 and 4",
     )
     password_history = fields.Integer(
-        'History',
+        "History",
         default=30,
-        help='Disallow reuse of this many previous passwords - use negative '
-             'number for infinite, or 0 to disable',
+        help="Disallow reuse of this many previous passwords - use negative "
+        "number for infinite, or 0 to disable",
     )
     password_minimum = fields.Integer(
-        'Minimum Hours',
+        "Minimum Hours",
         default=24,
-        help='Amount of hours until a user may change password again',
+        help="Amount of hours until a user may change password again",
     )
 
-    @api.constrains('password_estimate')
+    @api.constrains("password_estimate")
     def _check_password_estimate(self):
         if 0 > self.password_estimate > 4:
-            raise ValidationError(_('The estimation must be between 0 and 4.'))
+            raise ValidationError(_("The estimation must be between 0 and 4."))

password_security/models/res_config_settings.py

@@ -18,12 +18,8 @@ class ResConfigSettings(models.TransientModel):
     password_length = fields.Integer(
         related="company_id.password_length", readonly=False
     )
-    password_lower = fields.Integer(
-        related="company_id.password_lower", readonly=False
-    )
-    password_upper = fields.Integer(
-        related="company_id.password_upper", readonly=False
-    )
+    password_lower = fields.Integer(related="company_id.password_lower", readonly=False)
+    password_upper = fields.Integer(related="company_id.password_upper", readonly=False)
     password_numeric = fields.Integer(
         related="company_id.password_numeric", readonly=False
     )