[IMP] mail: remove fallback on getCurrentLocalStorageVersion

Author: alexkuhn

addons/im_livechat/models/im_livechat_channel.py

@@ -6,6 +6,7 @@
 import re
 from urllib.parse import urlparse
 
+import odoo
 from odoo import api, Command, fields, models, _
 from odoo.exceptions import AccessError, ValidationError
 from odoo.fields import Domain
@@ -577,13 +578,17 @@ def _get_channel_infos(self):
 
     def get_livechat_info(self, username=None):
         self.ensure_one()
-
+        version_info = odoo.service.common.exp_version()
         if username is None:
             username = _('Visitor')
         info = {}
         info['available'] = self._is_livechat_available()
         info['server_url'] = self.get_base_url()
-        info["websocket_worker_version"] = WebsocketConnectionHandler._VERSION
+        info["session_info"] = {
+            "server_version": version_info.get('server_version'),
+            "server_version_info": version_info.get('server_version_info'),
+            "websocket_worker_version": WebsocketConnectionHandler._VERSION,
+        }
         if info['available']:
             info['options'] = self._get_channel_infos()
             info['options']["default_username"] = username

addons/im_livechat/views/im_livechat_channel_templates.xml

@@ -98,10 +98,8 @@
                 if (!window.odoo) {
                     window.odoo = {};
                 }
-                odoo.__session_info__ = odoo.__session_info__ || {
-                    websocket_worker_version: <t t-out="json.dumps(info.get('websocket_worker_version', ''))"/>
-                }
-                odoo.__session_info__ = Object.assign(odoo.__session_info__, {
+                odoo.__session_info__ = Object.assign(odoo.__session_info__ || {}, {
+                    ...<t t-out="json.dumps(info.get('session_info', {}))"/>,
                     livechatData: {
                         can_load_livechat: <t t-out="'true' if info['available'] else 'false'"/>,
                         serverUrl: "<t t-out="info['server_url']"/>",

addons/mail/static/src/utils/common/local_storage.js

@@ -10,8 +10,15 @@ const LOCAL_STORAGE_SUBVERSION = 0;
  */
 
 export function getCurrentLocalStorageVersion() {
-    const [major, minor] = session.server_version_info ?? "1.0";
-    return [major, minor, LOCAL_STORAGE_SUBVERSION].join(".");
+    try {
+        const [major, minor] = session.server_version_info;
+        return [major, minor, LOCAL_STORAGE_SUBVERSION].join(".");
+    } catch (err) {
+        console.warn(
+            "Could not parse server_version_info from session (probably missing). Please provide it!"
+        );
+        throw err;
+    }
 }
 
 /**
@@ -61,6 +68,6 @@ export function parseRawValue(rawValue) {
     try {
         return JSON.parse(rawValue);
     } catch {
-        // noop
+        return undefined;
     }
 }

addons/web/controllers/webclient.py

@@ -91,7 +91,14 @@ def version_info(self):
 
     @http.route('/web/tests', type='http', auth='user', readonly=True)
     def unit_tests_suite(self, mod=None, **kwargs):
-        return request.render('web.unit_tests_suite', {'session_info': {'view_info': request.env['ir.ui.view'].get_view_info()}})
+        version_info = odoo.service.common.exp_version()
+        return request.render('web.unit_tests_suite', {
+            'session_info': {
+                "server_version": version_info.get('server_version'),
+                "server_version_info": version_info.get('server_version_info'),
+                'view_info': request.env['ir.ui.view'].get_view_info()
+            },
+        })
 
     @http.route('/web/tests/legacy', type='http', auth='user', readonly=True)
     def test_suite(self, mod=None, **kwargs):

addons/web/models/ir_http.py

@@ -170,6 +170,7 @@ def session_info(self):
     def get_frontend_session_info(self):
         user = self.env.user
         session_uid = request.session.uid
+        version_info = odoo.service.common.exp_version()
         session_info = {
             'is_admin': user._is_admin() if session_uid else False,
             'is_system': user._is_system() if session_uid else False,
@@ -188,16 +189,12 @@ def get_frontend_session_info(self):
             'bundle_params': {
                 'lang': request.session.context['lang'],
             },
+            'server_version': version_info.get('server_version'),
+            'server_version_info': version_info.get('server_version_info'),
             'test_mode': config['test_enable'],
         }
         if request.session.debug:
             session_info['bundle_params']['debug'] = request.session.debug
-        if session_uid:
-            version_info = odoo.service.common.exp_version()
-            session_info.update({
-                'server_version': version_info.get('server_version'),
-                'server_version_info': version_info.get('server_version_info')
-            })
         return session_info
 
     @api.deprecated("Deprecated since 19.0, use get_all_currencies on 'res.currency'")