dan/Portfolio
1
0
Fork 0
mirror of https://github.com/danbulant/Portfolio synced 2026-05-24 12:35:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: massive refactor of ssr and ssr api

Browse source
This commit is contained in:
EETagent 2022-12-05 14:35:41 +01:00
parent 4f32b244cf
commit 245fd6de80
8 changed files with 145 additions and 144 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

121
frontend/src/lib/@api/admin.ts
View file

@ -1,13 +1,17 @@
import type { AdminLogin } from "$lib/stores/admin";
import type { CandidateData, CandidatePreview, CreateCandidate, CreateCandidateLogin } from "$lib/stores/candidate";
import axios from "axios";
import { API_URL, errorHandler, type Fetch } from ".";
import type { AdminLogin } from '$lib/stores/admin';
import type {
CandidateData,
CandidatePreview,
CreateCandidate,
CreateCandidateLogin
} from '$lib/stores/candidate';
import axios from 'axios';
import { API_URL, errorHandler, type Fetch } from '.';
// Login as admin /admin/login
export const apiLogin = async (data: AdminLogin): Promise<number> => {
try {
const res = await axios.post(API_URL + '/admin/login', data, { withCredentials: true });
await axios.post(API_URL + '/admin/login', data, { withCredentials: true });
return data.adminId;
} catch (e: any) {
throw errorHandler(e, 'Login failed');
@ -17,97 +21,92 @@ export const apiLogin = async (data: AdminLogin): Promise<number> => {
// Create new candidate /admin/create
// return created candidate's applicationId, personalIdNumber and password
export const apiCreateCandidate = async (data: CreateCandidate): Promise<CreateCandidateLogin> => {
try {
const res = await axios.post(API_URL + '/admin/create', data, { withCredentials: true });
return res.data;
} catch (e: any) {
throw errorHandler(e, 'Candidate creation failed');
}
}
try {
const res = await axios.post(API_URL + '/admin/create', data, { withCredentials: true });
return res.data;
} catch (e: any) {
throw errorHandler(e, 'Candidate creation failed');
}
};
// Reset candidate password /admin/candidate/{id}/reset_password
export const apiResetCandidatePassword = async (id: number): Promise<CreateCandidateLogin> => {
try {
const res = await axios.post(API_URL + '/admin/candidate/' + id + '/reset_password',
{},
{ withCredentials: true }
);
return res.data;
} catch (e: any) {
throw errorHandler(e, 'Candidate creation failed');
}
}
try {
const res = await axios.post(
API_URL + '/admin/candidate/' + id + '/reset_password',
{},
{ withCredentials: true }
);
return res.data;
} catch (e: any) {
throw errorHandler(e, 'Candidate creation failed');
}
};
export const apiGetCandidatePortfolio = async (id: number): Promise<Blob> => {
try {
const res = await fetch(API_URL + '/admin/candidate/' + id + '/portfolio', {
method: 'GET',
credentials: 'include',
credentials: 'include'
});
return await res.blob();
} catch (e: any) {
throw errorHandler(e, 'Candidate portfolio failed');
}
}
};
// SSR compatible
// Logout as admin /admin/logout
export const apiLogout = async (fetchSsr?: Fetch) => {
const apiFetch = fetchSsr || fetch;
try {
if (fetchSsr) {
const res = await fetchSsr(API_URL + '/admin/logout', {
method: 'POST',
credentials: 'include'
});
return await res.text();
}
const res = await axios.post(API_URL + '/admin/logout', { withCredentials: true });
return res.data;
} catch (e: any) {
const res = await apiFetch(API_URL + '/admin/logout', {
method: 'POST',
credentials: 'include'
});
return await res.text();
} catch (e) {
throw errorHandler(e, 'Logout failed');
}
};
// SSR compatible
// List all candidates /admin/list/candidates
export const apiListCandidates = async (fetchSsr?: Fetch, field?: string): Promise<[CandidatePreview]> => {
export const apiListCandidates = async (
fetchSsr?: Fetch,
field?: string
): Promise<Array<CandidatePreview>> => {
const apiFetch = fetchSsr || fetch;
const params = new URLSearchParams();
if (field) {
params.append('field', field);
}
try {
if (fetchSsr) {
const res = await fetchSsr(API_URL + '/admin/list/candidates?' + params.toString(), {
method: 'GET',
credentials: 'include'
});
return await res.json();
}
const res = await axios.get(API_URL + '/admin/list/candidates?' + params.toString(), {
withCredentials: true
const res = await apiFetch(API_URL + '/admin/list/candidates?' + params.toString(), {
method: 'GET',
credentials: 'include'
});
return res.data;
} catch (e: any) {
throw errorHandler(e, 'Failed to fetch submission progress');
if (res.status != 200) {
throw Error(await res.text());
}
return await res.json();
} catch (e) {
throw errorHandler(e, 'List candidates failed');
}
};
// SSR compatible
// Get candidate data /admin/candidate/{id}
export const apiFetchCandidate = async (id: number, fetchSsr?: Fetch): Promise<CandidateData> => {
try {
if (fetchSsr) {
const res = await fetchSsr(API_URL + '/admin/candidate/' + id, {
method: 'GET',
credentials: 'include'
});
return await res.json();
}
const res = await axios.get(API_URL + '/admin/candidate/' + id, {
withCredentials: true
const apiFetch = fetchSsr || fetch;
try {
const res = await apiFetch(API_URL + '/admin/candidate/' + id, {
method: 'GET',
credentials: 'include'
});
return res.data;
} catch (e: any) {
return await res.json();
} catch (e) {
throw errorHandler(e, 'Failed to fetch candidate data');
}
}
};

83
frontend/src/lib/@api/candidate.ts
View file

@ -6,64 +6,66 @@ import DOMPurify from 'isomorphic-dompurify';
// SSR Compatible
export const apiLogout = async (fetchSsr?: Fetch) => {
const apiFetch = fetchSsr || fetch;
try {
fetchSsr
? await fetchSsr(API_URL + '/candidate/logout', { method: 'POST', credentials: 'include' })
: await axios.post(API_URL + '/candidate/logout', { withCredentials: true });
} catch (e: any) {
const res = await apiFetch(API_URL + '/candidate/logout', {
method: 'POST',
credentials: 'include'
});
return await res.json();
} catch (e) {
throw errorHandler(e, 'Logout failed');
}
};
// SSR Compatible
export const apiFetchDetails = async (fetchSsr?: Fetch): Promise<CandidateData> => {
const apiFetch = fetchSsr || fetch;
try {
if (fetchSsr) {
const res = await fetchSsr(API_URL + '/candidate/details', {
method: 'GET',
credentials: 'include'
});
if (res.status != 200) {
throw new Error(await res.text());
}
return await res.json();
const res = await apiFetch(API_URL + '/candidate/details', {
method: 'GET',
credentials: 'include'
});
if (res.status != 200) {
throw new Error(await res.text());
}
const res = await axios.get(API_URL + '/candidate/details', { withCredentials: true });
return res.data;
} catch (e: any) {
console.log(e);
throw errorHandler(e, 'Failed to fill details');
return await res.json();
} catch (e) {
throw errorHandler(e, 'Fetch details failed');
}
};
// SSR Compatible
export const apiFetchSubmissionProgress = async (fetchSsr?: Fetch): Promise<SubmissionProgress> => {
const apiFetch = fetchSsr || fetch;
try {
if (fetchSsr) {
const res = await fetchSsr(API_URL + '/candidate/portfolio/submission_progress', {
method: 'GET',
credentials: 'include'
});
if (res.status != 200) {
throw Error(await res.text());
}
return await res.json();
}
const res = await axios.get(API_URL + '/candidate/portfolio/submission_progress', {
withCredentials: true
const res = await apiFetch(API_URL + '/candidate/portfolio/submission_progress', {
method: 'GET',
credentials: 'include'
});
return res.data;
} catch (e: any) {
if (res.status != 200) {
throw Error(await res.text());
}
return await res.json();
} catch (e) {
throw errorHandler(e, 'Failed to fetch submission progress');
}
};
export const apiWhoami = async (): Promise<string> => {
export const apiWhoami = async (fetchSsr?: Fetch): Promise<string> => {
const apiFetch = fetchSsr || fetch;
try {
const res = await axios.get(`${API_URL}/whoami`);
return res.data;
} catch (e: any) {
throw errorHandler(e, 'Whoami failed');
console.log(API_URL + '/candidate/whoami');
const res = await apiFetch(API_URL + '/candidate/whoami', {
method: 'GET',
credentials: 'include'
});
if (res.status != 200) {
throw Error(await res.text());
}
return await res.text();
} catch (e) {
throw errorHandler(e, 'Failed to fetch whoami');
}
};
@ -77,10 +79,11 @@ export const apiLogin = async (data: CandidateLogin): Promise<number> => {
};
export const apiFillDetails = async (data: CandidateData): Promise<CandidateData> => {
Object.keys(data).forEach(key => {
Object.keys(data).forEach((key) => {
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
data[key] = DOMPurify.sanitize(data[key]);
});
});
try {
const res = await axios.post(API_URL + '/candidate/details', data, { withCredentials: true });
return res.data;
@ -162,4 +165,4 @@ export const apiDeltePortfolio = async (): Promise<boolean> => {
} catch (e: any) {
throw errorHandler(e, 'Failed to delete portfolio');
}
};
};

4
frontend/src/lib/@api/index.ts
View file

@ -5,10 +5,10 @@ export type Fetch = (input: RequestInfo, init?: RequestInit) => Promise<Response
export const API_URL = 'http://localhost:8000';
export interface ApiError {
error: AxiosError;
error: AxiosError | unknown;
msg: string;
}
export const errorHandler = (error: AxiosError, msg: string): ApiError => {
export const errorHandler = (error: AxiosError | unknown, msg: string): ApiError => {
return { error, msg };
}

12
frontend/src/routes/(admin)/admin/(authenticated)/dashboard/+page.server.ts
View file

@ -4,13 +4,13 @@ import type { PageServerLoad } from './$types';
export const load: PageServerLoad = async ({ fetch }) => {
let candidatePreview: Array<CandidatePreview> = [{}];
try {
candidatePreview = await apiListCandidates(fetch);
} catch (e) {
console.error(e);
}
candidatePreview =
(await apiListCandidates(fetch).catch((e) => {
console.error(e);
})) || [];
return {
preview: candidatePreview,
preview: candidatePreview
};
};

12
frontend/src/routes/(candidate)/(authenticated)/+layout.server.ts
View file

@ -1,10 +1,16 @@
import type { LayoutServerLoad } from './$types';
import { redirect } from '@sveltejs/kit';
import { apiWhoami } from '$lib/@api/candidate';
export const load: LayoutServerLoad = ({ cookies }) => {
export const load: LayoutServerLoad = async ({ cookies, fetch }) => {
const isAuthenticated = cookies.get('id');
if (!isAuthenticated) {
throw redirect(302, '/auth/login');
if (isAuthenticated) {
await apiWhoami(fetch).catch((e) => {
throw redirect(302, '/auth/logout');
});
} else {
throw redirect(302, '/auth/logout');
}
};

31
frontend/src/routes/(candidate)/(authenticated)/dashboard/+layout.server.ts
View file

@ -1,31 +0,0 @@
import { apiFetchDetails, apiFetchSubmissionProgress } from '$lib/@api/candidate';
import type { CandidateData } from '$lib/stores/candidate';
import { redirect } from '@sveltejs/kit';
import type { LayoutServerLoad } from './$types';
export const load: LayoutServerLoad = async ({ fetch }) => {
let details: CandidateData;
try {
details = await apiFetchDetails(fetch);
} catch (e: any) {
if (e.code === 401) {
throw redirect(302, '/auth/login');
} else {
throw redirect(302, '/register');
}
}
let submissionProgress;
try {
submissionProgress = await apiFetchSubmissionProgress(fetch);
} catch (e) {
console.log(e);
}
return {
candidate: details,
submission: {
...submissionProgress
}
};
};

22
frontend/src/routes/(candidate)/(authenticated)/dashboard/+page.server.ts Normal file
View file

@ -0,0 +1,22 @@
import { apiFetchDetails, apiFetchSubmissionProgress } from '$lib/@api/candidate';
import type { CandidateData } from '$lib/stores/candidate';
import { redirect } from '@sveltejs/kit';
import type { PageServerLoad } from './$types';
export const load: PageServerLoad = async ({ fetch }) => {
const details: CandidateData = await apiFetchDetails(fetch).catch((e) => {
console.error(e);
throw redirect(302, '/register');
});
const submissionProgress = await apiFetchSubmissionProgress(fetch).catch((e) => {
console.log(e);
});
return {
candidate: details,
submission: {
...submissionProgress
}
};
};

4
frontend/src/routes/(candidate)/auth/logout/+page.server.ts
View file

@ -4,7 +4,9 @@ import { redirect } from '@sveltejs/kit';
import { apiLogout } from '$lib/@api/candidate';
export const load: PageServerLoad = async ({ fetch, cookies }) => {
await apiLogout(fetch);
await apiLogout(fetch).catch(() => {
// TODO: Handle error
});
cookies.delete('id', { path: '/' });
cookies.delete('key', { path: '/' });