Merge pull request #494 from OCA/15.0

Syncing from upstream OCA/server-auth (15.0)
brain-tec · Sep 14, 2024 · aba762c · aba762c
2 parents 195e634 + a7f16f6
commit aba762c
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ addon | version | maintainers | summary
 [auth_oauth_multi_token](auth_oauth_multi_token/) | 15.0.1.0.1 |  | Allow multiple connection with the same OAuth account
 [auth_oidc](auth_oidc/) | 15.0.1.1.0 | [![sbidoul](https://github.com/sbidoul.png?size=30px)](https://github.com/sbidoul) | Allow users to login through OpenID Connect Provider
 [auth_saml](auth_saml/) | 15.0.1.4.4 | [![vincent-hatakeyama](https://github.com/vincent-hatakeyama.png?size=30px)](https://github.com/vincent-hatakeyama) | SAML2 Authentication
-[auth_session_timeout](auth_session_timeout/) | 15.0.1.0.0 |  | This module disable all inactive sessions since a given delay
+[auth_session_timeout](auth_session_timeout/) | 15.0.1.0.2 |  | This module disable all inactive sessions since a given delay
 [auth_signup_partner_company](auth_signup_partner_company/) | 15.0.1.0.0 |  | Auth Signup Partner Company
 [auth_signup_verify_email](auth_signup_verify_email/) | 15.0.1.0.0 |  | Force uninvited users to use a good email for signup
 [auth_user_case_insensitive](auth_user_case_insensitive/) | 15.0.1.0.0 |  | Makes the user login field case insensitive

diff --git a/auth_session_timeout/README.rst b/auth_session_timeout/README.rst
@@ -7,7 +7,7 @@ Inactive Sessions Timeout
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:403ec55d9d4d7286c397a2fbad9b8979776b9d3135281977c144c5659232d2ed
+   !! source digest: sha256:74d16f19b861bf266d057134134227b2e2b88f91c9e05347399299343d62bc92
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/auth_session_timeout/__manifest__.py b/auth_session_timeout/__manifest__.py
@@ -13,7 +13,7 @@
     "maintainer": "Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/server-auth",
     "category": "Tools",
-    "version": "15.0.1.0.0",
+    "version": "15.0.1.0.2",
     "license": "AGPL-3",
     "data": ["data/ir_config_parameter_data.xml"],
     "installable": True,

diff --git a/auth_session_timeout/data/ir_config_parameter_data.xml b/auth_session_timeout/data/ir_config_parameter_data.xml
@@ -9,6 +9,8 @@
     </record>
     <record id="inactive_session_time_out_ignored_url" model="ir.config_parameter">
         <field name="key">inactive_session_time_out_ignored_url</field>
-        <field name="value">/calendar/notify,/longpolling/poll</field>
+        <field
+            name="value"
+        >/calendar/notify,/longpolling/poll,/longpolling/im_status</field>
     </record>
 </odoo>
diff --git a/auth_session_timeout/migrations/15.0.1.0.1/post-migration.py b/auth_session_timeout/migrations/15.0.1.0.1/post-migration.py
@@ -0,0 +1,28 @@
+import logging
+
+from odoo import SUPERUSER_ID, api
+
+_logger = logging.getLogger(__name__)
+
+
+def migrate(cr, version):
+    add_controller_to_parameter(cr)
+
+
+def add_controller_to_parameter(cr):
+    """Add /longpolling/im_status because it is executed several times (every 50 seconds)"""
+    env = api.Environment(cr, SUPERUSER_ID, {})
+    new_url = "/longpolling/im_status"
+    ignored_path_key = "inactive_session_time_out_ignored_url"
+    param = env["ir.config_parameter"]
+    old_value = param.get_param(ignored_path_key, "")
+    if new_url in old_value:
+        _logger.info(
+            "%s is included in the parameter %s already.", new_url, ignored_path_key
+        )
+        return
+    new_value = "%s,%s" % (old_value, new_url)
+    param.set_param(ignored_path_key, new_value)
+    _logger.info(
+        "%s was added to the parameter %s successfully.", new_url, ignored_path_key
+    )
diff --git a/auth_session_timeout/static/description/index.html b/auth_session_timeout/static/description/index.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -9,10 +8,11 @@
 
 /*
 :Author: David Goodger ([email protected])
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -275,7 +275,7 @@
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: grey; } /* line numbers */
+pre.code .ln { color: gray; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -301,7 +301,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -367,7 +367,7 @@ <h1 class="title">Inactive Sessions Timeout</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:403ec55d9d4d7286c397a2fbad9b8979776b9d3135281977c144c5659232d2ed
+!! source digest: sha256:74d16f19b861bf266d057134134227b2e2b88f91c9e05347399299343d62bc92
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-auth/tree/15.0/auth_session_timeout"><img alt="OCA/server-auth" src="https://img.shields.io/badge/github-OCA%2Fserver--auth-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-auth-15-0/server-auth-15-0-auth_session_timeout"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-auth&amp;target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module was written to be able to kill(logout) all inactive sessions since
@@ -436,7 +436,9 @@ <h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
-<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>