Merge pull request #239 from mattzcarey/fix/update-api-request

fix: update api key now uses userId

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,

services/web-app/src/app/demo/page.tsx

@@ -1,10 +1,11 @@
 "use client";
 import { useSession } from "next-auth/react";
 import React, { useState } from "react";
-import Loading from "@/components/loading/loading";
-import CodeTextArea from "@/components/textFields/codeBox";
-import ReviewedCode from "@/components/textFields/reviewedCode";
-import BasicButton from "@/components/buttons/basicButton";
+
+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();

services/web-app/src/app/profile/page.tsx

@@ -1,5 +1,6 @@
 "use client";
 import Image from "next/image";
+import { User } from "next-auth";
 import { useSession } from "next-auth/react";
 import { useEffect, useState } from "react";
 
@@ -8,7 +9,6 @@ import UpdateAPIKey from "../../components/dialog/updateApiKey";
 import Loading from "../../components/loading/loading";
 import { RepoTable } from "../../components/tables/repoTable";
 import useAxios from "../../lib/hooks/useAxios";
-import { User } from "../../lib/types";
 
 const containsUserDataFields = (input: object): boolean =>
   "email" in input &&
@@ -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") {
@@ -80,8 +81,9 @@ export default async function Profile(): Promise<JSX.Element> {
   const handleUpdateApiKey = async (newApiKey: string) => {
     try {
       const response = await axiosInstance.post(`/updateUser`, {
-        userID: user.userId,
         apiKey: newApiKey,
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+        userId: user.userId,
       });
       console.log("API key updated successfully:", response.data);
     } catch (error) {

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}

services/web-app/src/components/textFields/reviewedCode.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-interface ReviewedCodeProps {
+type ReviewedCodeProps = {
   text: string;
   isHidden: boolean;
 }

services/web-app/src/lib/hooks/useAxios.tsx

@@ -17,13 +17,13 @@ const useAxios = async (): Promise<{ axiosInstance: AxiosInstance }> => {
   }
 
   axiosInstance.interceptors.request.clear();
-  axiosInstance.interceptors.request.use((config) => {
-    //TODO: investigate this as the Session type returned from does not seem to contain 'token'
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    config.headers.Authorization = session.token;
-
-    return config;
-  });
+  axiosInstance.interceptors.request.use(
+    (config) => {
+      config.headers["Authorization"] = `Bearer ${session.token ?? ""}`;
+      
+      return config;
+    }
+  );
 
   return { axiosInstance };
 };

services/web-app/src/pages/api/auth/[...nextauth].ts

@@ -54,8 +54,8 @@ const authOptions: NextAuthOptions = {
     // eslint-disable-next-line @typescript-eslint/require-await
     async session({ session, token }) {
       if (session.user) {
-        session.user.id = token.sub;
-        session.token = token;
+        session.user.userId = token.sub;
+        session.token = token.token;
       }
 
       return session;

services/web-app/types/next-auth.d.ts

@@ -2,16 +2,17 @@ import { JWT } from "next-auth/jwt";
 
 declare module "next-auth" {
   interface Session {
-    token?: JWT;
+    token?: string;
     user?: User;
     expires?: ISODateString;
   }
 
   interface User {
     name?: string;
     email?: string;
-    picture?: string;
-    id?: string;
+    pictureUrl?: string;
+    userId?: string;
+    repos?: [string];
   }
 }