From 6e255d196929449ea1dd3886fb53ed2f5d74f5fe Mon Sep 17 00:00:00 2001
From: Sebastian Oliver <sebo@aleios.com>
Date: Mon, 4 Sep 2023 10:26:12 +0200
Subject: [PATCH 1/3] fix: update api key now uses userId

---
 services/web-app/src/app/demo/page.tsx        |  37 ++++++++++++++++++
 services/web-app/{public => src/app}/icon.png | Bin
 services/web-app/src/app/profile/page.tsx     |  10 +++--
 .../src/components/textFields/codeBox.tsx     |  28 +++++++++++++
 .../components/textFields/reviewedCode.tsx    |  23 +++++++++++
 services/web-app/src/lib/constants.ts         |   2 +-
 services/web-app/src/lib/hooks/useAxios.tsx   |   2 +-
 .../src/pages/api/auth/[...nextauth].ts       |   2 +-
 services/web-app/types/next-auth.d.ts         |   5 ++-
 9 files changed, 100 insertions(+), 9 deletions(-)
 create mode 100644 services/web-app/src/app/demo/page.tsx
 rename services/web-app/{public => src/app}/icon.png (100%)
 create mode 100644 services/web-app/src/components/textFields/codeBox.tsx
 create mode 100644 services/web-app/src/components/textFields/reviewedCode.tsx

diff --git a/services/web-app/src/app/demo/page.tsx b/services/web-app/src/app/demo/page.tsx
new file mode 100644
index 00000000..2d909022
--- /dev/null
+++ b/services/web-app/src/app/demo/page.tsx
@@ -0,0 +1,37 @@
+"use client";
+import { useSession } from "next-auth/react";
+import React, { useState } from "react";
+
+import BasicButton from "../../components/buttons/basicButton";
+import Loading from "../../components/loading/loading";
+import CodeTextArea from "../../components/textFields/codeBox";
+import ReviewedCode from "../../components/textFields/reviewedCode";
+
+export default function Demo(): JSX.Element {
+  const { status } = useSession();
+  const [loading ] = useState(false);
+  const [passedText, setSyncedText] = useState<string>('');
+  const [displayedText, setDisplayedText] = useState<string>('');
+  const [isHidden, setIsHidden] = useState<boolean>(true);
+
+  const handleText = (text: string) => {
+    setSyncedText(text);
+  };
+
+  const onClick = () => {
+    setIsHidden(false);
+    setDisplayedText(passedText);
+  }
+
+  if (status === "loading" || loading) {
+    return <Loading />;
+  }
+
+  return (
+    <div className="flex flex-col items-center">
+      <CodeTextArea onTextChange={handleText} />
+      <BasicButton text="Review" onClick={onClick} styling="m-2" />
+      <ReviewedCode text={displayedText} isHidden={isHidden} />
+    </div>
+  );
+}
diff --git a/services/web-app/public/icon.png b/services/web-app/src/app/icon.png
similarity index 100%
rename from services/web-app/public/icon.png
rename to services/web-app/src/app/icon.png
diff --git a/services/web-app/src/app/profile/page.tsx b/services/web-app/src/app/profile/page.tsx
index 1311477a..f60e4390 100644
--- a/services/web-app/src/app/profile/page.tsx
+++ b/services/web-app/src/app/profile/page.tsx
@@ -4,9 +4,9 @@ import { RepoTable } from "@/components/tables/repoTable";
 import { useSession } from "next-auth/react";
 import Image from "next/image";
 import useAxios from "../../lib/hooks/useAxios";
