[FIX] auth_totp: tour not working on a base install

This is a followup to #57826: turns out discuss isn't necessarily
installed (who knew?), so the tour would break if mail was not
explicitly installed alongside base, which is not great.

So instead of opening discuss to try and fix the profile race
condition, reload the *entire web client* by navigating to `/web`.

Further discovery: async run functions don't actually do anything in
tours, not sure where I got that, maybe used one for the convenience
of `await` then the next time around having decided to wipe any
knowledge of tours I had, I figured it wasn't possible that tours were
so stupid as to not support promises.

So yeah, can't just return a "pending" promise in order to force the
tour manager to wait until the page has reloaded to carry on, that
doesn't work. Instead use marker classes. Also remove the `async run`
I had in the rest of the file to avoid being misleading, use a marker
class for the one step where it probably matters.

closes odoo/odoo#58119

Signed-off-by: Xavier Morel (xmo) <xmo@odoo.com>

1 files changed, 30 insertions, 40 deletions

diff --git a/addons/auth_totp/static/tests/totp_flow.js b/addons/auth_totp/static/tests/totp_flow.js
index d3c6e40313b..575e847f4f7 100644
--- a/addons/auth_totp/static/tests/totp_flow.js
+++ b/addons/auth_totp/static/tests/totp_flow.js
@@ -4,30 +4,19 @@ odoo.define('auth_totp.tours', function(require) {
 const tour = require('web_tour.tour');
 const ajax = require('web.ajax');
 
-function openDiscussApp() {
+function openRoot() {
     return [{
-            // goToAppSteps is a big dum-dum designed for interactive tours, it's
-            // not designed to open an arbitrary application from an arbitrary
-            // location so it doesn't know to return to the home in enterprise, this
-            // step handles that: it checks if we're no the home screen (~ if there
-            // are apps displayed which is not quite correct but good enough for us)
-            // and if not clicks the toggle
-            edition: 'enterprise',
-            trigger: 'body',
-            run: function(helpers) {
-                if (!$('.o_app').length) {
-                    helpers.click('.o_main_navbar .o_menu_toggle');
-                }
-            }
-        }, tour.stepUtils.showAppsMenuItem(),{
-            trigger: '.o_app[data-menu-xmlid="mail.menu_root_discuss"]',
-            content: "Go to discuss",
-        }, {
-            content: 'Wait for page',
-            trigger: '.o_menu_brand:contains("Discuss")',
-            run: () => {}
+        content: "return to client root to avoid race condition",
+        trigger: 'body',
+        run() {
+            $('body').addClass('wait');
+            window.location = '/web';
         }
-    ];
+    }, {
+        content: "wait for client reload",
+        trigger: 'body:not(.wait)',
+        run() {}
+    }];
 }
 function openUserProfileAtSecurityTab() {
     return [{
@@ -69,22 +58,22 @@ tour.register('totp_tour_setup', {
 }, {
     content: "Get secret from collapsed div",
     trigger: 'a:contains("show the code")',
-    run: async function(helpers) {
+    run(helpers) {
         const secret = this.$anchor.closest('div').find('code').text();
-        const token = await ajax.jsonRpc('/totphook', 'call', {
+        ajax.jsonRpc('/totphook', 'call', {
             secret
+        }).then((token) => {
+            helpers._text(helpers._get_action_values('input[name=code]'), token);
+            helpers._click(helpers._get_action_values('button.btn-primary:contains(Enable)'));
+            $('body').addClass('got-token')
         });
-        helpers._text(helpers._get_action_values('input[name=code]'), token);
-        helpers._click(helpers._get_action_values('button.btn-primary:contains(Enable)'));
     }
+}, {
+    content: 'wait for rpc',
+    trigger: 'body.got-token',
+    run() {}
 },
-// if hr is not installed the preferences dialog will close and we need to
-// reopen it, but if hr is installed then we're already there and a race
-// condition can make it so we thing we've already reopened it while it's
-// rather that we're still on it, then the view resets before the step
-// afterwards and we end up on the wrong tab => first open the settings app to
-// ensure we completely reset the view and only then navigate to the profile
-...openDiscussApp(),
+...openRoot(),
 ...openUserProfileAtSecurityTab(),
 {
     content: "Check that the button has changed",
@@ -115,12 +104,13 @@ tour.register('totp_login_enabled', {
 }, {
     content: "input code",
     trigger: 'input[name=totp_token]',
-    run: async function (helpers) {
-        const token = await ajax.jsonRpc('/totphook', 'call', {});
-        helpers._text(helpers._get_action_values(), token);
-        // FIXME: is there a way to put the button as its own step trigger without
-        //        the tour straight blowing through and not waiting for this?
-        helpers._click(helpers._get_action_values('button:contains("Verify")'));
+    run(helpers) {
+        ajax.jsonRpc('/totphook', 'call', {}).then((token) => {
+            helpers._text(helpers._get_action_values(), token);
+            // FIXME: is there a way to put the button as its own step trigger without
+            //        the tour straight blowing through and not waiting for this?
+            helpers._click(helpers._get_action_values('button:contains("Verify")'));
+        });
     }
 }, {
     content: "check we're logged in",
@@ -146,7 +136,7 @@ tour.register('totp_login_enabled', {
     content: "Confirm",
     trigger: "button:contains(Confirm Password)",
 },
-...openDiscussApp(),
+...openRoot(),
 ...openUserProfileAtSecurityTab(),
 {
     content: "Check that the button has changed",