Seperate out OAuth API

Author: hhvrc

src/lib/api/index.ts

@@ -59,5 +59,4 @@ export const shockersV2Api = new ShockersV2Api(DefaultApiV2Configuration);
 export const publicShockerSharesApi = new PublicShockerSharesApi(DefaultApiV1Configuration);
 export const shockerSharesV1Api = new ShockerSharesV1Api(DefaultApiV1Configuration);
 export const shockerSharesV2Api = new ShockerSharesV2Api(DefaultApiV2Configuration);
-export const oauthApi = new OAuthApi(DefaultApiV1Configuration);
 export const usersApi = new UsersApi(DefaultApiV1Configuration);

src/lib/api/next/ResponseError.ts

@@ -0,0 +1,9 @@
+export class ResponseError extends Error {
+  override name = 'ResponseError';
+  constructor(
+    public response: Response,
+    msg?: string
+  ) {
+    super(msg ?? `HTTP ${response.status} ${response.statusText}`);
+  }
+}

src/lib/api/next/TransformError.ts

@@ -0,0 +1,6 @@
+export class TransformError extends Error {
+  override name = 'TransformError';
+  constructor(message: string) {
+    super(message);
+  }
+}

src/lib/api/next/base.ts

@@ -0,0 +1,98 @@
+import { PUBLIC_BACKEND_API_DOMAIN } from '$env/static/public';
+import { ResponseError } from './ResponseError';
+
+const BaseUrl = `https://${PUBLIC_BACKEND_API_DOMAIN}`;
+
+type ApiVersion = 1 | 2;
+export type Path = `/${ApiVersion}/${string}`;
+
+export function GetBackendUrl(path: Path) {
+  return BaseUrl + path;
+}
+
+export async function GetJson<T>(
+  path: Path,
+  expectedStatus = 200,
+  transformer: (data: unknown) => T
+): Promise<T> {
+  const res = await fetch(BaseUrl + path, {
+    headers: { accept: 'application/json' },
+    method: 'GET',
+    redirect: 'error',
+  });
+
+  if (res.status !== expectedStatus) {
+    throw new ResponseError(res, `Unexpected status ${res.status}`);
+  }
+
+  const contentType = res.headers.get('content-type') ?? '';
+  if (!contentType.includes('application/json')) {
+    throw new ResponseError(res, `Expected JSON but got ${contentType}`);
+  }
+
+  const data = await res.json();
+
+  return transformer(data);
+}
+
+export async function PostJson<T>(
+  path: Path,
+  body: unknown,
+  expectedStatus = 200,
+  transformer: (data: unknown) => T
+): Promise<T> {
+  const url = GetBackendUrl(path);
+
+  const res = await fetch(url, {
+    method: 'POST',
+    headers: {
+      'content-type': 'application/json',
+      accept: 'application/json',
+    },
+    body: JSON.stringify(body),
+    redirect: 'error',
+  });
+
+  if (res.status !== expectedStatus) {
+    throw new ResponseError(res, `Unexpected status ${res.status} for POST ${url}`);
+  }
+
+  const contentType = res.headers.get('content-type') ?? '';
+  if (!contentType.includes('application/json')) {
+    throw new ResponseError(res, `Expected JSON but got ${contentType}`);
+  }
+
+  const data = await res.json();
+
+  return transformer(data);
+}
+
+export async function PostRedirect(
+  path: Path,
+  expectedStatus: 302 | 303 | 307 | 308 = 302
+): Promise<void> {
+  const url = BaseUrl + path;
+  const res = await fetch(url, { method: 'POST', redirect: 'manual' });
+
+  if (res.status !== expectedStatus) {
+    throw new ResponseError(res, `Unexpected status ${res.status} for POST ${url}`);
+  }
+
+  const loc = res.headers.get('Location');
+  if (!loc) throw new ResponseError(res, 'Missing Location header');
+
+  const target = new URL(loc, url); // handles absolute or relative
+
+  // Restrict which domains we can be redirected to
+  const allowedHosts = new Set([PUBLIC_BACKEND_API_DOMAIN, 'accounts.google.com', 'github.com']);
+
+  if (!allowedHosts.has(target.hostname)) {
+    throw new ResponseError(res, `Blocked redirect to disallowed host ${target.href}`);
+  }
+
+  if (target.protocol !== 'https:') {
+    throw new ResponseError(res, `Blocked non-HTTPS redirect to ${target.href}`);
+  }
+
+  window.location.assign(target.toString());
+}

src/lib/api/next/models/LoginOkResponse.ts

@@ -0,0 +1,10 @@
+import type { RoleType } from './RoleType';
+
+export interface LoginOkResponse {
+  accountId: string;
+  accountName: string;
+  accountEmail: string;
+  isVerified: boolean;
+  profileImage: string;
+  accountRoles: RoleType[];
+}

src/lib/api/next/models/OAuthFinalizeRequest.ts

@@ -0,0 +1,5 @@
+export interface OAuthFinalizeRequest {
+  username?: string | null;
+  email: string | null;
+  password: string | null;
+}

src/lib/api/next/models/OAuthSignupData.ts

@@ -0,0 +1,6 @@
+export interface OAuthSignupData {
+  provider: string;
+  email: string | null;
+  displayName: string | null;
+  expiresAt: Date;
+}

src/lib/api/next/models/RoleType.ts

@@ -0,0 +1,6 @@
+export enum RoleType {
+  Support = 'Support',
+  Staff = 'Staff',
+  Admin = 'Admin',
+  System = 'System',
+}

src/lib/api/next/models/index.ts

@@ -0,0 +1,4 @@
+export * from './LoginOkResponse';
+export * from './OAuthFinalizeRequest';
+export * from './OAuthSignupData';
+export * from './RoleType';

src/lib/api/next/oauth.ts

@@ -0,0 +1,30 @@
+import { GetJson, PostJson, PostRedirect } from './base';
+import type { LoginOkResponse, OAuthFinalizeRequest, OAuthSignupData } from './models';
+import {
+  TransformLoginOkResponse,
+  TransformOAuthSignupData,
+  ValidateStringArray,
+} from './transformers';
+
+export function OAuthListProviders(): Promise<string[]> {
+  return GetJson<string[]>('/1/oauth/providers', 200, ValidateStringArray);
+}
+
+export function OAuthAuthorize(provider: string, flow: 'LoginOrCreate' | 'Link') {
+  const providerEnc = encodeURIComponent(provider);
+  const flowEnc = encodeURIComponent(flow);
+  return PostRedirect(`/1/oauth/${providerEnc}/authorize?flow=${flowEnc}`, 302);
+}
+
+export async function OAuthSignupGetData(provider: string) {
+  const providerEnc = encodeURIComponent(provider);
+  return GetJson<OAuthSignupData>(`/1/oauth/${providerEnc}/data`, 200, TransformOAuthSignupData);
+}
+
+export async function OAuthSignupFinalize(
+  provider: string,
+  payload: OAuthFinalizeRequest
+): Promise<LoginOkResponse> {
+  const providerEnc = encodeURIComponent(provider);
+  return PostJson(`/1/oauth/${providerEnc}/finalize`, payload, 200, TransformLoginOkResponse);
+}