fix: If Invalid Calendar Credentials Then Skip Listing Calendars [CAL-2340] by joeauyeung · Pull Request #10720 · calcom/cal.com

joeauyeung · 2023-08-11T13:58:41Z

What does this PR do?

This PR wraps listing deleted selected calendars in a try/catch block so if the credentials are invalid the user are still able to delete the calendar app.

Fixes #10719

Requirement/Documentation

If there is a requirement document, please, share it here.
If there is ab UI/UX design document, please, share it here.

Type of change

Bug fix (non-breaking change which fixes an issue)

How should this be tested?

Add GCal
In the DB manipulate the access token to make it an invalid credential
Delete the integration

Mandatory Tasks

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

Checklist

I haven't added tests that prove my fix is effective or that my feature works
I haven't checked if new and existing unit tests pass locally with my changes

linear · 2023-08-11T13:58:44Z

CAL-2340 Unable to remove failed GCal connection

https://app.birdeatsbug.com/sessions/wQSg5sU5TAdfBFG8XTp1dmFkZfnPwhAKNwkUZ2--RXdY

Created via Threads. See full discussion: https://threads.com/messages/3ac5f762-2e64-4651-afa9-375ad13192ae?messageID=bdd8c76b-1c7f-4a90-942a-e6826edf082d

vercel · 2023-08-11T13:58:48Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
api	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Aug 11, 2023 8:42pm
cal-demo	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Aug 11, 2023 8:42pm
dev	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Aug 11, 2023 8:42pm
ui	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Aug 11, 2023 8:42pm

2 Ignored Deployments

Name	Status	Preview	Comments	Updated (UTC)
cal	⬜️ Ignored (Inspect)	Visit Preview		Aug 11, 2023 8:42pm
qa	⬜️ Ignored (Inspect)	Visit Preview		Aug 11, 2023 8:42pm

github-actions · 2023-08-11T13:58:57Z

Thank you for following the naming conventions! 🙏

alwaysmeticulous · 2023-08-11T14:01:45Z

🤖 Meticulous spotted visual differences in 27 of 114 screens tested: view and approve differences detected.

_{Last updated for commit 74e3e66. This comment will update as new commits are pushed.}

github-actions · 2023-08-11T14:06:07Z

📦 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! 🙌

deploysentinel · 2023-08-11T14:06:52Z

Current Playwright Test Results Summary

✅ 116 Passing - ⚠️ 1 Flaky

Run may still be in progress, this comment will be updated as current testing workflow or job completes...

(Last updated on 08/11/2023 08:42:25pm UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: 74e3e66

Started: 08/11/2023 08:41:01pm UTC

⚠️ Flakes

📄 packages/embeds/embed-core/playwright/tests/action-based.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Popup Tests should be able to reschedule Retry 1 • Initial Attempt	5.02% (16) 16 / 319 runs failed over last 7 days	94.98% (303) 303 / 319 runs flaked over last 7 days

View Detailed Build Results

pumfleet

Read through code and it looks good to me

zomars · 2023-08-11T20:36:37Z

so if the credentials are invalid the user are still able to delete the calendar app.

What are invalid credentials in this context? Does this means that invalid credentials cannot be deleted anymore?

emrysal · 2023-08-11T21:20:16Z

@zomars rather the other way around in this case, when deleting a credential, selectedCalendar would be removed first which triggered an error - crashing credential deletion. @joeauyeung how does a user get rid of the selectedCalendar?

Co-authored-by: Omar López <zomars@me.com>

joeauyeung · 2023-08-14T13:40:08Z

@zomars rather the other way around in this case, when deleting a credential, selectedCalendar would be removed first which triggered an error - crashing credential deletion. @joeauyeung how does a user get rid of the selectedCalendar?

Let's say that a user sees an error on the calendar page that there was an error fetching their calendar and to reinstall the integration. If there was a problem with fetching their calendars to begin without, without the try/catch block it would throw an error saying that calendars could not be retrieved. @zomars @emrysal

* Init + get timezone + offset data agh * Add 12/24h mode - style correctly * User users timezone + working hours. Still some stuff to figure out * Multiple working hours * move calc to once per day * Demo with two users and differnt timezones * availabillity control tab via search params * WIP hover overlay * THIS WORKS ISH * fix: multiple duration getSchedule calls [CAL-2336] (#10709) Co-authored-by: Omar López <zomars@me.com> * New Crowdin translations by Github Action * fix: If the input type "Name" is selected, the label can't be changed from our default label "Your Name" (#10618) Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> * New Crowdin translations by Github Action * test: Create unit tests for react components in packages/ui/components/form/step (#10442) Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com> Co-authored-by: Keith Williams <keithwillcode@gmail.com> * feat: element call app added (#10585) Co-authored-by: Hariom Balhara <hariombalhara@gmail.com> * New Crowdin translations by Github Action * New Crowdin translations by Github Action * fix: e2e test for rescheduling overlapping time (#10721) Co-authored-by: CarinaWolli <wollencarina@gmail.com> * feat: mailhog fixture (#10606) * feat: mailhog fixture * fix: nodemailer to dispatch emails with e2e env * fix: remove space from email subject * feat: fixture getFirstEventAsOwner * feat: assert email subjects * fix: and enable dynamic booking test (#10642) * fix and enable dynamic booking test * remove page pause --------- Co-authored-by: Alex van Andel <me@alexvanandel.com> * fix: Broken team events if a user with the same name exists (#10724) * fix: Broken team events if a user with the same name exists * Fix tests + fix usernameList optionality * Try to list calendars, if not continue (#10720) Co-authored-by: Omar López <zomars@me.com> * v3.1.9 * link to org settings (#10718) * feat: app paypal payment (#8797) Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Co-authored-by: Omar López <zomars@me.com> * fix: RTL issues on booking pages + email confirmation (#10526) Co-authored-by: Peer Richelsen <peeroke@gmail.com> * fix: merge conflict * Fixing org slug (#10538) * fix: paypal build fixes * Fix avatar for org in Shell top (#10712) * feat: add range of dates for availability over-ride (#10462) * feat: add range of dates for availability over-ride * chore: changed range select to multiple select --------- Co-authored-by: Alex van Andel <me@alexvanandel.com> * fix: border issue for time slots (#10577) Co-authored-by: Raghul D <v-raghuld@microsoft.com> * style: Fix text wrapping issue in button (#10725) Co-authored-by: Omar López <zomars@me.com> * New Crowdin translations by Github Action * fix: App Install Dropdown Sort Properly [CAL-2285] (#10672) Co-authored-by: Peer Richelsen <peeroke@gmail.com> * fix: link escaping in booking page (#10360) Co-authored-by: Hariom Balhara <hariombalhara@gmail.com> * chore: fix refund i18n message (#10731) * chore: remove tailwind-scrollbar warning (#10523) Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> * New Crowdin translations by Github Action * chore: Simplified date overrides (#10728) * chore: Simplified date overrides * Fixed a test that had a date override that wasn't at midnight utc * Wrote test that showed a fixed Europe/Brussels * Lint fix * New Crowdin translations by Github Action * Fix offset time + fetching correct dates * Deal with awkward minute offsets * remove store overhead * Format H based on tz * Cleanup store logic * Cleanup * Remove comments * Remove comments * Remove yarn.lock * Dark mode & v-align text fixes * Move ButtonGroup to the left to prevent chevron from jumping * Shift based on timezone (non-hour) and have 15min granularity in hour display background color --------- Co-authored-by: Leo Giovanetti <hello@leog.me> Co-authored-by: Omar López <zomars@me.com> Co-authored-by: Crowdin Bot <support+bot@crowdin.com> Co-authored-by: Zain Gulbaz <zaingulbaz8@gmail.com> Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> Co-authored-by: GitStart-Cal.com <121884634+gitstart-calcom@users.noreply.github.com> Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com> Co-authored-by: Keith Williams <keithwillcode@gmail.com> Co-authored-by: Suyash Srivastava <suyashsrivastava5053@gmail.com> Co-authored-by: Hariom Balhara <hariombalhara@gmail.com> Co-authored-by: CarinaWolli <wollencarina@gmail.com> Co-authored-by: Shivam Kalra <shivamkalra98@gmail.com> Co-authored-by: alannnc <alannnc@gmail.com> Co-authored-by: Alex van Andel <me@alexvanandel.com> Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Co-authored-by: Pradumn Kumar <pradumn@tealfeed.com> Co-authored-by: Raghul <123321540+Raghul18@users.noreply.github.com> Co-authored-by: Raghul D <v-raghuld@microsoft.com> Co-authored-by: ABDERRAHMANI IDRISSI HAMZA <97639117+idrissi-hamza@users.noreply.github.com> Co-authored-by: Nafees Nazik <84864519+G3root@users.noreply.github.com> Co-authored-by: Danila <daniil.demidovich@gmail.com> Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>

Try to list calendars, if not continue

77c0f95

joeauyeung requested a review from a team August 11, 2023 13:58

joeauyeung self-assigned this Aug 11, 2023

github-actions bot added the 🐛 bug Something isn't working label Aug 11, 2023

zomars added the core area: core, team members only label Aug 11, 2023

vercel bot deployed to Preview – ui August 11, 2023 14:00 View deployment

vercel bot deployed to Preview – dev August 11, 2023 14:01 View deployment

vercel bot deployed to Preview – api August 11, 2023 14:02 View deployment

vercel bot deployed to Preview – cal-demo August 11, 2023 14:03 View deployment

keithwillcode requested a review from a team August 11, 2023 14:19

pumfleet approved these changes Aug 11, 2023

View reviewed changes

Merge branch 'main' into fix/deleting-invalid-calendars

74e3e66

vercel bot deployed to Preview – ui August 11, 2023 20:37 View deployment

vercel bot deployed to Preview – api August 11, 2023 20:39 View deployment

vercel bot deployed to Preview – dev August 11, 2023 20:40 View deployment

vercel bot deployed to Preview – cal-demo August 11, 2023 20:42 View deployment

emrysal merged commit 8356cb7 into main Aug 11, 2023

emrysal deleted the fix/deleting-invalid-calendars branch August 11, 2023 21:19

sean-brydon pushed a commit that referenced this pull request Aug 14, 2023

Try to list calendars, if not continue (#10720)

36fed35

Co-authored-by: Omar López <zomars@me.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: If Invalid Calendar Credentials Then Skip Listing Calendars [CAL-2340]#10720

fix: If Invalid Calendar Credentials Then Skip Listing Calendars [CAL-2340]#10720
emrysal merged 2 commits intomainfrom
fix/deleting-invalid-calendars

joeauyeung commented Aug 11, 2023

Uh oh!

linear bot commented Aug 11, 2023

Uh oh!

vercel bot commented Aug 11, 2023 •

edited

Loading

Uh oh!

github-actions bot commented Aug 11, 2023 •

edited

Loading

Uh oh!

alwaysmeticulous bot commented Aug 11, 2023 •

edited

Loading

Uh oh!

github-actions bot commented Aug 11, 2023 •

edited

Loading

Uh oh!

deploysentinel bot commented Aug 11, 2023 •

edited

Loading

Test Case Results

Uh oh!

pumfleet left a comment

Uh oh!

zomars commented Aug 11, 2023

Uh oh!

emrysal commented Aug 11, 2023 •

edited

Loading

Uh oh!

joeauyeung commented Aug 14, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

joeauyeung commented Aug 11, 2023

What does this PR do?

Requirement/Documentation

Type of change

How should this be tested?

Mandatory Tasks

Checklist

Uh oh!

linear bot commented Aug 11, 2023

Uh oh!

vercel bot commented Aug 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Aug 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

alwaysmeticulous bot commented Aug 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Aug 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📦 Next.js Bundle Analysis for @calcom/web

Uh oh!

deploysentinel bot commented Aug 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Current Playwright Test Results Summary

⚠️ Flakes

Test Case Results

Uh oh!

pumfleet left a comment

Choose a reason for hiding this comment

Uh oh!

zomars commented Aug 11, 2023

Uh oh!

emrysal commented Aug 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

joeauyeung commented Aug 14, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

vercel bot commented Aug 11, 2023 •

edited

Loading

github-actions bot commented Aug 11, 2023 •

edited

Loading

alwaysmeticulous bot commented Aug 11, 2023 •

edited

Loading

github-actions bot commented Aug 11, 2023 •

edited

Loading

deploysentinel bot commented Aug 11, 2023 •

edited

Loading

emrysal commented Aug 11, 2023 •

edited

Loading