Skip to content

fix: HOSTED_CAL_FEATURES env doesn't get passed to the frontend#6392

Merged
PeerRich merged 7 commits intomainfrom
5235-cal-547-sso-settings-are-interchanged
Jan 13, 2023
Merged

fix: HOSTED_CAL_FEATURES env doesn't get passed to the frontend#6392
PeerRich merged 7 commits intomainfrom
5235-cal-547-sso-settings-are-interchanged

Conversation

@G3root
Copy link
Copy Markdown
Contributor

@G3root G3root commented Jan 11, 2023

What does this PR do?

Fixes #5235.

after:
Screenshot 2023-01-11 at 12-19-17 Single Sign-On Cal com

Environment: Staging(main branch) / Production

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • Chore (refactoring code, technical debt, workflow improvements)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How should this be tested?

  • Test A
  • Test B

Checklist

  • I haven't read the contributing guide
  • My code doesn't follow the style guidelines of this project
  • I haven't performed a self-review of my own code and corrected any misspellings
  • I haven't commented my code, particularly in hard-to-understand areas
  • I haven't checked if my PR needs changes to the documentation
  • I haven't checked if my changes generate no new warnings
  • 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

@G3root G3root requested a review from zomars January 11, 2023 06:51
@G3root G3root linked an issue Jan 11, 2023 that may be closed by this pull request
[CAL-547] SSO settings are interchanged #5235
Closed
@linear
Copy link
Copy Markdown

linear bot commented Jan 11, 2023

CAL-547 SSO settings are interchanged

Issue Summary

Now I noticed that when I enable HOSTED_CAL_FEATURES, SSO is displayed in Security and not under Team. I suspect that is wrong with me.

Steps to Reproduce

  1. install cal.com self-hosted
  2. set HOSTED_CAL_FEATURES to '1'
  3. open settings and try sso

PR: #4938 (comment)

@vercel
Copy link
Copy Markdown

vercel bot commented Jan 11, 2023 •
edited
Loading

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

Name Status Preview Updated
cal ✅ Ready (Inspect) Visit Preview Jan 13, 2023 at 11:47PM (UTC)

@github-actions github-actions bot added the ❗️ .env changes contains changes to env variables label Jan 11, 2023
@G3root G3root added the docs area: docs, documentation, cal.com/docs label Jan 11, 2023
zomars
zomars approved these changes Jan 11, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@zomars zomars left a comment

Choose a reason for hiding this comment

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

LGTM

@PeerRich PeerRich enabled auto-merge (squash) January 12, 2023 20:48
@PeerRich PeerRich added ♻️ autoupdate tells kodiak to keep this branch up-to-date automerge labels Jan 13, 2023
@PeerRich PeerRich merged commit 965cff3 into main Jan 13, 2023
@PeerRich PeerRich deleted the 5235-cal-547-sso-settings-are-interchanged branch January 13, 2023 23:51
G3root added a commit that referenced this pull request Jan 14, 2023
@G3root @PeerRich
fix: HOSTED_CAL_FEATURES env doesn't get passed to the frontend (#6392
cd2dab9 
)

* fix: rename HOSTED_CAL_FEATURES into NEXT_PUBLIC_HOSTED_CAL_FEATURES

* chore: add the new env to example

* fix: docs link

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
@alishaz-polymath alishaz-polymath removed the docs area: docs, documentation, cal.com/docs label Aug 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@zomars zomars zomars approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

automerge ♻️ autoupdate tells kodiak to keep this branch up-to-date ❗️ .env changes contains changes to env variables

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[CAL-547] SSO settings are interchanged

4 participants

@G3root @zomars @PeerRich @alishaz-polymath