Merge pull request #28 from containerish/adhoc-changes

Add: Forgot password API fix

Author: guacamole

src/apis/auth.ts

@@ -116,7 +116,7 @@ export class Auth extends HttpClient {
 	}
 
 	public ForgotPasswordCallback = async (newPassword: string, token: string) => {
-		const path= `/reset-password?kind=forgot_password_callback`
+		const path= `/reset-forgotten-password`
 
 		const body = {
 			"new_password": newPassword,
@@ -125,6 +125,7 @@ export class Auth extends HttpClient {
 		const resp = this.http.post(path, body, {headers: {
 			'Authorization': 'Bearer ' + token,
 		}})
+
 		return resp;
 	}
 
@@ -183,6 +184,17 @@ export class Auth extends HttpClient {
 		goto(import.meta.env.VITE_OPEN_REGISTRY_BACKEND_URL + "/auth/github/login")
 	}
 
+	public publicPaths = new Map([
+		['/', 'root'],
+		['/about', 'about'],
+		['/faq', 'faq'],
+		['/search', 'search'],
+		['/auth/verify', 'authVerify'],
+		['/auth/unhandled', 'unhandled'],
+		['/auth/forgot-password', 'forgot-password']
+	]);
+
+
 	private getGithubOAuthUrl = () => {
 		return `https://github.com/login/oauth/authorize/?client_id=${import.meta.env.VITE_GITHUB_CLIENT_ID}&redirect_uri=${import.meta.env.VITE_OPEN_REGISTRY_BACKEND_URL}/auth/github/callback&scope=user:email&state=skljdfkljsdjfklj`;
 	}

src/apis/httpClient.ts

@@ -13,8 +13,6 @@ abstract class HttpClient {
 			baseURL,
 			headers,
 			withCredentials: true,
-			httpAgent: this.getUserAgent(),
-			httpsAgent: this.getUserAgent(),
 		});
 
 		this._responseInterceptor();
@@ -28,6 +26,8 @@ abstract class HttpClient {
 				req.withCredentials = false;
 			} else {
 				req.withCredentials = true;
+				// @TODO (jay-dee7) we need to set this header
+				// req.headers['User-Agent'] = this.getUserAgent();
 			}
 
 			return req;
@@ -54,7 +54,8 @@ abstract class HttpClient {
 	}
 
 	private getUserAgent = () => {
-		return import.meta.env.VITE_OPEN_REGISTRY_APP_NAME + "/" + import.meta.env.VITE_OPEN_REGISTRY_ENVIRONMENT
+	const agentName = `${import.meta.env.VITE_OPEN_REGISTRY_APP_NAME}/${import.meta.env.VITE_OPEN_REGISTRY_ENVIRONMENT} ${import.meta.env.VITE_OPEN_REGISTRY_APP_VERSION}`
+		return agentName;
 	}
 }
 

src/global.d.ts

@@ -8,4 +8,5 @@ interface ImportMetaEnv {
 	VITE_OPEN_REGISTRY_SUPPORT_API_KEY: string
 	VITE_OPEN_REGISTRY_SUPPORT_ENDPOINT: string
 	VITE_OPEN_REGISTRY_SUPPORT_EMAILS: string
+	VITE_OPEN_REGISTRY_APP_VERSION: string
 }

src/lib/navbar.svelte

@@ -31,9 +31,9 @@
 			<div class="container px-6 mx-auto half:px-1 uw:px-12">
 				<div class="flex flex-col md:justify-between md:items-center">
 					<div class="flex items-center justify-between w-full">
-						<div class="cursor-pointer flex items-center half:ml-5">
-							<picture class="md:w-44" on:click={() => goto('/')}>
-								<img class="h-full w-full" src="/logo.svg" alt="opener" />
+						<div on:click={() => goto('/')} class="cursor-pointer flex items-center half:ml-5">
+							<picture class="md:w-44">
+								<img class="h-full w-full" src="/logo.svg" alt="openeregistry" />
 							</picture>
 						</div>
 						<NavbarDefault {pathname} {openSignInModal} />

src/routes/__error.svelte

@@ -1,4 +1,4 @@
-<script context="module">
+<script context="module" lang="ts">
 	export function load({ error, status }) {
 		return {
 			props: {
@@ -8,10 +8,15 @@
 	}
 </script>
 
-<script>
-	export let title;
+<script lang="ts">
+	export let title: string;
 </script>
 
-<div class="bg-brown-200 flex-col w-full h-full flex justify-center items-center">
+<div
+	class="bg-brown-200 text-center min-h-[70vh] py-8 2xl:py-16 flex-col w-full h-full flex justify-center items-center"
+>
 	<img class="w-4/6" src="/404-not-found.svg" alt="" />
+	<div class="w-full h-full">
+		<span class="text-brown-900 text-xl">{title}</span>
+	</div>
 </div>

src/routes/__layout.svelte

@@ -1,44 +1,75 @@
 <script context="module" lang="ts">
+	import { Auth, type User } from '../apis/auth';
+	const auth = new Auth();
+
 	export const load = async ({ url }) => {
 		const signinPath = url.pathname === '/search' ? url.pathname : undefined;
 		const u = new URLSearchParams(url.search);
-		const signin = u.get('signin');
+		const openSignInModal = u.get('signin');
+		const pathname = url.pathname;
+
+		if (auth.publicPaths.has(pathname)) {
+			return {
+				props: {
+					signinPath: signinPath,
+					pathname: url.pathname,
+					openSignInModal: openSignInModal,
+					authenticated: false
+				}
+			};
+		}
 
-		return {
-			props: {
-				signinPath: signinPath,
-				pathname: url.pathname,
-				openSignInModal: signin
+		let s: number;
+		try {
+			const { data, status } = await auth.GetUserWithSession();
+			s = status;
+			return {
+				props: {
+					signinPath: signinPath,
+					pathname: url.pathname,
+					openSignInModal: openSignInModal,
+					user: data,
+					authenticated: true
+				}
+			};
+		} catch (err) {
+			if (err) {
+				return {
+					status: s,
+					error: err,
+					props: {
+						signinPath: signinPath,
+						pathname: url.pathname,
+						openSignInModal: openSignInModal,
+						authenticated: false
+					}
+				};
 			}
-		};
+		}
 	};
 </script>
 
 <script lang="ts">
 	import '../app.css';
 	import { onMount } from 'svelte';
-	import { session } from '$app/stores';
 	import Footer from '$lib/footer.svelte';
 	import Navbar from '$lib/navbar.svelte';
-	import { Auth } from '../apis/auth';
-	export let pathname: string;
+	import { session } from '$app/stores';
 	export let signinPath: string;
 	export let openSignInModal: boolean;
+	export let user: User;
 
-	const auth = new Auth();
 	onMount(async () => {
-		if (!pathname || pathname === '/' || pathname === '/about' || pathname === '/faq') {
-			return;
-		}
-
-		const { data, status } = await auth.GetUserWithSession();
-		if (status === 200) {
+		if (user) {
 			// @ts-ignore
-			$session.user = data;
+			$session.user = user;
 			// @ts-ignore
 			$session.authenticated = true;
 			return;
 		}
+
+		// @ts-ignore
+		$session.authenticated = false;
 	});
 </script>
 

src/routes/auth/[slug].svelte

@@ -82,9 +82,7 @@
 					return;
 				}
 
-				timer = setTimeout(async () => {
-					await goto('/repositories');
-				}, 1000);
+				goto('/repositories');
 				break;
 			case forgotPassword:
 				showModal = true;

src/routes/repositories/index.svelte

@@ -52,6 +52,7 @@
 		// @ts-ignore
 		if (!$session.authenticated) {
 			await goto('/auth/unauthorized');
+			return;
 		}
 
 		// @ts-ignore
@@ -119,8 +120,9 @@
 									y="0px"
 									viewBox="0 0 255 255"
 									xml:space="preserve"
-									><polygon class="fill-current" points="0,0 127.5,127.5 255,0" /></svg
 								>
+									<polygon class="fill-current" points="0,0 127.5,127.5 255,0" />
+								</svg>
 							</span>
 							<div id="arrow" data-popper-arrow />
 						</div>