fix(workshop): harden store auth refresh
This commit is contained in:
1 parent
f1e4866a8b
commit
2fb92b7816
2 files changed
+37
-7
No files matched your search
@@ -17,3 +17,12 @@
|
|||||||
- **Tests**: `pnpm --filter @homarr/docs typecheck`, `pnpm --filter @homarr/docs lint`, `pnpm --filter nextjs typecheck`, and `pnpm exec vitest run apps/docs/src/lib/store-schema.spec.ts` passed; docs lint still reports pre-existing warnings outside this fix set.
|
- **Tests**: `pnpm --filter @homarr/docs typecheck`, `pnpm --filter @homarr/docs lint`, `pnpm --filter nextjs typecheck`, and `pnpm exec vitest run apps/docs/src/lib/store-schema.spec.ts` passed; docs lint still reports pre-existing warnings outside this fix set.
|
||||||
- **Docs**: Updated `apps/store/README.md` with admin bootstrap variables.
|
- **Docs**: Updated `apps/store/README.md` with admin bootstrap variables.
|
||||||
- **Risks**: PocketBase image pin assumes `ghcr.io/muchobien/pocketbase:0.26.2` remains the intended runtime version for this new store service.
|
- **Risks**: PocketBase image pin assumes `ghcr.io/muchobien/pocketbase:0.26.2` remains the intended runtime version for this new store service.
|
||||||
|
|
||||||
|
## PR #5984 Final Review Stability Fix
|
||||||
|
|
||||||
|
- **Why**: Address CodeRabbit's remaining outside-diff stability comments before the final push.
|
||||||
|
- **What**: Updated `useStore` to await PocketBase auth refresh before loading workshop data and to return `null` from `requireUserId` on auth failures, allowing vote lock cleanup to run.
|
||||||
|
- **Files**: `apps/docs/src/components/store/useStore.ts`, `.opencode/changelog/2026-07-03.md`.
|
||||||
|
- **Tests**: `pnpm --filter @homarr/docs typecheck`, `pnpm --filter @homarr/docs lint`, and `pnpm exec vitest run apps/docs/src/lib/store-schema.spec.ts` passed; docs lint still reports pre-existing warnings outside this fix.
|
||||||
|
- **Docs**: Changelog updated only.
|
||||||
|
- **Risks**: Low; the change preserves existing auth refresh behavior but sequences initial loading after auth state is known.
|
||||||
@@ -66,15 +66,28 @@ export const useStore = (storeUrl: string) => {
|
|||||||
}, [pb, refreshVotes]);
|
}, [pb, refreshVotes]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (pb.authStore.isValid)
|
let cancelled = false;
|
||||||
pb.collection("users")
|
const unsubscribe = pb.authStore.onChange(() => {
|
||||||
.authRefresh()
|
|
||||||
.catch(() => pb.authStore.clear());
|
|
||||||
void refresh();
|
|
||||||
return pb.authStore.onChange(() => {
|
|
||||||
setUser(pb.authStore.record);
|
setUser(pb.authStore.record);
|
||||||
if (!pb.authStore.isValid) setVotes({});
|
if (!pb.authStore.isValid) setVotes({});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const load = async () => {
|
||||||
|
if (pb.authStore.isValid) {
|
||||||
|
try {
|
||||||
|
await pb.collection("users").authRefresh();
|
||||||
|
} catch {
|
||||||
|
pb.authStore.clear();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!cancelled) await refresh();
|
||||||
|
};
|
||||||
|
|
||||||
|
void load();
|
||||||
|
return () => {
|
||||||
|
cancelled = true;
|
||||||
|
unsubscribe();
|
||||||
|
};
|
||||||
}, [pb, refresh]);
|
}, [pb, refresh]);
|
||||||
|
|
||||||
const ensureAuth = useCallback(async () => {
|
const ensureAuth = useCallback(async () => {
|
||||||
@@ -93,7 +106,15 @@ export const useStore = (storeUrl: string) => {
|
|||||||
|
|
||||||
const requireUserId = useCallback(
|
const requireUserId = useCallback(
|
||||||
async (action: string) => {
|
async (action: string) => {
|
||||||
if (!(await ensureAuth())) {
|
let authenticated = false;
|
||||||
|
try {
|
||||||
|
authenticated = await ensureAuth();
|
||||||
|
} catch (caught) {
|
||||||
|
setError(errorMessage(caught, `Sign in to ${action}`));
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!authenticated) {
|
||||||
setError(`Sign in to ${action}`);
|
setError(`Sign in to ${action}`);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user