Merge pull request buildbot#7824 from tdesveaux/issue/7814

www: Fix auth when Buildbot is not hosted at the URL's root
pmisik · Jul 17, 2024 · e2296b1 · e2296b1
2 parents b67a1f1 + dceac6e
commit e2296b1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/newsfragments/fix-www-auth-reverseproxy-subpath.bugfix b/newsfragments/fix-www-auth-reverseproxy-subpath.bugfix
@@ -0,0 +1 @@
+Fix ReactUI authentication when Buildbot is hosted behind a reverse proxy not at url's root. (:issue:`7814`)
diff --git a/www/base/src/components/Loginbar/Loginbar.tsx b/www/base/src/components/Loginbar/Loginbar.tsx
@@ -24,6 +24,7 @@ import {
 import {useLocation} from "react-router-dom";
 import {Nav, NavDropdown} from "react-bootstrap";
 import {ConfigContext} from "buildbot-ui";
+import { getBaseUrl } from 'buildbot-data-js';
 
 function getAuthIcon(faIcon: string) {
   switch (faIcon) {
@@ -56,7 +57,7 @@ export const Loginbar = () => {
     return (
       <Nav className="bb-loginbar-dropdown-nav">
         <NavDropdown title="Anonymous" id="bb-loginbar-dropdown">
-          <NavDropdown.Item href={"/auth/login?redirect=" + encodeURI(redirect)}>
+          <NavDropdown.Item href={getBaseUrl(window.location, "auth/login?redirect=" + encodeURI(redirect))}>
             {
               config.auth.oauth2
                 ? <span>
@@ -90,7 +91,7 @@ export const Loginbar = () => {
     <Nav className="bb-loginbar-dropdown-nav">
       <NavDropdown title={dropdownToggle} id="bb-loginbar-dropdown">
         {userDropdownHeader}
-        <NavDropdown.Item href={"auth/logout?redirect=" + encodeURI(redirect)}>
+        <NavDropdown.Item href={getBaseUrl(window.location, "auth/logout?redirect=" + encodeURI(redirect))}>
           <FaSignOutAlt/>
           Logout
         </NavDropdown.Item>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix ReactUI authentication when Buildbot is hosted behind a reverse proxy not at url's root. (:issue:`7814`)