Merge pull request jupyterhub#4867 from manics/admin-pages-baseurl

minrk · web-flow · commit 78649b911801 · 2024-08-14T07:41:48.000+02:00
Admin pages: use inherited base_url from render_template
diff --git a/jsx/src/util/jhapiUtil.js b/jsx/src/util/jhapiUtil.js
@@ -3,7 +3,7 @@ const base_url = jhdata.base_url || "/";
 const xsrfToken = jhdata.xsrf_token;
 
 export const jhapiRequest = (endpoint, method, data) => {
-  let api_url = new URL(`${base_url}hub/api` + endpoint, location.origin);
+  let api_url = new URL(`${base_url}api` + endpoint, location.origin);
   if (xsrfToken) {
     api_url.searchParams.set("_xsrf", xsrfToken);
   }
diff --git a/jupyterhub/handlers/pages.py b/jupyterhub/handlers/pages.py
@@ -466,7 +466,6 @@ async def get(self):
             named_server_limit_per_user=await self.get_current_user_named_server_limit(),
             server_version=f'{__version__} {self.version_hash}',
             api_page_limit=self.settings["api_page_default_limit"],
-            base_url=self.settings["base_url"],
         )
         self.finish(html)
 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ const base_url = jhdata.base_url \|\| "/";`
`3`	`3`	`const xsrfToken = jhdata.xsrf_token;`
`4`	`4`
`5`	`5`	`export const jhapiRequest = (endpoint, method, data) => {`
`6`		- let api_url = new URL(`${base_url}hub/api` + endpoint, location.origin);
	`6`	+ let api_url = new URL(`${base_url}api` + endpoint, location.origin);
`7`	`7`	`if (xsrfToken) {`
`8`	`8`	`api_url.searchParams.set("_xsrf", xsrfToken);`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -466,7 +466,6 @@ async def get(self):`
`466`	`466`	`named_server_limit_per_user=await self.get_current_user_named_server_limit(),`
`467`	`467`	`server_version=f'{__version__} {self.version_hash}',`
`468`	`468`	`api_page_limit=self.settings["api_page_default_limit"],`
`469`		`- base_url=self.settings["base_url"],`
`470`	`469`	`)`
`471`	`470`	`self.finish(html)`
`472`	`471`