Reintroduce SAML SSO by devkiran · Pull Request #4938 · calcom/cal.diy

devkiran · 2022-10-10T17:36:29Z

What does this PR do?

Fixes #4880

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

…nto boxyhq-saml-sso

vercel · 2022-10-10T17:36:34Z

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

A member of the Team first needs to authorize it.

socket-security · 2022-10-10T17:37:11Z

Socket Security Report

👍 No new dependency issues detected in pull request

Socket.dev scan summary

Issue	Status
Did you mean?	✅ no new possible package typos
Install scripts	✅ no new install scripts
Telemetry	✅ no new telemetry
Troll package	✅ no new troll packages
Malware	✅ no new malware
Native code	✅ no new native modules

Bot Commands

To ignore an alert, reply with a comment starting with @SocketSecurity ignore followed by a space separated list of package-name@version specifiers. e.g. @SocketSecurity ignore foo@1.0.0 bar@2.4.2

Powered by socket.dev

…nto boxyhq-saml-sso

…nto feat/saml-sso

devkiran · 2022-10-18T11:27:08Z

@deepakprabhakara @PeerRich

Self-hosted

Added the "Single Sign-On" menu under the tab Settings > Security. The application hides this menu on the hosted version of the Cal. Since this is an enterprise feature, CALCOM_LICENSE_KEY is required to access this feature, and only the SAML admin (SAML_ADMINS) can access the page. A message instructing the user to set the values will be displayed if the SAML_DATABASE_URL or SAML_ADMINS is empty.

Hosted

Added the "Single Sign-On" menu under each team. I have considered the following cases during the implementation into the team. Please let me know if I have covered every case. This menu is only visible on the hosted version and will redirect to /404 if the user tries accessing it on the self-hosted version. At the moment, only a user with a PRO plan can access the page, and the member should either ADMIN or OWNER of the team.

devkiran · 2022-10-18T11:30:43Z

  };
 };
