fix: encode URI components in google login url

niledatabase · Sep 8, 2023 · 4cee80c · 4cee80c
1 parent f77b320
commit 4cee80c
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/packages/react/src/GoogleLoginButton/GoogleLoginButton.tsx b/packages/react/src/GoogleLoginButton/GoogleLoginButton.tsx
@@ -26,10 +26,12 @@ export default function GoogleSSOButton(props: {
 }) {
   const { workspace, database, newTenantName } = props;
   const { basePath } = useNileConfig();
-  // workspace and database can be `''`.
-  // let this fail silently for now, and update the context when the time comes
-  const contextHref = `${basePath}/workspaces/${workspace}/databases/${database}/${LOGIN_PATH}`;
-  const query = newTenantName ? '?newTenant=' + newTenantName : '';
+  const encodedWorkspace = encodeURIComponent(workspace ?? '');
+  const encodedDatabase = encodeURIComponent(database ?? '');
+  const contextHref = `${basePath}/workspaces/${encodedWorkspace}/databases/${encodedDatabase}/${LOGIN_PATH}`;
+  const query = newTenantName
+    ? '?newTenant=' + encodeURIComponent(newTenantName)
+    : '';
   const href = (props?.href ?? contextHref) + query;
   return (
     <Box