Skip to content

[17.0][FIX] auth_oauth_autologin: compatibility with auth_totp #883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sbidoul wants to merge 1 commit into
base: 17.0
Choose a base branch
from
Open

[17.0][FIX] auth_oauth_autologin: compatibility with auth_totp #883

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions auth_oauth_autologin/static/src/js/web_login.esm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@ publicWidget.registry.login.include({
start: async function () {
const def = this._super.apply(this, arguments);
let url = window.location.href;
if (url.includes("/web/login")) {
const parsed_url = new URL(url);
if (parsed_url.pathname === "/web/login") {
url = url.replace("/web/login", "/web");
}
this._result = await this._rpc("/auth/auto_login_redirect_link", {
redirect: url,
});
if (this._result) {
window.location = this._result;
this._result = await this._rpc("/auth/auto_login_redirect_link", {
redirect: url,
});
if (this._result) {
window.location = this._result;
}
}
return def;
},
Expand Down