-import { useEffect, useState } from "react";
-import { User } from "../../lib/types";
-import { ReturnToHome } from "../../components/cards/returnToHome";
+import React, { useEffect, useState } from "react";
+import { User } from "next-auth";
+import { ReturnToHome } from "@/components/cards/returnToHome";
 import UpdateAPIKey from "@/components/dialog/updateApiKey";
 
 export default function Profile(): JSX.Element {
@@ -47,9 +47,11 @@ export default function Profile(): JSX.Element {
 
   const handleUpdateApiKey = async (newApiKey: string) => {
     try {
+      console.log("user -> ", user);
+      console.log("session -> ", session);
       const response = await axiosInstance.post(`/updateUser`, {
-        userID: user.userId,
         apiKey: newApiKey,
+        userId: user.userId,
       });
       console.log("API key updated successfully:", response.data);
     } catch (error) {
diff --git a/services/web-app/src/components/textFields/codeBox.tsx b/services/web-app/src/components/textFields/codeBox.tsx
new file mode 100644
index 00000000..02a0d69d
--- /dev/null
+++ b/services/web-app/src/components/textFields/codeBox.tsx
@@ -0,0 +1,28 @@
+import React, { useState } from "react";
+
+interface CodeBoxProps {
+  onTextChange: (text: string) => void;
+}
+
+const CodeBox = ({ onTextChange }: CodeBoxProps): JSX.Element => {
+  const [inputText, setInputText] = useState('');
+  
+  const handleInputChange = (event: React.ChangeEvent<HTMLTextAreaElement>) => {
+    setInputText(event.target.value);
+    onTextChange(event.target.value);
+  };
+
+  return (
+    <>
+      <textarea 
+        className="bg-black font-mono p-3 mt-5 w-[60%] text-md text-white rounded-lg border-2 border-black" 
+        placeholder="Enter your code here..." 
+        rows={10}
+        onChange={handleInputChange}
+        value={inputText}
+      />
+    </>
+  );
+};
+
+export default CodeBox;
\ No newline at end of file
diff --git a/services/web-app/src/components/textFields/reviewedCode.tsx b/services/web-app/src/components/textFields/reviewedCode.tsx
new file mode 100644
index 00000000..86effb5c
--- /dev/null
+++ b/services/web-app/src/components/textFields/reviewedCode.tsx
@@ -0,0 +1,23 @@
+import React from "react";
+
+type ReviewedCodeProps = {
+  text: string;
+  isHidden: boolean;
+}
+
+const ReviewedCode = ({ text, isHidden }: ReviewedCodeProps): JSX.Element => {
+  if (isHidden || text.length === 0) {
+    return <></>;
+  }
+
+  return (
+    <textarea 
+      className="bg-black placeholder-white font-mono p-3 w-[60%] text-md text-white rounded-lg border-2 border-black" 
+      rows={10}
+      readOnly={true}
+      value={text}
+    />
+  );
+};
+
+export default ReviewedCode;
\ No newline at end of file
diff --git a/services/web-app/src/lib/constants.ts b/services/web-app/src/lib/constants.ts
index 43dcd035..cc621fab 100644
--- a/services/web-app/src/lib/constants.ts
+++ b/services/web-app/src/lib/constants.ts
@@ -1,4 +1,4 @@
-export const BASE_URL = "https://n1f8qnxszk.execute-api.eu-west-2.amazonaws.com/prod";
+export const BASE_URL = "https://9e0fli8qi6.execute-api.eu-west-2.amazonaws.com/prod";
 export const InstallationInstructions = `
 ## We give engineers their weekends back
 
diff --git a/services/web-app/src/lib/hooks/useAxios.tsx b/services/web-app/src/lib/hooks/useAxios.tsx
index e853ad74..289f6054 100644
--- a/services/web-app/src/lib/hooks/useAxios.tsx
+++ b/services/web-app/src/lib/hooks/useAxios.tsx
@@ -12,7 +12,7 @@ const useAxios = (): { axiosInstance: AxiosInstance } => {
   axiosInstance.interceptors.request.clear();
   axiosInstance.interceptors.request.use(
     (config) => {
-      config.headers.Authorization = (session as Session).token;
+      config.headers["Authorization"] = `Bearer ${(session as Session)?.token ?? ""}`;
       return config;
     }
   );
diff --git a/services/web-app/src/pages/api/auth/[...nextauth].ts b/services/web-app/src/pages/api/auth/[...nextauth].ts
index 613bf231..4f43311e 100644
--- a/services/web-app/src/pages/api/auth/[...nextauth].ts
+++ b/services/web-app/src/pages/api/auth/[...nextauth].ts
@@ -55,7 +55,7 @@ const authOptions: NextAuthOptions = {
     async session({ session, token }) {
       if (session.user) {
         session.user.id = token.sub;
-        session.token = token;
+        session.token = token.token;
       }
 
       return session;
diff --git a/services/web-app/types/next-auth.d.ts b/services/web-app/types/next-auth.d.ts
index eed08500..cef527f2 100644
--- a/services/web-app/types/next-auth.d.ts
+++ b/services/web-app/types/next-auth.d.ts
@@ -2,7 +2,7 @@ import { ISODateString } from "next-auth";
 
 declare module "next-auth" {
   interface Session {
-    token?: JWT;
+    token?: string;
     user?: User;
     expires?: ISODateString;
   }
@@ -10,8 +10,9 @@ declare module "next-auth" {
   interface User {
     name?: string;
     email?: string;
-    picture?: string;
+    pictureUrl?: string;
     id?: string;
+    repos?: [string];
   }
 }
 

From 4601b7b3030a34cc7e1049806a0f43fa4aca678e Mon Sep 17 00:00:00 2001
From: Sebastian Oliver <sebo@aleios.com>
Date: Mon, 4 Sep 2023 11:27:03 +0200
Subject: [PATCH 2/3] fix: changing user.id to user.userId

---
 services/web-app/functions/add-user/index.ts            | 2 +-
 services/web-app/src/app/profile/page.tsx               | 6 ++++--
 services/web-app/src/components/buttons/basicButton.tsx | 2 +-
 services/web-app/src/lib/hooks/useAxios.tsx             | 3 +--
 services/web-app/src/pages/api/auth/[...nextauth].ts    | 2 +-
 services/web-app/types/next-auth.d.ts                   | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/services/web-app/functions/add-user/index.ts b/services/web-app/functions/add-user/index.ts
index d98f3b8e..16dce0de 100644
--- a/services/web-app/functions/add-user/index.ts
+++ b/services/web-app/functions/add-user/index.ts
@@ -31,7 +31,7 @@ const postEmail = async (email: string, name: string) => {
 };
 
 // eslint-disable-next-line complexity
-export const main = async (event: DynamoDBStreamEvent): Promise<void> => {
+export const main = async (event: DynamoDBStreamEvent): Promise<object> => {
   if (event.Records.length === 0) {
     return Promise.resolve({
       statusCode: 400,
diff --git a/services/web-app/src/app/profile/page.tsx b/services/web-app/src/app/profile/page.tsx
index 99ced55a..6d37a391 100644
--- a/services/web-app/src/app/profile/page.tsx
+++ b/services/web-app/src/app/profile/page.tsx
@@ -37,12 +37,13 @@ export default async function Profile(): Promise<JSX.Element> {
         if (
           session === null ||
           session.user === undefined ||
-          session.user.id === undefined
+          session.user.userId === undefined
         ) {
           throw new Error("Session data not fetched correctly.");
         }
         const response = await axiosInstance.get(
-          `/getUser?userId=${session.user.id}`
+          // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+          `/getUser?userId=${session.user.userId}`
         );
         //We need response.data to be of type string so that it can be parsed into user data
         if (typeof response.data !== "string") {
@@ -83,6 +84,7 @@ export default async function Profile(): Promise<JSX.Element> {
       console.log("session -> ", session);
       const response = await axiosInstance.post(`/updateUser`, {
         apiKey: newApiKey,
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         userId: user.userId,
       });
       console.log("API key updated successfully:", response.data);
diff --git a/services/web-app/src/components/buttons/basicButton.tsx b/services/web-app/src/components/buttons/basicButton.tsx
index 886766e8..5b31cf48 100644
--- a/services/web-app/src/components/buttons/basicButton.tsx
+++ b/services/web-app/src/components/buttons/basicButton.tsx
@@ -9,7 +9,7 @@ export interface ButtonProps {
 const BasicButton: React.FC<ButtonProps> = ({ text, onClick, styling }) => {
   return (
     <button
-      className={`bg-black text-white sm:font-light font-extralight py-2 px-4 rounded ${styling}`}
+      className={`bg-black text-white sm:font-light font-extralight py-2 px-4 rounded ${styling ?? ""}`}
       onClick={onClick}
     >
       {text}
diff --git a/services/web-app/src/lib/hooks/useAxios.tsx b/services/web-app/src/lib/hooks/useAxios.tsx
index 97d8c6ce..6cb4fbe6 100644
--- a/services/web-app/src/lib/hooks/useAxios.tsx
+++ b/services/web-app/src/lib/hooks/useAxios.tsx
@@ -1,5 +1,4 @@
 import axios, { type AxiosInstance } from "axios";
-import { Session } from "next-auth";
 import { getSession } from "next-auth/react";
 
 import { BASE_URL } from "../constants";
@@ -20,7 +19,7 @@ const useAxios = async (): Promise<{ axiosInstance: AxiosInstance }> => {
   axiosInstance.interceptors.request.clear();
   axiosInstance.interceptors.request.use(
     (config) => {
-      config.headers["Authorization"] = `Bearer ${(session as Session)?.token ?? ""}`;
+      config.headers["Authorization"] = `Bearer ${session.token ?? ""}`;
       
       return config;
     }
diff --git a/services/web-app/src/pages/api/auth/[...nextauth].ts b/services/web-app/src/pages/api/auth/[...nextauth].ts
index 4f43311e..7a37a629 100644
--- a/services/web-app/src/pages/api/auth/[...nextauth].ts
+++ b/services/web-app/src/pages/api/auth/[...nextauth].ts
@@ -54,7 +54,7 @@ const authOptions: NextAuthOptions = {
     // eslint-disable-next-line @typescript-eslint/require-await
     async session({ session, token }) {
       if (session.user) {
-        session.user.id = token.sub;
+        session.user.userId = token.sub;
         session.token = token.token;
       }
 
diff --git a/services/web-app/types/next-auth.d.ts b/services/web-app/types/next-auth.d.ts
index 86b27729..ddcf7b79 100644
--- a/services/web-app/types/next-auth.d.ts
+++ b/services/web-app/types/next-auth.d.ts
@@ -11,7 +11,7 @@ declare module "next-auth" {
     name?: string;
     email?: string;
     pictureUrl?: string;
-    id?: string;
+    userId?: string;
     repos?: [string];
   }
 }

From dee3cb6da5dfe11b6d0c707ec2657df68d92f6a8 Mon Sep 17 00:00:00 2001
From: Sebastian Oliver <sebo@aleios.com>
Date: Mon, 4 Sep 2023 11:36:42 +0200
Subject: [PATCH 3/3] chore: requested changes

---
 services/web-app/src/app/profile/page.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/services/web-app/src/app/profile/page.tsx b/services/web-app/src/app/profile/page.tsx
index 6d37a391..190dd58d 100644
--- a/services/web-app/src/app/profile/page.tsx
+++ b/services/web-app/src/app/profile/page.tsx
@@ -80,8 +80,6 @@ export default async function Profile(): Promise<JSX.Element> {
 
   const handleUpdateApiKey = async (newApiKey: string) => {
     try {
-      console.log("user -> ", user);
-      console.log("session -> ", session);
       const response = await axiosInstance.post(`/updateUser`, {
         apiKey: newApiKey,
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment