From 396ea0bd53dc9e1ae1e348d6fe1eb3c36232b35b Mon Sep 17 00:00:00 2001
From: Dan Ribbens <DanRibbens@users.noreply.github.com>
Date: Fri, 2 Dec 2022 12:36:19 -0500
Subject: [PATCH] fix: reset password regression (#1574)

---
 .../components/views/Account/Default.tsx      |  2 +-
 .../views/collections/Edit/Auth/index.tsx     |  1 +
 src/collections/operations/update.ts          | 15 +++---
 src/versions/getLatestCollectionVersion.ts    |  6 ++-
 test/auth/config.ts                           | 11 ++++-
 test/auth/e2e.spec.ts                         | 46 +++++++++++++++++++
 test/auth/e2e.todo-spec.ts                    | 17 -------
 7 files changed, 70 insertions(+), 28 deletions(-)
 create mode 100644 test/auth/e2e.spec.ts
 delete mode 100644 test/auth/e2e.todo-spec.ts

diff --git a/src/admin/components/views/Account/Default.tsx b/src/admin/components/views/Account/Default.tsx
index 6a30742192..a76ddcca0d 100644
--- a/src/admin/components/views/Account/Default.tsx
+++ b/src/admin/components/views/Account/Default.tsx
@@ -138,7 +138,7 @@ const DefaultAccount: React.FC<Props> = (props) => {
                       data={data}
                     />
                     {hasSavePermission && (
-                    <FormSubmit>{t('general:save')}</FormSubmit>
+                    <FormSubmit buttonId="action-save">{t('general:save')}</FormSubmit>
                     )}
                   </div>
                   <div className={`${baseClass}__sidebar-fields`}>
diff --git a/src/admin/components/views/collections/Edit/Auth/index.tsx b/src/admin/components/views/collections/Edit/Auth/index.tsx
index 1a693b79be..48d668dc50 100644
--- a/src/admin/components/views/collections/Edit/Auth/index.tsx
+++ b/src/admin/components/views/collections/Edit/Auth/index.tsx
@@ -101,6 +101,7 @@ const Auth: React.FC<Props> = (props) => {
       )}
       {(!changingPassword && !requirePassword) && (
         <Button
+          id="change-password"
           size="small"
           buttonStyle="secondary"
           onClick={() => handleChangePassword(true)}
diff --git a/src/collections/operations/update.ts b/src/collections/operations/update.ts
index 4bb9c953a2..095081e3c7 100644
--- a/src/collections/operations/update.ts
+++ b/src/collections/operations/update.ts
@@ -72,13 +72,15 @@ async function update(incomingArgs: Arguments): Promise<Document> {
     autosave = false,
   } = args;
 
-  let { data } = args;
-
   if (!id) {
     throw new APIError('Missing ID of document to update.', httpStatus.BAD_REQUEST);
   }
 
+  let { data } = args;
+  const { password } = data;
   const shouldSaveDraft = Boolean(draftArg && collectionConfig.versions.drafts);
+  const shouldSavePassword = Boolean(password && collectionConfig.auth && !shouldSaveDraft);
+  const lean = !shouldSavePassword;
 
   // /////////////////////////////////////
   // Access
@@ -109,12 +111,13 @@ async function update(incomingArgs: Arguments): Promise<Document> {
 
   const query = await Model.buildQuery(queryToBuild, locale);
 
-  const doc = await getLatestCollectionVersion({ payload, collection, id, query });
+  const doc = await getLatestCollectionVersion({ payload, collection, id, query, lean });
 
   if (!doc && !hasWherePolicy) throw new NotFound(t);
   if (!doc && hasWherePolicy) throw new Forbidden(t);
 
-  const docWithLocales: Document = JSON.parse(JSON.stringify(doc));
+  let docWithLocales: Document = JSON.stringify(lean ? doc : doc.toJSON({ virtuals: true }));
+  docWithLocales = JSON.parse(docWithLocales);
 
   const originalDoc = await afterRead({
     depth: 0,
@@ -211,9 +214,7 @@ async function update(incomingArgs: Arguments): Promise<Document> {
   // Handle potential password update
   // /////////////////////////////////////
 
-  const { password } = data;
-
-  if (password && collectionConfig.auth && !shouldSaveDraft) {
+  if (shouldSavePassword) {
     await doc.setPassword(password as string);
     await doc.save();
     delete data.password;
diff --git a/src/versions/getLatestCollectionVersion.ts b/src/versions/getLatestCollectionVersion.ts
index 4b89b6c114..c5fd1f98c2 100644
--- a/src/versions/getLatestCollectionVersion.ts
+++ b/src/versions/getLatestCollectionVersion.ts
@@ -7,6 +7,7 @@ type Args = {
   collection: Collection,
   query: Record<string, unknown>
   id: string | number
+  lean?: boolean
 }
 
 export const getLatestCollectionVersion = async <T extends TypeWithID = any>({
@@ -17,6 +18,7 @@ export const getLatestCollectionVersion = async <T extends TypeWithID = any>({
   },
   query,
   id,
+  lean = true,
 }: Args): Promise<T> => {
   let version;
   if (config.versions?.drafts) {
@@ -24,10 +26,10 @@ export const getLatestCollectionVersion = async <T extends TypeWithID = any>({
       parent: id,
     }, {}, {
       sort: { updatedAt: 'desc' },
-      lean: true,
+      lean,
     });
   }
-  const collection = await Model.findOne(query).lean() as Document;
+  const collection = await Model.findOne(query, {}, { lean }) as Document;
   version = await version;
   if (!version || version.updatedAt < collection.updatedAt) {
     return collection;
diff --git a/test/auth/config.ts b/test/auth/config.ts
index be7065b4e5..ee4f5a63b9 100644
--- a/test/auth/config.ts
+++ b/test/auth/config.ts
@@ -1,4 +1,5 @@
 import { buildConfig } from '../buildConfig';
+import { devUser } from '../credentials';
 
 export const slug = 'users';
 
@@ -33,8 +34,16 @@ export default buildConfig({
           saveToJWT: true,
           hasMany: true,
         },
-
       ],
     },
   ],
+  onInit: async (payload) => {
+    await payload.create({
+      collection: 'users',
+      data: {
+        email: devUser.email,
+        password: devUser.password,
+      },
+    });
+  },
 });
diff --git a/test/auth/e2e.spec.ts b/test/auth/e2e.spec.ts
new file mode 100644
index 0000000000..f05a655580
--- /dev/null
+++ b/test/auth/e2e.spec.ts
@@ -0,0 +1,46 @@
+import type { Page } from '@playwright/test';
+import { expect, test } from '@playwright/test';
+import { AdminUrlUtil } from '../helpers/adminUrlUtil';
+import { initPayloadE2E } from '../helpers/configHelpers';
+import { login, saveDocAndAssert } from '../helpers';
+import { slug } from './config';
+
+/**
+ * TODO: Auth
+ *   create first user
+ *   unlock
+ *   generate api key
+ *   log out
+ */
+
+const { beforeAll, describe } = test;
+let url: AdminUrlUtil;
+
+describe('auth', () => {
+  let page: Page;
+
+  beforeAll(async ({ browser }) => {
+    const { serverURL } = await initPayloadE2E(__dirname);
+    url = new AdminUrlUtil(serverURL, slug);
+
+    const context = await browser.newContext();
+    page = await context.newPage();
+
+    await login({
+      page,
+      serverURL,
+    });
+  });
+
+  describe('authenticated users', () => {
+    test('should allow change password', async () => {
+      await page.goto(url.account);
+
+      await page.locator('#change-password').click();
+      await page.locator('#field-password').fill('password');
+      await page.locator('#field-confirm-password').fill('password');
+
+      await saveDocAndAssert(page);
+    });
+  });
+});
diff --git a/test/auth/e2e.todo-spec.ts b/test/auth/e2e.todo-spec.ts
deleted file mode 100644
index 07fdd878fd..0000000000
--- a/test/auth/e2e.todo-spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import type { Page } from '@playwright/test';
-import { expect, test } from '@playwright/test';
-import { AdminUrlUtil } from '../helpers/adminUrlUtil';
-import { initPayloadTest } from '../helpers/configHelpers';
-import { firstRegister } from '../helpers';
-import { slug } from './config';
-
-/**
- * TODO: Auth
- * change password
- * unlock
- * generate api key
- * log out
- */
-
-const { beforeAll, describe } = test;
-let url: AdminUrlUtil;