Actually log into pocketbase before running

Update

Update
This commit is contained in:
2025-07-07 15:51:28 +02:00
parent 885f8f48d8
commit 99039873f4
5 changed files with 117 additions and 11 deletions

44
src/hooks/useAdmin.ts Normal file
View File

@@ -0,0 +1,44 @@
import { useState, useEffect } from 'react';
import { adminLogin } from '@/lib/pocketbase';
export function useAdmin() {
const [isLoggedIn, setIsLoggedIn] = useState(false);
const [loading, setLoading] = useState(true);
const [error, setError] = useState<string | null>(null);
useEffect(() => {
let mounted = true;
const initializeAdmin = async () => {
try {
setLoading(true);
await adminLogin();
if (mounted) {
setIsLoggedIn(true);
setError(null);
}
} catch (err) {
if (mounted) {
setError(err instanceof Error ? err.message : 'Failed to login as admin');
setIsLoggedIn(false);
}
} finally {
if (mounted) {
setLoading(false);
}
}
};
initializeAdmin();
return () => {
mounted = false;
};
}, []); // Empty dependency array ensures this only runs once on mount
return {
isLoggedIn,
loading,
error
};
}

View File

@@ -7,7 +7,6 @@ export function useJobs() {
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
const [error, setError] = useState<string | null>(null); const [error, setError] = useState<string | null>(null);
// Load jobs only once when the hook mounts
useEffect(() => { useEffect(() => {
let mounted = true; let mounted = true;
@@ -30,7 +29,6 @@ export function useJobs() {
} }
}; };
// Start loading immediately
loadJobs(); loadJobs();
// Set up subscription for updates // Set up subscription for updates

View File

@@ -3,13 +3,67 @@ import { TypedPocketBase } from './pbtypes';
import { POCKETBASE_SUPERUSER_EMAIL, POCKETBASE_SUPERUSER_PASSWORD } from './pocketbaseAdmin'; import { POCKETBASE_SUPERUSER_EMAIL, POCKETBASE_SUPERUSER_PASSWORD } from './pocketbaseAdmin';
const pb = new PocketBase('https://evebase.site.quack-lab.dev') as TypedPocketBase; const pb = new PocketBase('https://evebase.site.quack-lab.dev') as TypedPocketBase;
// Track the login promise to avoid multiple concurrent login attempts
let loginPromise: Promise<void> | null = null;
async function adminLogin() { async function adminLogin() {
try { // If we're already logged in, no need to login again
await pb.collection('_superusers').authWithPassword(POCKETBASE_SUPERUSER_EMAIL, POCKETBASE_SUPERUSER_PASSWORD); if (pb.authStore.isValid) {
console.log('Admin logged in'); return Promise.resolve();
} catch (error) {
console.error('Admin login failed:', error);
}
} }
export { pb, adminLogin }; if (loginPromise) {
return loginPromise;
}
loginPromise = pb.collection('_superusers')
.authWithPassword(POCKETBASE_SUPERUSER_EMAIL, POCKETBASE_SUPERUSER_PASSWORD)
.then(() => {
console.log('Admin logged in');
})
.catch(error => {
console.error('Admin login failed:', error);
throw error;
})
.finally(() => {
loginPromise = null;
});
return loginPromise;
}
// Wrap the PocketBase instance to ensure auth before any request
const wrappedPb = new Proxy(pb, {
get(target, prop) {
if (prop === 'collection') {
// Return a function that creates a proxied collection
return (collectionName: string) => {
// Get the original collection
const originalCollection = target.collection(collectionName);
// Return a proxy for the collection that ensures auth
return new Proxy(originalCollection, {
get(collectionTarget, methodName) {
const method = collectionTarget[methodName as keyof typeof collectionTarget];
if (typeof method === 'function') {
// Wrap methods to ensure auth before calling
return async (...args: any[]) => {
// Only try to login if we're not already logged in
if (!pb.authStore.isValid) {
await adminLogin();
}
return method.apply(collectionTarget, args);
};
}
return method;
}
});
};
}
return target[prop as keyof typeof target];
}
});
export { wrappedPb as pb, adminLogin };

View File

@@ -7,7 +7,6 @@ import { formatISK } from '@/utils/priceUtils';
import JobCard from '@/components/JobCard'; import JobCard from '@/components/JobCard';
import JobForm from '@/components/JobForm'; import JobForm from '@/components/JobForm';
import { IndJob } from '@/lib/types'; import { IndJob } from '@/lib/types';
import { Badge } from '@/components/ui/badge';
import BatchTransactionForm from '@/components/BatchTransactionForm'; import BatchTransactionForm from '@/components/BatchTransactionForm';
import { useJobs } from '@/hooks/useDataService'; import { useJobs } from '@/hooks/useDataService';
import SearchOverlay from '@/components/SearchOverlay'; import SearchOverlay from '@/components/SearchOverlay';

View File

@@ -3,16 +3,24 @@ import { IndJobRecord, IndJobRecordNoId, IndTransactionRecord, IndTransactionRec
import * as jobService from './jobService'; import * as jobService from './jobService';
import * as transactionService from './transactionService'; import * as transactionService from './transactionService';
import * as billItemService from './billItemService'; import * as billItemService from './billItemService';
import { adminLogin } from '@/lib/pocketbase';
export class DataService { export class DataService {
private static instance: DataService; private static instance: DataService;
private jobs: IndJob[] = []; private jobs: IndJob[] = [];
private listeners: Set<() => void> = new Set(); private listeners: Set<() => void> = new Set();
private loadPromise: Promise<IndJob[]> | null = null; private loadPromise: Promise<IndJob[]> | null = null;
private initialized: Promise<void>;
private constructor() { } private constructor() {
// Initialize with admin login
this.initialized = adminLogin().catch(error => {
console.error('Failed to initialize DataService:', error);
throw error;
});
}
static getInstance(): DataService { public static getInstance(): DataService {
if (!DataService.instance) { if (!DataService.instance) {
DataService.instance = new DataService(); DataService.instance = new DataService();
} }
@@ -37,6 +45,9 @@ export class DataService {
} }
async loadJobs(): Promise<IndJob[]> { async loadJobs(): Promise<IndJob[]> {
// Wait for initialization first
await this.initialized;
// If there's already a load in progress, return that promise // If there's already a load in progress, return that promise
if (this.loadPromise) { if (this.loadPromise) {
return this.loadPromise; return this.loadPromise;