+
+export const canAccess = async (


This method has been altered to send back appropriate messages in each case. This message will be displayed on the UI when TRPC throws an error https://github.com/calcom/cal.com/pull/4938/files#diff-015067416d87bbb0a3405527c31019007de06a40b377883a98b6e32623c2d0e5R25

PeerRich · 2022-10-18T12:49:41Z

hey @devkiran, thank you for the update. would you mind fixing the last merge conflict and we'll then review & merge 🙏

# Conflicts: # apps/web/pages/settings/security/sso.tsx # apps/web/pages/settings/teams/[id]/sso.tsx # apps/web/pages/v2/auth/login.tsx # apps/web/public/static/locales/en/common.json # yarn.lock

zomars

Simplified api endpoints and made some file organization fixes. Code LGTM testing on staging.

vercel · 2022-10-18T20:26:08Z

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

Name	Status	Preview	Updated
cal	✅ Ready (Inspect)	Visit Preview	Oct 18, 2022 at 8:36PM (UTC)

devkiran · 2022-10-19T04:00:18Z

@zomars thanks for helping me out with the merge and conflict.

* wip reintroduce SAML SSO * Fix the imports * wip * Some tweaks * Fix the type * Reduce the textarea height * Cleanup * Fix the access issues * Make the SAML SSO active on the sidebar * Add SP's instructions * Remove the console.log * Add the condition to check SAML SSO is enabled * Replace SAML SSO with Single Sign-On * Update to SAML feature * Upgrade the @boxyhq/saml-jackson * Fix the SAML part and other cleanup * Tweaks to SAML SSO setup * Fix the type * Fix the import path * Remove samlLoginUrl * Import fixes * Simplifies endpoints Co-authored-by: zomars <zomars@me.com>

Kiran and others added 20 commits October 7, 2022 20:22

wip reintroduce SAML SSO

3a57827

Fix the imports

aed4a70

Merge branch 'main' into boxyhq-saml-sso

cd3b67c

wip

8dd7f6f

Some tweaks

9d3683b

Fix the type

80f38be

Reduce the textarea height

289de34

Cleanup

637e3a8

Merge branch 'main' into boxyhq-saml-sso

88d495b

Fix the access issues

5d7787d

Make the SAML SSO active on the sidebar

b0bdbb7

Add SP's instructions

e6dcb6c

Remove the console.log

e2433f7

Add the condition to check SAML SSO is enabled

5ab8c76

Merge branch 'main' into boxyhq-saml-sso

8973850

Replace SAML SSO with Single Sign-On

eb54ee0

Merge branch 'main' into boxyhq-saml-sso

43bf60f

Merge branch 'boxyhq-saml-sso' of https://github.com/boxyhq/cal.com i…

3050a09

…nto boxyhq-saml-sso

Merge branch 'main' into boxyhq-saml-sso

4e0b3f9

Merge branch 'calcom:main' into boxyhq-saml-sso

8fd7eb7

devkiran changed the title ~~Feat/saml sso~~ Reintroduce SAML SSO Oct 10, 2022

devkiran marked this pull request as ready for review October 10, 2022 17:37

devkiran mentioned this pull request Oct 10, 2022

Reintroduce SAML SSO #4907

Closed

5 tasks

PeerRich enabled auto-merge (squash) October 10, 2022 20:37

zomars requested review from a team and deepakprabhakara October 10, 2022 23:32

Kiran added 2 commits October 14, 2022 14:34

Update to SAML feature

ded294b

Merge main

c369b9d

auto-merge was automatically disabled October 14, 2022 10:05
Head branch was pushed to by a user without write access

Kiran added 8 commits October 14, 2022 16:09

Merge branch 'boxyhq-saml-sso' of https://github.com/boxyhq/cal.com i…

d97e873

…nto boxyhq-saml-sso

Merge branch 'boxyhq-saml-sso' of https://github.com/boxyhq/cal.com i…

1dce7f6

…nto feat/saml-sso

Upgrade the @boxyhq/saml-jackson

8ac3b54

Fix the SAML part and other cleanup

8cbc320

Tweaks to SAML SSO setup

970db0d

Fix the type

d5d52c7

Fix the import path

071938f

Remove samlLoginUrl

fc6ce41

devkiran commented Oct 18, 2022

View reviewed changes

zomars added 3 commits October 18, 2022 14:10

Merge branch 'main' into pr/4938

d9f017b

# Conflicts: # apps/web/pages/settings/security/sso.tsx # apps/web/pages/settings/teams/[id]/sso.tsx # apps/web/pages/v2/auth/login.tsx # apps/web/public/static/locales/en/common.json # yarn.lock

Import fixes

aa2c0c6

Simplifies endpoints

fb7429e

zomars approved these changes Oct 18, 2022

View reviewed changes

zomars merged commit 759a89b into calcom:main Oct 18, 2022

vercel Bot deployed to Preview October 18, 2022 20:36 View deployment

devkiran deleted the feat/saml-sso branch October 19, 2022 04:00

servusrene mentioned this pull request Oct 26, 2022

[CAL-547] SSO settings are interchanged #5235

Closed

linear Bot mentioned this pull request Jan 11, 2023

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

Merged

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Reintroduce SAML SSO#4938

Reintroduce SAML SSO#4938
zomars merged 33 commits intocalcom:mainfrom
devkiran:feat/saml-sso

devkiran commented Oct 10, 2022 •

edited

Loading

Uh oh!

vercel Bot commented Oct 10, 2022

Uh oh!

socket-security Bot commented Oct 10, 2022 •

edited

Loading

Uh oh!

devkiran commented Oct 18, 2022

Uh oh!

devkiran Oct 18, 2022

Uh oh!

PeerRich commented Oct 18, 2022

Uh oh!

zomars left a comment

Uh oh!

vercel Bot commented Oct 18, 2022 •

edited

Loading

Uh oh!

devkiran commented Oct 19, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

devkiran commented Oct 10, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Type of change

Uh oh!

vercel Bot commented Oct 10, 2022

Uh oh!

socket-security Bot commented Oct 10, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Socket Security Report

Uh oh!

devkiran commented Oct 18, 2022

Self-hosted

Hosted

Uh oh!

devkiran Oct 18, 2022

Choose a reason for hiding this comment

Uh oh!

PeerRich commented Oct 18, 2022

Uh oh!

zomars left a comment

Choose a reason for hiding this comment

Uh oh!

vercel Bot commented Oct 18, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

devkiran commented Oct 19, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

devkiran commented Oct 10, 2022 •

edited

Loading

socket-security Bot commented Oct 10, 2022 •

edited

Loading

vercel Bot commented Oct 18, 2022 •

edited

Loading