Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: OAuth URL account for dev environment #12530

Merged
merged 2 commits into from
Nov 24, 2023

Conversation

joeauyeung
Copy link
Contributor

What does this PR do?

This PR allows the WEBAPP_URL_FOR_OAUTH to account for our dev environment to use the WEBPP_URL instead of defaulting back to localhost.

Fixes # (issue)

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?

  • Are there environment variables that should be set?
  • What are the minimal test data to have?
  • What is expected (happy path) to have (input and output)?
  • Any other important info that could help to test that PR

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

Copy link

vercel bot commented Nov 24, 2023

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

Name Status Preview Comments Updated (UTC)
ai ✅ Ready (Inspect) Visit Preview 💬 Add feedback Nov 24, 2023 5:28pm
api ✅ Ready (Inspect) Visit Preview 💬 Add feedback Nov 24, 2023 5:28pm
dev ✅ Ready (Inspect) Visit Preview 💬 Add feedback Nov 24, 2023 5:28pm
4 Ignored Deployments
Name Status Preview Comments Updated (UTC)
cal ⬜️ Ignored (Inspect) Visit Preview Nov 24, 2023 5:28pm
cal-demo ⬜️ Ignored (Inspect) Nov 24, 2023 5:28pm
qa ⬜️ Ignored (Inspect) Visit Preview Nov 24, 2023 5:28pm
ui ⬜️ Ignored (Inspect) Visit Preview Nov 24, 2023 5:28pm

Copy link
Contributor

github-actions bot commented Nov 24, 2023

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

@zomars zomars added the core area: core, team members only label Nov 24, 2023
@@ -17,7 +18,7 @@ export const WEBAPP_URL =

// OAuth needs to have HTTPS(which is not generally setup locally) and a valid tld(*.local isn't a valid tld)
// So for development purpose, we would stick to localhost only
export const WEBAPP_URL_FOR_OAUTH = IS_PRODUCTION ? WEBAPP_URL : "http://localhost:3000";
export const WEBAPP_URL_FOR_OAUTH = IS_PRODUCTION || IS_DEV ? WEBAPP_URL : "http://localhost:3000";
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirmed in a replit that this will return true if either IS_PRODUCTION or IS_DEV is true.

Copy link
Contributor

github-actions bot commented Nov 24, 2023

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

Copy link

deploysentinel bot commented Nov 24, 2023

Current Playwright Test Results Summary

✅ 338 Passing - ⚠️ 8 Flaky

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

(Last updated on 11/24/2023 05:36:49pm UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: 37b5793

Started: 11/24/2023 05:29:49pm UTC

⚠️ Flakes

📄   apps/web/playwright/login.2fa.e2e.ts • 1 Flake

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
2FA Tests should allow a user to enable 2FA and login using 2FA
Retry 1Initial Attempt
0.37% (1) 1 / 267 run
failed over last 7 days
27.34% (73) 73 / 267 runs
flaked over last 7 days

📄   apps/web/playwright/teams.e2e.ts • 1 Flake

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Teams - NonOrg Can create a private team
Retry 1Initial Attempt
0% (0) 0 / 280 runs
failed over last 7 days
23.21% (65) 65 / 280 runs
flaked over last 7 days

📄   packages/embeds/embed-core/playwright/tests/action-based.e2e.ts • 4 Flakes

Top 1 Common Error Messages

null

4 Test Cases Affected

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Popup Tests should open embed iframe on click - Configured with light theme
Retry 1Initial Attempt
1.75% (5) 5 / 286 runs
failed over last 7 days
52.45% (150) 150 / 286 runs
flaked over last 7 days
Popup Tests should be able to reschedule
Retry 2Retry 1Initial Attempt
12.94% (37) 37 / 286 runs
failed over last 7 days
83.22% (238) 238 / 286 runs
flaked over last 7 days
Popup Tests Floating Button Popup Pro User - Configured in App with default setting of system theme should open embed iframe according to system theme when no theme is configured through Embed API
Retry 1Initial Attempt
2.78% (8) 8 / 288 runs
failed over last 7 days
63.19% (182) 182 / 288 runs
flaked over last 7 days
Popup Tests should open Routing Forms embed on click
Retry 1Initial Attempt
1.74% (5) 5 / 287 runs
failed over last 7 days
26.83% (77) 77 / 287 runs
flaked over last 7 days

📄   apps/web/playwright/organization/organization-creation.e2e.ts • 1 Flake

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Organization should be able to create an organization and complete onboarding
Retry 2Retry 1Initial Attempt
2.84% (4) 4 / 141 runs
failed over last 7 days
95.04% (134) 134 / 141 runs
flaked over last 7 days

📄   apps/web/playwright/booking/addressQuestione2e/addressQuestion.e2e.ts • 1 Flake

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Booking With Address Question and Each Other Question Booking With Address Question and Long text Question Addres required and Long Text required
Retry 1Initial Attempt
0% (0) 0 / 263 runs
failed over last 7 days
0.38% (1) 1 / 263 run
flaked over last 7 days

View Detailed Build Results


@hariombalhara hariombalhara enabled auto-merge (squash) November 24, 2023 17:28
@hariombalhara hariombalhara merged commit 0a43aa3 into main Nov 24, 2023
36 checks passed
@hariombalhara hariombalhara deleted the oauth-url-account-for-dev branch November 24, 2023 17:38
jakazzy pushed a commit to jakazzy/cal.com that referenced this pull request Dec 5, 2023
hbjORbj pushed a commit to codemod-com/cal.com-demo that referenced this pull request Dec 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core area: core, team members only
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants