Extract id-making

Author: LaurentTreguier

src/lib/openapi/fakes/users-endpoint.ts

@@ -1,3 +1,4 @@
+import { makeId } from '$lib/utils';
 import {
 	Rank,
 	type ApiResponse,
@@ -129,9 +130,9 @@ export default class FakeUsersEndpointApi implements UsersEndpointApiInterface {
 		throw new Error('Method not implemented.');
 	}
 
-	private makeUser(username: string) {
+	private makeUser(username: string): User {
 		return {
-			id: Math.random().toString(36).substring(2),
+			id: makeId(),
 			dateCreated: new Date(),
 			username: username,
 			rank: Rank.Citizen,

src/lib/openapi/index.ts

@@ -2,7 +2,7 @@ import { dev } from '$app/environment';
 import { api } from '$lib/data/urls.json';
 import { getStoredItem, setStoredItem } from '$lib/storage';
 import { DisplayableError, eventBus } from '$lib/events';
-import { sleep } from '$lib/utils';
+import { makeId, sleep } from '$lib/utils';
 import {
 	Configuration,
 	FetchError,
@@ -94,7 +94,7 @@ class RequestIdMiddleware implements Middleware {
 		const headers = { ...context.init.headers } as Record<string, string>;
 
 		if (!headers[RequestIdMiddleware.headerName]) {
-			headers[RequestIdMiddleware.headerName] = Math.random().toString(36).substring(2);
+			headers[RequestIdMiddleware.headerName] = makeId();
 		}
 
 		context.init.headers = headers;

src/lib/utils.ts

@@ -1,3 +1,7 @@
 export function sleep(ms: number): Promise<void> {
 	return new Promise((resolve) => setTimeout(resolve, ms));
 }
+
+export function makeId(): string {
+	return Math.random().toString(36).substring(2);
+}