fix(web): clear server session on dev login user switch (#205)
fix(web): clear server session on dev login user switch
This commit was merged in pull request #205.
This commit is contained in:
@@ -395,11 +395,11 @@ jobs:
|
|||||||
|
|
||||||
git push -u origin "chore/update-image-tags-${TAG}"
|
git push -u origin "chore/update-image-tags-${TAG}"
|
||||||
|
|
||||||
# Create PR with auto-merge
|
# Create PR and merge immediately (no required checks on groombook/infra)
|
||||||
PR_URL=$(gh pr create \
|
PR_URL=$(gh pr create \
|
||||||
--repo groombook/infra \
|
--repo groombook/infra \
|
||||||
--base main \
|
--base main \
|
||||||
--head "chore/update-image-tags-${TAG}" \
|
--head "chore/update-image-tags-${TAG}" \
|
||||||
--title "chore: deploy ${TAG} to dev" \
|
--title "chore: deploy ${TAG} to dev" \
|
||||||
--body "[GRO-178](/GRO/issues/GRO-178) — automated image tag update from main merge")
|
--body "[GRO-178](/GRO/issues/GRO-178) — automated image tag update from main merge")
|
||||||
gh pr merge "$PR_URL" --auto --merge
|
gh pr merge "$PR_URL" --merge
|
||||||
|
|||||||
@@ -262,6 +262,9 @@ export function App() {
|
|||||||
return <Navigate to="/setup" replace />;
|
return <Navigate to="/setup" replace />;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Don't render portal chrome at /login — DevLoginSelector is shown instead
|
||||||
|
const showCustomerPortal = !location.pathname.startsWith("/admin") && location.pathname !== "/login";
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<BrandingProvider>
|
<BrandingProvider>
|
||||||
{location.pathname.startsWith("/admin") ? (
|
{location.pathname.startsWith("/admin") ? (
|
||||||
@@ -271,12 +274,12 @@ export function App() {
|
|||||||
</Routes>
|
</Routes>
|
||||||
{authDisabled && <DevSessionIndicator />}
|
{authDisabled && <DevSessionIndicator />}
|
||||||
</>
|
</>
|
||||||
) : (
|
) : showCustomerPortal ? (
|
||||||
<>
|
<>
|
||||||
<CustomerPortal />
|
<CustomerPortal />
|
||||||
{authDisabled && <DevSessionIndicator />}
|
{authDisabled && <DevSessionIndicator />}
|
||||||
</>
|
</>
|
||||||
)}
|
) : null}
|
||||||
</BrandingProvider>
|
</BrandingProvider>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user