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

Feature/sso signup #1555

Merged
merged 68 commits into from Feb 2, 2022
Merged

Feature/sso signup #1555

merged 68 commits into from Feb 2, 2022

Conversation

deepakprabhakara
Copy link
Contributor

@deepakprabhakara deepakprabhakara commented Jan 18, 2022

To be merged with calendso/website#47

What does this PR do?

Updates saml-jackson and supports Google and SAML signup via a redirect from the Cal.com website. It also allows signing in with multiple identities for the same email (only for self-hosted instances)

Type of change

  • New feature (non-breaking change which adds functionality)

How should this be tested?

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code and corrected any misspellings
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes

@vercel
Copy link

vercel bot commented Jan 18, 2022

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://vercel.com/cal/calendso/EgvqHoJpAu9rBZcfR4DacXtuf28w
✅ Preview: https://calendso-git-feature-sso-signup-cal.vercel.app

…his is causing the first record to be retrieved instead of the AND query failing
@vercel vercel bot temporarily deployed to Preview January 20, 2022 01:02 Inactive
@vercel vercel bot temporarily deployed to Preview January 20, 2022 01:05 Inactive
@vercel vercel bot temporarily deployed to Preview January 20, 2022 16:03 Inactive
@vercel vercel bot temporarily deployed to Preview January 21, 2022 14:23 Inactive
@vercel vercel bot temporarily deployed to Preview January 21, 2022 14:42 Inactive
@vercel vercel bot temporarily deployed to Preview January 21, 2022 23:13 Inactive
@vercel vercel bot temporarily deployed to Preview January 22, 2022 01:23 Inactive
@vercel vercel bot temporarily deployed to Preview January 22, 2022 01:27 Inactive
@vercel vercel bot temporarily deployed to Preview January 24, 2022 15:19 Inactive
@vercel vercel bot temporarily deployed to Preview January 24, 2022 15:22 Inactive
@vercel vercel bot temporarily deployed to Preview January 24, 2022 21:17 Inactive
@vercel vercel bot temporarily deployed to Preview January 25, 2022 01:15 Inactive
@vercel vercel bot temporarily deployed to Preview January 31, 2022 10:34 Inactive
@vercel vercel bot temporarily deployed to Preview February 1, 2022 10:20 Inactive
@vercel vercel bot temporarily deployed to Preview February 1, 2022 13:04 Inactive
# Conflicts:
#	pages/getting-started.tsx
#	yarn.lock
@vercel vercel bot temporarily deployed to Preview February 1, 2022 23:41 Inactive
@vercel vercel bot temporarily deployed to Preview February 2, 2022 11:08 Inactive
@vercel vercel bot temporarily deployed to Preview February 2, 2022 11:13 Inactive
@vercel vercel bot temporarily deployed to Preview February 2, 2022 11:32 Inactive
@vercel vercel bot temporarily deployed to Preview February 2, 2022 12:16 Inactive
@PeerRich
Copy link
Member

PeerRich commented Feb 2, 2022

merged calcom/website#47

@alishaz-polymath
Copy link
Member

Tested Google, works like a charm :)
Testing for SAML remaining...

Copy link
Contributor

@baileypumfleet baileypumfleet left a comment

Choose a reason for hiding this comment

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

Code looks good to me, will test shortly

Copy link
Member

@alishaz-polymath alishaz-polymath left a comment

Choose a reason for hiding this comment

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

  • The save button in /settings/security for SAML xml needs visual update
  • SAML currently doesn't work for users with existing account, this is not intended.
    Everything else works well :)

components/NavTabs.tsx Outdated Show resolved Hide resolved
- fixed Save button in SAML config component
@vercel vercel bot temporarily deployed to Preview February 2, 2022 15:55 Inactive
@deepakprabhakara
Copy link
Contributor Author

Thanks @alishaz-polymath. Save button has been fixed now. For existing accounts I block login from another identity provider if the email has not been verified yet (for security reasons). Otherwise it will go through (just re-tested here).

@PeerRich PeerRich enabled auto-merge (squash) February 2, 2022 18:32
@PeerRich PeerRich merged commit 7b65942 into main Feb 2, 2022
@PeerRich PeerRich deleted the feature/sso-signup branch February 2, 2022 18:33
buschco pushed a commit to buschco/calendso that referenced this pull request Mar 27, 2022
* updated saml-jackson

* if logged in redirect to getting-started page with username in the query param

* fixed issue with mixed up Google login, profile.id is undefined and this is causing the first record to be retrieved instead of the AND query failing

* updated updated saml-jackson

* document PGSSLMODE for Heroku

* tweaks to PGSSLMODE doc

* for self-hosted instance just allow user to signin with any identity (as long as email matches)

* fixed submitting flag

* added username to onboarding flow (if requested during signup)

* added telemetry for google login, saml login, saml config

* check if firstName and lastName are defined

* convert mutation to an async op

* added e2e test to ensure username query param gets picked up during onboarding

* fixed minor typo and added note about configuring Google integration as an Internal app when self-hosting

* cleaned up unnecessary ssr in sso signup routes

* renamed function

* Revert "cleaned up unnecessary ssr in sso signup routes"

This reverts commit 3607ffe.

* moved client side code to useEffect hook

* - format
- fixed Save button in SAML config component

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
♻️ autoupdate tells kodiak to keep this branch up-to-date ❗️ changes requested Waiting for the author to implement fixes/suggestions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants