Client-side changes for cryptographic login

src/Chat/Chat.tsx

@@ -13,10 +13,6 @@ import strings from "../Intl/strings.json";
 import { LangContext } from "../context";
 import { connectionAddress, endpoints } from "../consts";
 const Chat = ({ user }: { user: string }): React.ReactElement => {
-        const encryptMessage = (plaintext: string) => {
-                const ciphertext = plaintext;
-                return ciphertext;
-        }
         const lang = useContext(LangContext);
         const chatPage = strings[lang].chat;
         const [messages, setMessages] = useState<ReactElement[]>([]);
@@ -82,7 +78,7 @@ const Chat = ({ user }: { user: string }): React.ReactElement => {
                         type: MessageType.MESSAGE,
                         fromUserId: user,
                         toUserId: "everyone",
-                        content: encryptMessage(entryElement.value),
+                        content: entryElement.value,
                         timeMillis: Date.now(),
                 };
                 console.log(

src/Login/Login.tsx

@@ -1,10 +1,11 @@
 import { useContext, useState } from "react";
 import { contentTypes, domain, endpoints, port } from "../consts";
 import { LangContext, LoginType } from "../context";
-import { User } from "../type/userTypes";
+import { AuthData, User } from "../type/userTypes";
 import "./Login.css";
 import strings from "../Intl/strings.json";
 import { ECDH } from "crypto";
+import { digestMessage } from "../crypto";
 const encrypt = (rawPasswordString: string) => {
 	// TODO Encryption method stub
 	return rawPasswordString;
@@ -18,71 +19,77 @@ export const Login = ({
 	const [validText, setValidText] = useState<string | undefined>();
 	const lang = useContext(LangContext);
 	const loginPage = strings[lang].login;
+	// TODO mk unit test
 	const registrationHandler = () => {
 		const uname = (document.getElementById("username") as HTMLInputElement)
 			.value;
-		const passwd = encrypt(
+		digestMessage((document.getElementById("passwd") as HTMLInputElement).value).then((passwd) => {
-			(document.getElementById("passwd") as HTMLInputElement).value
+			fetch(`https://${domain}:${port}${endpoints.register}`, {
-		);
-		fetch(`https://${domain}:${port}${endpoints.user}`, {
 				method: "POST",
 				mode: "cors",
 				headers: contentTypes.json,
 				body: JSON.stringify({
 					userName: uname,
-				dateJoined: Date.now(),
+					newUserPassword: passwd,
-				passwordHash: passwd,
 				}),
-		}).then((response) => {
+			})
-			if (response.status === 400) {
+			.then((res) => res.json()).then((body) => {
-				// 400 Bad request
+				const response = body as AuthData;
-				console.log("Username is taken or invalid!");
+				if (response.exists && !response.success) {throw new Error(loginPage.error.unameTakenOrInvalid)}
-				setValid(false);
+				getProfile(uname).then((user) => {
-				setValidText(loginPage.error.unameTakenOrInvalid);
+					setValid(true);
-			} else if (response.status === 200) {
-				// 200 OK
 					const futureDate = new Date();
 					futureDate.setHours(futureDate.getHours() + 2);
 					setLogin({
-					username: uname,
+						username: user.userName,
 						lastSeen: Date.now(),
 						validUntil: futureDate.getUTCMilliseconds(),
 					});
-				document.title = `IRC User ${uname}`;
+					document.title = `IRC User ${user.userName}`;
-			}
+				});
+			})
+			.catch((error: Error) => {
+				setValid(false);
+				setValidText(error.message);
+			})
 		});
 	};
+
+	// TODO Make unit test
+	const getProfile = async(userName: string): Promise<User> => {
+		const res = await (await fetch(`https://${domain}:${port}${endpoints.user}?name=${userName}`,
+		{
+			method: "GET",
+			mode: "cors"
+		}
+		)).json()
+		return res;
+	}
 	// login button press handler
+	// TODO make unit test
 	const loginHandler = () => {
 		const uname = (document.getElementById("username") as HTMLInputElement)
 			.value;
-		const passwd = encrypt(
+		digestMessage(
 			(document.getElementById("passwd") as HTMLInputElement).value
-		);
+		).then((passwd) => {
 			// async invocation of Fetch API
-		fetch(`https://${domain}:${port}${endpoints.user}?name=${uname}`, {
+			fetch(`https://${domain}:${port}${endpoints.auth}`, {
-			method: "GET",
+				method: "POST",
 				mode: "cors",
+				headers: {"Content-Type": "application/json"},
+				body: JSON.stringify({
+					userName: uname,
+					userPasswordHash: passwd,
 				})
-			.then((res) => {
-				if (res.status === 404) {
-					console.log("404 not found encountered");
-					throw new Error(loginPage.error.unameNotExists);
-				} else if (res.status === 200) {
-					console.log("200 OK");
-				}
-				return res.json();
 			})
-			.then((userObject) => {
+				.then(res => res.json())
-				if (!userObject) {
+				.then((body) => {
-					return;
+					const response = body as AuthData;
-				}
+					if (!response.exists) {throw new Error(loginPage.error.unameNotExists)}
-				const user = userObject as User;
+					else if (!response.success) {throw new Error(loginPage.error.passwdInvalid)}
-				const validLogin = passwd === user.passwordHash;
+					else {
-				if (!validLogin) {
+						getProfile(uname).then((user) => {
-					// login invalid
-					throw new Error(loginPage.error.passwdInvalid);
-				} else {
 							// login valid
 							setValid(true);
 							const validUntilDate: Date = new Date();
@@ -93,12 +100,14 @@ export const Login = ({
 								validUntil: validUntilDate.getUTCMilliseconds(),
 							});
 							document.title = `IRC User ${uname}`;
+						});
 					}
 				})
 				.catch((reason: Error) => {
 					setValid(false);
 					setValidText(reason.message);
 				});
+			});
 	};
 	return (
 		<div className="login">

src/consts.ts

@@ -7,6 +7,7 @@ export const endpoints = {
 	history: "/api/v1/msg/",
 	user: "/api/v1/user",
 	auth: "/api/v1/auth",
+	register: "/api/v1/register",
 	oauth2: "",
 };
 export const contentTypes = {

src/crypto.ts

@@ -0,0 +1,15 @@
+export const ENCRYPTION_TYPE = "SHA-256";
+
+// Implemented according to https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/digest
+export const digestMessage = async (plaintext: string) => {
+    const textEncoder = new TextEncoder();
+    const digestArray = Array.from(
+        new Uint8Array(
+            await window.crypto.subtle.digest(
+                ENCRYPTION_TYPE, 
+                textEncoder.encode(plaintext)
+                )
+            )
+        )
+    return digestArray.map((byte) => byte.toString(16).padStart(2, "0")).join("");
+}

src/type/userTypes.ts

@@ -11,3 +11,10 @@ export type User = {
         passwordHash: string;
         // avatar: UserAvatar;
 };
+export type AuthData = {
+        success: boolean;
+        hasProfile: boolean;
+        exists: boolean;
+        authMessage: string;
+        authResponseTimestampMillis: number;
+}