From 8ceb98f770de9366af703bb97f51fce2649ec0c5 Mon Sep 17 00:00:00 2001
From: Flacial <ruthemiumwithdiamond@protonmail.com>
Date: Sun, 24 Jul 2022 03:54:29 +0400
Subject: [PATCH 1/7] test: Update snapshots

---
 .../__snapshots__/storyshots.test.js.snap     | 135 ++++++++++++++++--
 .../pages/__snapshots__/signup.test.js.snap   |  46 ++----
 2 files changed, 128 insertions(+), 53 deletions(-)

diff --git a/__tests__/__snapshots__/storyshots.test.js.snap b/__tests__/__snapshots__/storyshots.test.js.snap
index 66fa50660..daedb51b0 100644
--- a/__tests__/__snapshots__/storyshots.test.js.snap
+++ b/__tests__/__snapshots__/storyshots.test.js.snap
@@ -28344,6 +28344,16 @@ exports[`Storyshots Pages/Signup Signup 1`] = `
             placeholder="Last name"
             value=""
           />
+          <input
+            className="form-control form-control-lg fw-light mb-3 "
+            data-testid="password"
+            name="password"
+            onBlur={[Function]}
+            onChange={[Function]}
+            placeholder="Password"
+            type="password"
+            value=""
+          />
           <button
             className="btn btn-primary btn-lg btn mb-3"
             data-testid="submit"
@@ -28437,6 +28447,16 @@ exports[`Storyshots Pages/Signup Signup Basic 1`] = `
             placeholder="Last name"
             value=""
           />
+          <input
+            className="form-control form-control-lg fw-light mb-3 "
+            data-testid="password"
+            name="password"
+            onBlur={[Function]}
+            onChange={[Function]}
+            placeholder="Password"
+            type="password"
+            value=""
+          />
           <button
             className="btn btn-primary btn-lg btn mb-3"
             data-testid="submit"
@@ -28546,6 +28566,16 @@ exports[`Storyshots Pages/Signup Signup Errors 1`] = `
             placeholder="Last name"
             value=""
           />
+          <input
+            className="form-control form-control-lg fw-light mb-3 "
+            data-testid="password"
+            name="password"
+            onBlur={[Function]}
+            onChange={[Function]}
+            placeholder="Password"
+            type="password"
+            value=""
+          />
           <button
             className="btn btn-primary btn-lg btn mb-3"
             data-testid="submit"
@@ -28639,6 +28669,16 @@ exports[`Storyshots Pages/Signup Signup Loading 1`] = `
             placeholder="Last name"
             value=""
           />
+          <input
+            className="form-control form-control-lg fw-light mb-3 "
+            data-testid="password"
+            name="password"
+            onBlur={[Function]}
+            onChange={[Function]}
+            placeholder="Password"
+            type="password"
+            value=""
+          />
           <button
             className="btn btn-dark btn-lg btn mb-3"
             data-testid="submit"
@@ -28681,29 +28721,94 @@ exports[`Storyshots Pages/Signup Signup Success 1`] = `
     <div
       className="card-body text-center pt-5 pb-5"
     >
-      <img
-        alt="Green circle with a checkmark inside."
-        className="mb-4"
-        height="100px"
-        src="/assets/curriculum/icons/checked.svg"
-        width="100px"
-      />
       <h1
         className="card-title h2 fw-bold mb-5"
       >
-        Account created successfully!
+        Create Account
       </h1>
       <p
         className="card-text"
       />
-      <a
-        className="btn btn-primary noUnderline"
-        href="/confirm/undefined"
-        onClick={[Function]}
-        onMouseEnter={[Function]}
+      <form
+        action="#"
+        data-testid="form"
+        onReset={[Function]}
+        onSubmit={[Function]}
       >
-        Click here to set your password.
-      </a>
+        <div
+          className="form-group d-grid mt-3"
+        >
+          <input
+            autoFocus={true}
+            className="form-control form-control-lg fw-light mb-3 "
+            data-testid="email"
+            name="email"
+            onBlur={[Function]}
+            onChange={[Function]}
+            placeholder="Email address"
+            type="email"
+            value=""
+          />
+          <input
+            className="form-control form-control-lg fw-light mb-3 "
+            data-testid="username"
+            name="username"
+            onBlur={[Function]}
+            onChange={[Function]}
+            placeholder="Username"
+            value=""
+          />
+          <input
+            className="form-control form-control-lg fw-light mb-3 "
+            data-testid="firstName"
+            name="firstName"
+            onBlur={[Function]}
+            onChange={[Function]}
+            placeholder="First name"
+            value=""
+          />
+          <input
+            className="form-control form-control-lg fw-light mb-3 "
+            data-testid="lastName"
+            name="lastName"
+            onBlur={[Function]}
+            onChange={[Function]}
+            placeholder="Last name"
+            value=""
+          />
+          <input
+            className="form-control form-control-lg fw-light mb-3 "
+            data-testid="password"
+            name="password"
+            onBlur={[Function]}
+            onChange={[Function]}
+            placeholder="Password"
+            type="password"
+            value=""
+          />
+          <button
+            className="btn btn-primary btn-lg btn mb-3"
+            data-testid="submit"
+            type="submit"
+          >
+            Create Account
+          </button>
+        </div>
+      </form>
+      <p
+        className="text-black-50"
+      >
+        Already have an account?
+         
+        <a
+          className="text-primary link"
+          href="/login"
+          onClick={[Function]}
+          onMouseEnter={[Function]}
+        >
+          Login
+        </a>
+      </p>
     </div>
   </div>
 </div>
diff --git a/__tests__/pages/__snapshots__/signup.test.js.snap b/__tests__/pages/__snapshots__/signup.test.js.snap
index 68a711951..955725fed 100644
--- a/__tests__/pages/__snapshots__/signup.test.js.snap
+++ b/__tests__/pages/__snapshots__/signup.test.js.snap
@@ -70,6 +70,14 @@ exports[`Signup Page Should render errors on fail 1`] = `
               placeholder="Last name"
               value="fakelastname"
             />
+            <input
+              class="form-control form-control-lg fw-light mb-3 "
+              data-testid="password"
+              name="password"
+              placeholder="Password"
+              type="password"
+              value="fakepassword"
+            />
             <button
               class="btn btn-primary btn-lg btn mb-3"
               data-testid="submit"
@@ -96,41 +104,3 @@ exports[`Signup Page Should render errors on fail 1`] = `
   </div>
 </div>
 `;
-
-exports[`Signup Page Should render success component on success 1`] = `
-<div>
-  <div
-    class="row mt-5"
-  >
-    <div
-      class="card shadow-sm col-sm-8 col-md-7 col-lg-6 col-xl-6 m-auto px-md-5 border-0"
-    >
-      <div
-        class="card-body text-center pt-5 pb-5"
-      >
-        <img
-          alt="Green circle with a checkmark inside."
-          class="mb-4"
-          height="100px"
-          src="/assets/curriculum/icons/checked.svg"
-          width="100px"
-        />
-        <h1
-          class="card-title h2 fw-bold mb-5"
-        >
-          Account created successfully!
-        </h1>
-        <p
-          class="card-text"
-        />
-        <a
-          class="btn btn-primary noUnderline"
-          href="/confirm/undefined"
-        >
-          Click here to set your password.
-        </a>
-      </div>
-    </div>
-  </div>
-</div>
-`;

From 30449195613f8700646b077aa83d16fdd4087420 Mon Sep 17 00:00:00 2001
From: Flacial <ruthemiumwithdiamond@protonmail.com>
Date: Sun, 24 Jul 2022 03:55:01 +0400
Subject: [PATCH 2/7] feat: Update signup mutation to take password

---
 graphql/queries/signupUser.ts | 2 ++
 graphql/typeDefs.ts           | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/graphql/queries/signupUser.ts b/graphql/queries/signupUser.ts
index 33d753fd0..924dc1ebf 100644
--- a/graphql/queries/signupUser.ts
+++ b/graphql/queries/signupUser.ts
@@ -6,12 +6,14 @@ const SIGNUP_USER = gql`
     $lastName: String!
     $email: String!
     $username: String!
+    $password: String!
   ) {
     signup(
       firstName: $firstName
       lastName: $lastName
       email: $email
       username: $username
+      password: $password
     ) {
       success
       username
diff --git a/graphql/typeDefs.ts b/graphql/typeDefs.ts
index 54ebe3329..bfe9bfd16 100644
--- a/graphql/typeDefs.ts
+++ b/graphql/typeDefs.ts
@@ -32,7 +32,7 @@ export default gql`
       lastName: String!
       email: String!
       username: String!
-      password: String
+      password: String!
     ): AuthResponse
     addAlert(
       text: String!

From cebfdf810c31f16d69d504d8c3f06f578fb0909c Mon Sep 17 00:00:00 2001
From: Flacial <ruthemiumwithdiamond@protonmail.com>
Date: Sun, 24 Jul 2022 03:55:21 +0400
Subject: [PATCH 3/7] feat: Update signup resolver to handle password

---
 graphql/resolvers/authController.test.js |  7 +++++++
 graphql/resolvers/authController.ts      | 20 ++++++++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/graphql/resolvers/authController.test.js b/graphql/resolvers/authController.test.js
index 1361bdd73..32a249a5c 100644
--- a/graphql/resolvers/authController.test.js
+++ b/graphql/resolvers/authController.test.js
@@ -141,6 +141,13 @@ describe('auth controller', () => {
       ).rejects.toThrowError('User already exists')
     })
 
+    test('should reject if password is invalid', () => {
+      prismaMock.user.findFirst.mockResolvedValue(null)
+      return expect(
+        signup({}, { ...userArgs, password: '12' }, { req: { session: {} } })
+      ).rejects.toThrowError('Password does not meet criteria')
+    })
+
     test('should reject on second findOne. The first request checks for username, second request checks for email', () => {
       prismaMock.user.findFirst
         .mockResolvedValueOnce(null)
diff --git a/graphql/resolvers/authController.ts b/graphql/resolvers/authController.ts
index 7d8ea489a..7f47872ec 100644
--- a/graphql/resolvers/authController.ts
+++ b/graphql/resolvers/authController.ts
@@ -8,7 +8,10 @@ import type {
 } from '../../graphql'
 import prisma from '../../prisma'
 import { decode, encode } from '../../helpers/encoding'
-import { signupValidation } from '../../helpers/formValidation'
+import {
+  passwordValidation,
+  signupValidation
+} from '../../helpers/formValidation'
 import { sendSignupEmail } from '../../helpers/mail'
 
 const THREE_DAYS = 1000 * 60 * 60 * 24 * 3
@@ -92,9 +95,8 @@ export const signup = async (
   ctx: Context
 ) => {
   const { req } = ctx
-
   const { session } = req
-  const { firstName, lastName, username, email } = arg
+  const { firstName, lastName, username, email, password } = arg
 
   if (!session) {
     throw new Error('Session Error')
@@ -132,13 +134,22 @@ export const signup = async (
     throw new UserInputError('Email already exists')
   }
 
+  const validPw = await passwordValidation.isValid({ password })
+
+  if (!validPw) {
+    throw new UserInputError('Password does not meet criteria')
+  }
+
   const name = `${firstName} ${lastName}`
 
+  const hash = await bcrypt.hash(password, 10)
+
   let newUser = await prisma.user.create({
     data: {
       name,
       username,
-      email
+      email,
+      password: hash
     }
   })
 
@@ -168,6 +179,7 @@ export const signup = async (
       `)
   }
 
+  session.userId = newUser.id
   return {
     success: true,
     username: newUser.username,

From 5b5ef96e23ac37254ec4e6ab4e6f457923fa300b Mon Sep 17 00:00:00 2001
From: Flacial <ruthemiumwithdiamond@protonmail.com>
Date: Sun, 24 Jul 2022 03:55:47 +0400
Subject: [PATCH 4/7] feat: Refactor signup page

---
 __tests__/pages/signup.test.js | 22 +++++++-----
 pages/signup.tsx               | 62 +++++++++++++---------------------
 2 files changed, 37 insertions(+), 47 deletions(-)

diff --git a/__tests__/pages/signup.test.js b/__tests__/pages/signup.test.js
index fd19661b9..3a4b219e6 100644
--- a/__tests__/pages/signup.test.js
+++ b/__tests__/pages/signup.test.js
@@ -6,32 +6,39 @@ import SIGNUP_USER from '../../graphql/queries/signupUser'
 import SignupPage from '../../pages/signup'
 import userEvent from '@testing-library/user-event'
 import { getLayout } from '../../components/Layout'
+import { useRouter } from 'next/router'
 
 import dummySessionData from '../../__dummy__/sessionData'
 
 describe('Signup Page', () => {
+  const { push } = useRouter()
+
   const fakeEmail = 'fake@email.com'
   const fakeUsername = 'fakeusername'
   const fakeFirstName = 'fakefirstname'
   const fakeLastName = 'fakelastname'
+  const fakePassword = 'fakepassword'
 
   const fillOutSignupForm = async getByTestId => {
     const emailField = getByTestId('email')
     const usernameField = getByTestId('username')
     const firstNameField = getByTestId('firstName')
     const lastNameField = getByTestId('lastName')
+    const passwordField = getByTestId('password')
 
     // the type event needs to be delayed so the Formik validations finish
     await userEvent.type(emailField, fakeEmail, { delay: 1 })
     await userEvent.type(usernameField, fakeUsername, { delay: 1 })
     await userEvent.type(firstNameField, fakeFirstName, { delay: 1 })
     await userEvent.type(lastNameField, fakeLastName, { delay: 1 })
+    await userEvent.type(passwordField, fakePassword, { delay: 1 })
   }
 
   test('Should use Layout component getLayout ', async () => {
     expect(SignupPage.getLayout === getLayout).toBe(true)
   })
-  test('Should render success component on success', async () => {
+
+  test('Should redirect to /curriculum on success', async () => {
     const mocks = [
       {
         request: { query: GET_APP },
@@ -50,7 +57,8 @@ describe('Signup Page', () => {
             firstName: fakeFirstName,
             lastName: fakeLastName,
             email: fakeEmail,
-            username: fakeUsername
+            username: fakeUsername,
+            password: fakePassword
           }
         },
         result: {
@@ -65,7 +73,7 @@ describe('Signup Page', () => {
       }
     ]
 
-    const { container, getByTestId, getByText } = render(
+    const { getByTestId } = render(
       <MockedProvider mocks={mocks} addTypename={false}>
         <SignupPage />
       </MockedProvider>
@@ -76,10 +84,7 @@ describe('Signup Page', () => {
     await fillOutSignupForm(getByTestId)
     fireEvent.click(submitButton)
 
-    await waitFor(() => {
-      expect(getByText('Account created successfully!')).toBeTruthy()
-      expect(container).toMatchSnapshot()
-    })
+    await waitFor(() => expect(push).toBeCalledWith('/curriculum'))
   })
 
   test('Should render errors on fail', async () => {
@@ -101,7 +106,8 @@ describe('Signup Page', () => {
             firstName: fakeFirstName,
             lastName: fakeLastName,
             email: fakeEmail,
-            username: fakeUsername
+            username: fakeUsername,
+            password: fakePassword
           }
         },
         result: {
diff --git a/pages/signup.tsx b/pages/signup.tsx
index 0cc9a315d..712d6f3e3 100644
--- a/pages/signup.tsx
+++ b/pages/signup.tsx
@@ -22,35 +22,32 @@ import { WithLayout } from '../@types/page'
 import Title from '../components/Title'
 import { Spinner } from 'react-bootstrap'
 import Alert from '../components/Alert'
+import { useRouter } from 'next/router'
 
 type Values = {
   email: string
   username: string
   firstName: string
   lastName: string
+  password: string
 }
 
 type SignupFormProps = {
   handleSubmit: (values: Values) => void
   isLoading?: boolean
   signupErrors?: string[]
-  isSuccess?: boolean
-  forgotToken?: string
 }
 
 type ErrorDisplayProps = {
   signupErrors?: string[]
 }
 
-type SignupSuccessProps = {
-  forgotToken?: string
-}
-
 const initialValues: Values = {
   email: '',
   username: '',
   firstName: '',
-  lastName: ''
+  lastName: '',
+  password: ''
 }
 
 const ErrorMessage: React.FC<ErrorDisplayProps> = ({ signupErrors }) => {
@@ -61,18 +58,6 @@ const ErrorMessage: React.FC<ErrorDisplayProps> = ({ signupErrors }) => {
   return <>{errorMessages}</>
 }
 
-const SignupSuccess: React.FC<SignupSuccessProps> = ({ forgotToken }) => (
-  <Card
-    type="success"
-    data-testid="signup-success"
-    title="Account created successfully!"
-  >
-    <NavLink path={`/confirm/${forgotToken}`} className="btn btn-primary">
-      Click here to set your password.
-    </NavLink>
-  </Card>
-)
-
 const SignupForm: React.FC<SignupFormProps> = ({
   signupErrors,
   isLoading,
@@ -119,6 +104,14 @@ const SignupForm: React.FC<SignupFormProps> = ({
               as={Input}
             />
 
+            <Field
+              name="password"
+              placeholder="Password"
+              data-testid="password"
+              type="password"
+              as={Input}
+            />
+
             <button
               className={`btn ${
                 isLoading ? 'btn-dark' : 'btn-primary'
@@ -153,8 +146,7 @@ const SignupForm: React.FC<SignupFormProps> = ({
 const SignUpPage: React.FC<GetAppProps> & WithLayout = ({
   data: sessionData
 }) => {
-  const [signupSuccess, setSignupSuccess] = useState(false)
-  const [forgotToken, setForgotToken] = useState('')
+  const router = useRouter()
   const [isSubmitting, setIsSubmitting] = useState(false)
   const [signupErrors, setSignupErrors] = useState<string[]>([])
   const [signupUser] = useMutation(SIGNUP_USER)
@@ -164,12 +156,13 @@ const SignUpPage: React.FC<GetAppProps> & WithLayout = ({
     try {
       const { data } = await signupUser({ variables: values })
       if (data.signup.success) {
-        setForgotToken(data.signup.cliToken)
-        return setSignupSuccess(true)
+        return router.push('/curriculum')
       }
+
       const err = new Error(
         'Server Error: Server cannot be reached. Please try again. If this problem persists, please send an email to support@c0d3.com'
       )
+
       throw err
     } catch (error) {
       const graphQLErrors = _.get(error, 'graphQLErrors', [error])
@@ -179,6 +172,7 @@ const SignUpPage: React.FC<GetAppProps> & WithLayout = ({
         },
         []
       )
+
       setSignupErrors([...errorMessages])
     }
     setIsSubmitting(false)
@@ -194,8 +188,6 @@ const SignUpPage: React.FC<GetAppProps> & WithLayout = ({
       <Signup
         handleSubmit={handleSubmit}
         isLoading={isSubmitting}
-        isSuccess={signupSuccess}
-        forgotToken={forgotToken}
         signupErrors={signupErrors}
       />
     </>
@@ -204,23 +196,15 @@ const SignUpPage: React.FC<GetAppProps> & WithLayout = ({
 
 export const Signup: React.FC<SignupFormProps> = ({
   handleSubmit,
-  isSuccess,
   signupErrors,
-  isLoading,
-  forgotToken
+  isLoading
 }) => {
   return (
-    <>
-      {isSuccess ? (
-        <SignupSuccess forgotToken={forgotToken} />
-      ) : (
-        <SignupForm
-          handleSubmit={handleSubmit}
-          signupErrors={signupErrors}
-          isLoading={isLoading}
-        />
-      )}
-    </>
+    <SignupForm
+      handleSubmit={handleSubmit}
+      signupErrors={signupErrors}
+      isLoading={isLoading}
+    />
   )
 }
 

From 3ccbffa7eb5d210448af98effea4c69b70f1a7a9 Mon Sep 17 00:00:00 2001
From: Flacial <ruthemiumwithdiamond@protonmail.com>
Date: Sun, 24 Jul 2022 03:55:59 +0400
Subject: [PATCH 5/7] Update GraphQL index

---
 graphql/index.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/graphql/index.tsx b/graphql/index.tsx
index b979a0ce9..e9d959768 100644
--- a/graphql/index.tsx
+++ b/graphql/index.tsx
@@ -263,7 +263,7 @@ export type MutationSignupArgs = {
   email: Scalars['String']
   firstName: Scalars['String']
   lastName: Scalars['String']
-  password?: InputMaybe<Scalars['String']>
+  password: Scalars['String']
   username: Scalars['String']
 }
 
@@ -1026,6 +1026,7 @@ export type SignupMutationVariables = Exact<{
   lastName: Scalars['String']
   email: Scalars['String']
   username: Scalars['String']
+  password: Scalars['String']
 }>
 
 export type SignupMutation = {
@@ -1631,7 +1632,7 @@ export type MutationResolvers<
     ContextType,
     RequireFields<
       MutationSignupArgs,
-      'email' | 'firstName' | 'lastName' | 'username'
+      'email' | 'firstName' | 'lastName' | 'password' | 'username'
     >
   >
   updateChallenge?: Resolver<
@@ -4377,12 +4378,14 @@ export const SignupDocument = gql`
     $lastName: String!
     $email: String!
     $username: String!
+    $password: String!
   ) {
     signup(
       firstName: $firstName
       lastName: $lastName
       email: $email
       username: $username
+      password: $password
     ) {
       success
       username
@@ -4444,6 +4447,7 @@ export function withSignup<
  *      lastName: // value for 'lastName'
  *      email: // value for 'email'
  *      username: // value for 'username'
+ *      password: // value for 'password'
  *   },
  * });
  */

From a1ce0557dc3251aeb1e402cf79e09ad066c04b72 Mon Sep 17 00:00:00 2001
From: Flacial <ruthemiumwithdiamond@protonmail.com>
Date: Sun, 24 Jul 2022 03:59:24 +0400
Subject: [PATCH 6/7] test: Update signup page story

Pages should be removed from storybook because they can't be reused unlike components.
---
 stories/pages/Signup.stories.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/stories/pages/Signup.stories.tsx b/stories/pages/Signup.stories.tsx
index 0887f6b2f..aed15962b 100644
--- a/stories/pages/Signup.stories.tsx
+++ b/stories/pages/Signup.stories.tsx
@@ -36,9 +36,7 @@ export const _Signup: React.FC = () => {
 
 export const _SignupBasic: React.FC = () => <Signup handleSubmit={noop} />
 
-export const _SignupSuccess: React.FC = () => (
-  <Signup handleSubmit={noop} isSuccess={true} />
-)
+export const _SignupSuccess: React.FC = () => <Signup handleSubmit={noop} />
 
 export const _SignupErrors: React.FC = () => (
   <Signup handleSubmit={noop} signupErrors={errorMessages} />

From 340201cf43b6e6441a2db8cf71c85ae323426251 Mon Sep 17 00:00:00 2001
From: Flacial <ruthemiumwithdiamond@protonmail.com>
Date: Sun, 24 Jul 2022 04:04:02 +0400
Subject: [PATCH 7/7] ref: Update resolver to take a password

---
 helpers/nextAuth.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/helpers/nextAuth.ts b/helpers/nextAuth.ts
index 10a72b3a8..31f81e261 100644
--- a/helpers/nextAuth.ts
+++ b/helpers/nextAuth.ts
@@ -35,8 +35,7 @@ export const authorize =
           {
             username,
             email,
-            // Will be uncommented when signup takes password as argument
-            // password,
+            password,
             firstName,
             lastName
           },