fix stuff

Manest · Mar 10, 2022 · c77479e · c77479e
1 parent 510558d
commit c77479e
Show file tree

Hide file tree

Showing 6 changed files with 631 additions and 585 deletions.
diff --git a/app/routes/join.tsx b/app/routes/join.tsx
@@ -57,12 +57,12 @@ export const action: ActionFunction = async ({ request }) => {
 
   const user = await createUser(email, password);
 
-  return createUserSession(
+  return createUserSession({
     request,
-    user.id,
-    false,
-    typeof redirectTo === "string" ? redirectTo : "/"
-  );
+    userId: user.id,
+    remember: false,
+    redirectTo: typeof redirectTo === "string" ? redirectTo : "/",
+  });
 };
 
 export const meta: MetaFunction = () => {

diff --git a/app/routes/login.tsx b/app/routes/login.tsx
@@ -56,12 +56,12 @@ export const action: ActionFunction = async ({ request }) => {
     );
   }
 
-  return createUserSession(
+  return createUserSession({
     request,
-    user.id,
-    remember === "on" ? true : false,
-    typeof redirectTo === "string" ? redirectTo : "/notes"
-  );
+    userId: user.id,
+    remember: remember === "on" ? true : false,
+    redirectTo: typeof redirectTo === "string" ? redirectTo : "/notes",
+  });
 };
 
 export const meta: MetaFunction = () => {

diff --git a/app/session.server.ts b/app/session.server.ts
@@ -53,12 +53,17 @@ export async function requireUser(request: Request) {
   return getUserById(userId);
 }
 
-export async function createUserSession(
-  request: Request,
-  userId: string,
-  remember: boolean,
-  redirectTo: string
-) {
+export async function createUserSession({
+  request,
+  userId,
+  remember,
+  redirectTo,
+}: {
+  request: Request;
+  userId: string;
+  remember: boolean;
+  redirectTo: string;
+}) {
   const session = await getSession(request);
   session.set(USER_SESSION_KEY, userId);
   return redirect(redirectTo, {

diff --git a/cypress/support/create-user.ts b/cypress/support/create-user.ts
@@ -21,7 +21,12 @@ async function createAndLogin(email: string) {
 
   const user = await createUser(email, "myreallystrongpassword");
 
-  const response = await createUserSession(new Request(""), user.id, "/");
+  const response = await createUserSession({
+    request: new Request(""),
+    userId: user.id,
+    remember: false,
+    redirectTo: "/",
+  });
 
   const cookieValue = response.headers.get("Set-Cookie");
   if (!cookieValue) {