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

feat: Option to disable 2FA for OAuth users #32945

Merged
merged 29 commits into from
Sep 10, 2024

Conversation

yash-rajpal
Copy link
Member

@yash-rajpal yash-rajpal commented Jul 30, 2024

Proposed changes (including videos or screenshots)

Since SSO users are already verified and coming from a reliable source, we don't necessarily need to authenticate TOTP for these users.

Added a new setting which allows workspace admins to disable email two factor authentication for SSO (OAuth) users. If enabled, SSO users won't be asked for email two factor authentication.

Issue(s)

Steps to test or reproduce

Further comments

CORE-566

Copy link
Contributor

dionisio-bot bot commented Jul 30, 2024

Looks like this PR is ready to merge! 🎉
If you have any trouble, please check the PR guidelines

Copy link

changeset-bot bot commented Jul 30, 2024

🦋 Changeset detected

Latest commit: b878dc7

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 34 packages
Name Type
@rocket.chat/i18n Minor
@rocket.chat/meteor Minor
@rocket.chat/mock-providers Patch
@rocket.chat/ui-contexts Major
@rocket.chat/web-ui-registration Major
@rocket.chat/fuselage-ui-kit Major
@rocket.chat/ui-client Major
@rocket.chat/gazzodown Major
@rocket.chat/livechat Patch
@rocket.chat/ui-avatar Major
@rocket.chat/ui-video-conf Major
@rocket.chat/uikit-playground Patch
@rocket.chat/core-typings Minor
@rocket.chat/rest-typings Minor
@rocket.chat/api-client Patch
@rocket.chat/apps Patch
@rocket.chat/core-services Patch
@rocket.chat/cron Patch
@rocket.chat/ddp-client Patch
@rocket.chat/model-typings Patch
@rocket.chat/account-service Patch
@rocket.chat/authorization-service Patch
@rocket.chat/ddp-streamer Patch
@rocket.chat/omnichannel-transcript Patch
@rocket.chat/presence-service Patch
@rocket.chat/queue-worker Patch
@rocket.chat/stream-hub-service Patch
@rocket.chat/license Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/models Patch
@rocket.chat/instance-status Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

Copy link

codecov bot commented Jul 30, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 59.79%. Comparing base (4146c39) to head (b878dc7).
Report is 1 commits behind head on develop.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #32945      +/-   ##
===========================================
+ Coverage    59.32%   59.79%   +0.47%     
===========================================
  Files         2548     2548              
  Lines        63415    63412       -3     
  Branches     14269    14267       -2     
===========================================
+ Hits         37622    37920     +298     
+ Misses       23090    23076      -14     
+ Partials      2703     2416     -287     
Flag Coverage Δ
unit 76.84% <ø> (+1.74%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

@yash-rajpal yash-rajpal marked this pull request as ready for review July 31, 2024 16:47
@yash-rajpal yash-rajpal requested review from a team as code owners July 31, 2024 16:47
Copy link
Contributor

@KevLehman KevLehman left a comment

Choose a reason for hiding this comment

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

  • Add a PR description
  • Is it possible to have some tests? I think 2FA is disabled on TEST_MODE so some units would suffice

apps/meteor/app/2fa/server/code/EmailCheck.ts Outdated Show resolved Hide resolved
@yash-rajpal yash-rajpal requested a review from a team as a code owner August 2, 2024 15:59
packages/core-typings/src/IUser.ts Outdated Show resolved Hide resolved
packages/core-typings/src/IUser.ts Outdated Show resolved Hide resolved
packages/core-typings/src/IUser.ts Show resolved Hide resolved
packages/core-typings/src/IUser.ts Outdated Show resolved Hide resolved
packages/core-typings/src/IUser.ts Outdated Show resolved Hide resolved
packages/core-typings/src/IUser.ts Outdated Show resolved Hide resolved
packages/core-typings/src/IUser.ts Outdated Show resolved Hide resolved
apps/meteor/app/api/server/v1/misc.ts Outdated Show resolved Hide resolved
apps/meteor/app/api/server/v1/misc.ts Show resolved Hide resolved
packages/core-typings/src/IUser.ts Outdated Show resolved Hide resolved
packages/core-typings/src/IUser.ts Outdated Show resolved Hide resolved
packages/core-typings/src/IUser.ts Outdated Show resolved Hide resolved
apps/meteor/app/api/server/v1/misc.ts Outdated Show resolved Hide resolved
@jessicaschelly jessicaschelly added the stat: QA assured Means it has been tested and approved by a company insider label Aug 21, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Aug 21, 2024
KevLehman
KevLehman previously approved these changes Aug 21, 2024
@yash-rajpal yash-rajpal requested review from a team and removed request for tassoevan, MarcosSpessatto, matheusbsilva137 and a team August 21, 2024 19:08
packages/i18n/src/locales/en.i18n.json Outdated Show resolved Hide resolved
apps/meteor/app/2fa/server/code/EmailCheck.ts Outdated Show resolved Hide resolved
apps/meteor/server/settings/accounts.ts Outdated Show resolved Hide resolved
@scuciatto scuciatto modified the milestones: 6.12, 6.13 Aug 23, 2024
@dionisio-bot dionisio-bot bot removed the stat: ready to merge PR tested and approved waiting for merge label Sep 9, 2024
@scuciatto scuciatto added the stat: ready to merge PR tested and approved waiting for merge label Sep 9, 2024
@kodiakhq kodiakhq bot merged commit 0f21fa0 into develop Sep 10, 2024
55 checks passed
@kodiakhq kodiakhq bot deleted the feat/disable-email-2FA-oauth branch September 10, 2024 10:38
gabriellsh added a commit that referenced this pull request Sep 11, 2024
…hAvatarById

* 'develop' of github.com:RocketChat/Rocket.Chat:
  fix: Infinite loading when uploading a private app (#33181)
  chore: publish preview github pages (#33248)
  chore: move playground (#33260)
  chore: E2EE setting warning update (#33224)
  fix: message parser being slow to process very long messages with too many symbols (#33227)
  chore: fix ui-playground build (#33250)
  feat: Option to disable 2FA for OAuth users (#32945)
  fix: Allow to use the token from `room.v` when requesting transcript instead of finding visitor (#33211)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
stat: QA assured Means it has been tested and approved by a company insider stat: ready to merge PR tested and approved waiting for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants