feat: Implement the ability to login via multiple means when signed up via google/non-cal providers #14082

asadath1395 · 2024-03-14T08:36:55Z

What does this PR do?

Fixes #13978

Type of change

Breaking change (fix or feature that would cause existing functionality to not work as expected)

How should this be tested?

Scenario 1

Create an account using google
Create account password by navigating to /settings/security/password
Follow the instructions in email to create the password
Now try logging in via google and email + password
Try changing the email and you should be able to login via google and newly created email + password

Scenario 2

Verify the steps in this PR #10288

Scenario 3

Follow Scenario 1
Now go to /settings/my-account/profile and try disconnecting the linked account
Now when you login via google, new account should be created and you should no longer be able to login to your old account using google

Mandatory Tasks

Make sure you have self-reviewed the code. A decent size PR without self-review might be rejected.

… via non-cal providers

vercel · 2024-03-14T08:37:01Z

@asadath1395 is attempting to deploy a commit to the cal Team on Vercel.

A member of the Team first needs to authorize it.

github-actions · 2024-03-14T08:37:09Z

Thank you for following the naming conventions! 🙏 Feel free to join our discord and post your PR link.

graphite-app · 2024-03-14T08:40:13Z

Graphite Automations

"Add consumer team as reviewer" took an action on this PR • (03/14/24)

1 reviewer was added to this PR based on Keith Williams's automation.

"Add community label" took an action on this PR • (03/14/24)

1 label was added to this PR based on Keith Williams's automation.

"Add foundation team as reviewer" took an action on this PR • (03/25/24)

1 reviewer was added to this PR based on Keith Williams's automation.

github-actions · 2024-03-14T08:46:23Z

📦 Next.js Bundle Analysis for @calcom/web

This analysis was generated by the Next.js Bundle Analysis action. 🤖

This PR introduced no changes to the JavaScript bundle! 🙌

…de cleanup

…account-password

…users manually disconnect connected accounts and refactor code

… SSO and email if account password is set

… with google using the same account

asadath1395 · 2024-03-25T06:08:24Z

apps/web/pages/auth/login.tsx

@@ -57,7 +57,7 @@ inferSSRProps<typeof getServerSideProps> & WithNonceProps<{}>) {
        .string()
        .min(1, `${t("error_required_field")}`)
        .email(`${t("enter_valid_email")}`),
-      password: !!totpEmail ? z.literal("") : z.string().min(1, `${t("error_required_field")}`),
+      ...(!!totpEmail ? {} : { password: z.string().min(1, `${t("error_required_field")}`) }),


The bug fixed in this PR #10288 resurfaced again, so fixed that too in this PR

asadath1395 · 2024-03-25T06:09:42Z

apps/web/pages/settings/my-account/profile.tsx

@@ -106,23 +106,16 @@ const ProfileView = () => {
  const updateProfileMutation = trpc.viewer.updateProfile.useMutation({
    onSuccess: async (res) => {
      await update(res);
-      // signout user only in case of password reset


This is part of legacy code when user created an account using google, then changed the email which send password reset code, the flow is changed in this PR

asadath1395 · 2024-03-25T06:11:36Z

packages/features/auth/lib/next-auth-options.ts

@@ -807,22 +807,6 @@ export const AUTH_OPTIONS: AuthOptions = {
              },
            });

-            // safely delete password from UserPassword table if it exists
-            try {


Previously when user created an account and then logged in via google then his password was deleted, now we no longer do that because we let users log in via google and email + password

…then creates account password

asadath1395 · 2024-04-02T06:29:28Z

@CarinaWolli Do you have the bandwidth to review this PR? Or maybe delegate it to someone from the team. Thank you!

zomars · 2024-04-10T19:53:41Z

This seems like a nice improvement! Will start reviewing soon. 🙏🏽

apps/web/pages/settings/my-account/profile.tsx

zomars

Tested locally and worked fine. Cannot test google login on Vercel preview deployments. Tests and checks are passing. Will merge and test on Canary before releasing.

emrysal · 2024-04-15T21:02:01Z

packages/trpc/server/routers/loggedInViewer/updateProfile.handler.ts

@@ -320,7 +316,7 @@ export const updateProfileHandler = async ({ ctx, input }: UpdateProfileOptions)
    });
  }

-  if (updatedUser && hasEmailChangedOnCalProvider) {
+  if (updatedUser) {


Woops, not putting hasEmailBeenChanged here caused email verification emails to be sent on every user profile update 👎

Oversight from my side, sorry about that. Thanks for fixing it :)

zomars · 2024-04-23T17:31:29Z

I just stumbled into an error in prod when trying to unlink a google account. Will post more details soon.

EDIT:

Here's the redacted stack trace:

 Error:  {"name":"PrismaClientValidationError","clientVersion":"5.4.2"}
Something went wrong Error: An error occured while querying the database.
    at redactError (/var/task/apps/web/.next/server/chunks/30267.js:1:621)
    ... 8 lines matching cause stack trace ...
    at async /var/task/node_modules/@sentry/nextjs/cjs/common/wrapApiHandlerWithSentry.js:153:35 {
  code: 'INTERNAL_SERVER_ERROR',
  name: 'TRPCError',
  [cause]: Error: An error occured while querying the database.
      at redactError (/var/task/apps/web/.next/server/chunks/30267.js:1:621)
      at /var/task/apps/web/.next/server/chunks/46279.js:1:1628
      at async callRecursive (file:///var/task/node_modules/@trpc/server/dist/unstable-core-do-not-import/procedureBuilder.mjs:125:32)
      at async procedure (file:///var/task/node_modules/@trpc/server/dist/unstable-core-do-not-import/procedureBuilder.mjs:155:24)
      at async inputToProcedureCall (file:///var/task/node_modules/@trpc/server/dist/unstable-core-do-not-import/http/resolveHTTPResponse.mjs:47:22)
      at async Promise.all (index 0)
      at async resolveHTTPResponse (file:///var/task/node_modules/@trpc/server/dist/unstable-core-do-not-import/http/resolveHTTPResponse.mjs:184:37)
      at async file:///var/task/node_modules/@trpc/server/dist/adapters/node-http/nodeHTTPRequestHandler.mjs:82:9
      at async file:///var/task/node_modules/@trpc/server/dist/adapters/next.mjs:47:9
      at async /var/task/node_modules/@sentry/nextjs/cjs/common/wrapApiHandlerWithSentry.js:153:35
}

feat: Implement the ability to add an account password when signed up…

f9e2764

… via non-cal providers

graphite-app bot added the community Created by Linear-GitHub Sync label Mar 14, 2024

graphite-app bot requested a review from a team March 14, 2024 08:37

asadath1395 marked this pull request as draft March 14, 2024 08:37

github-actions bot added authentication area: authentication, auth, google sign in, password, SAML, password reset, can't log in High priority Created by Linear-GitHub Sync ✨ feature New feature or request labels Mar 14, 2024

asadath1395 added 5 commits March 15, 2024 15:20

Complete the flow from creating account password to logging in and co…

c9fe4c1

…de cleanup

Merge with upstream and fix merge conflicts

b531692

Fix type errors

ab8b141

Merge branch 'main' of https://github.com/calcom/cal.com into create-…

7e7fed7

…account-password

Reuse existing logic to set account password via reset password, let …

e1dcf01

…users manually disconnect connected accounts and refactor code

github-actions bot added the ❗️ migrations contains migration files label Mar 18, 2024

asadath1395 added 6 commits March 18, 2024 17:41

Refactor code

8564a6d

Error thrown after saving due to wrong variables being used

3a0927d

Don't delete password during signins so as to let user login via both…

ed877e4

… SSO and email if account password is set

Fix email change flow for non cal providers and code cleanup

daa0799

Fix app not responding when user creates an account and then signs in…

7de6747

… with google using the same account

Merge with upstream

9236ac2

asadath1395 marked this pull request as ready for review March 25, 2024 06:07

asadath1395 commented Mar 25, 2024

View reviewed changes

Fix setting up 2fa option not shown when user logs in via google and …

7424fb4

…then creates account password

graphite-app bot requested a review from a team March 25, 2024 06:35

Merge branch 'main' into create-account-password

d20f97a

asadath1395 added 2 commits March 26, 2024 10:32

Merge branch 'main' into create-account-password

b42d3a6

Merge branch 'main' into create-account-password

b3acc27

keithwillcode added this to the v4.0 milestone Mar 27, 2024

asadath1395 changed the title ~~feat: Implement the ability to add an account password when signed up via non-cal providers~~ feat: Implement the ability to login via multiple means when signed up via google/non-cal providers Apr 1, 2024

Merge branch 'main' into create-account-password

c2526b1

Merge branch 'main' into pr/14082

ee220d3

zomars reviewed Apr 10, 2024

View reviewed changes

apps/web/pages/settings/my-account/profile.tsx Outdated Show resolved Hide resolved

zomars reviewed Apr 10, 2024

View reviewed changes

apps/web/pages/settings/my-account/profile.tsx Outdated Show resolved Hide resolved

Feedback

f6f2015

zomars added the high-risk Requires approval by Foundation team label Apr 10, 2024

vercel bot deployed to Preview – dev April 10, 2024 21:34 View deployment

zomars approved these changes Apr 10, 2024

View reviewed changes

zomars merged commit 4565c33 into calcom:main Apr 10, 2024
31 of 38 checks passed

emrysal reviewed Apr 15, 2024

View reviewed changes

zomars mentioned this pull request Apr 23, 2024

[CAL-3519] Error when trying to unlink a google account #14720

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Implement the ability to login via multiple means when signed up via google/non-cal providers #14082

feat: Implement the ability to login via multiple means when signed up via google/non-cal providers #14082

asadath1395 commented Mar 14, 2024 •

edited

vercel bot commented Mar 14, 2024

github-actions bot commented Mar 14, 2024 •

edited

graphite-app bot commented Mar 14, 2024 •

edited

github-actions bot commented Mar 14, 2024 •

edited

asadath1395 Mar 25, 2024

asadath1395 Mar 25, 2024

asadath1395 Mar 25, 2024 •

edited

asadath1395 commented Apr 2, 2024

zomars commented Apr 10, 2024

zomars left a comment •

edited

emrysal Apr 15, 2024

asadath1395 Apr 16, 2024

zomars commented Apr 23, 2024 •

edited

feat: Implement the ability to login via multiple means when signed up via google/non-cal providers #14082

feat: Implement the ability to login via multiple means when signed up via google/non-cal providers #14082

Conversation

asadath1395 commented Mar 14, 2024 • edited

What does this PR do?

Type of change

How should this be tested?

Scenario 1

Scenario 2

Scenario 3

Mandatory Tasks

vercel bot commented Mar 14, 2024

github-actions bot commented Mar 14, 2024 • edited

graphite-app bot commented Mar 14, 2024 • edited

Graphite Automations

github-actions bot commented Mar 14, 2024 • edited

📦 Next.js Bundle Analysis for @calcom/web

asadath1395 Mar 25, 2024

Choose a reason for hiding this comment

asadath1395 Mar 25, 2024

Choose a reason for hiding this comment

asadath1395 Mar 25, 2024 • edited

Choose a reason for hiding this comment

asadath1395 commented Apr 2, 2024

zomars commented Apr 10, 2024

zomars left a comment • edited

Choose a reason for hiding this comment

emrysal Apr 15, 2024

Choose a reason for hiding this comment

asadath1395 Apr 16, 2024

Choose a reason for hiding this comment

zomars commented Apr 23, 2024 • edited

asadath1395 commented Mar 14, 2024 •

edited

github-actions bot commented Mar 14, 2024 •

edited

graphite-app bot commented Mar 14, 2024 •

edited

github-actions bot commented Mar 14, 2024 •

edited

asadath1395 Mar 25, 2024 •

edited

zomars left a comment •

edited

zomars commented Apr 23, 2024 •

edited