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: Accounts_LoginExpiration being used differently on codebase #32527

Merged
merged 19 commits into from
Jul 16, 2024

Conversation

KevLehman
Copy link
Contributor

@KevLehman KevLehman commented May 30, 2024

Proposed changes (including videos or screenshots)

Issue(s)

https://rocketchat.atlassian.net/browse/SUP-574

Steps to test or reproduce

Further comments

Fixed an inconsistent evaluation of the Accounts_LoginExpiration setting over the codebase. In some places, it was being used as milliseconds while in others as days. Invalid values produced different results. A helper function was created to centralize the setting validation and the proper value being returned to avoid edge cases.
Negative values may be saved on the settings UI panel but the code will interpret any negative, NaN or 0 value to the default expiration which is 90 days.

Copy link
Contributor

dionisio-bot bot commented May 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 May 30, 2024

🦋 Changeset detected

Latest commit: 39affda

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

This PR includes changesets to release 33 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/tools Patch
@rocket.chat/account-service Patch
@rocket.chat/web-ui-registration Patch
@rocket.chat/omnichannel-transcript Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/queue-worker Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch
@rocket.chat/apps Patch
@rocket.chat/core-services Patch
@rocket.chat/cron Patch
@rocket.chat/fuselage-ui-kit Patch
@rocket.chat/gazzodown Patch
@rocket.chat/livechat Patch
@rocket.chat/model-typings Patch
@rocket.chat/ui-contexts Patch
@rocket.chat/authorization-service Patch
@rocket.chat/ddp-streamer Patch
@rocket.chat/presence-service Patch
@rocket.chat/stream-hub-service Patch
@rocket.chat/api-client Patch
@rocket.chat/license Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/ddp-client Patch
@rocket.chat/uikit-playground Patch
@rocket.chat/models Patch
@rocket.chat/ui-avatar Patch
@rocket.chat/ui-client Patch
@rocket.chat/ui-video-conf 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 May 30, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 55.49%. Comparing base (eff91b4) to head (39affda).

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #32527      +/-   ##
===========================================
- Coverage    55.51%   55.49%   -0.02%     
===========================================
  Files         2632     2632              
  Lines        57174    57174              
  Branches     11841    11841              
===========================================
- Hits         31740    31730      -10     
- Misses       22746    22762      +16     
+ Partials      2688     2682       -6     
Flag Coverage Δ
e2e 54.22% <ø> (-0.06%) ⬇️
unit 72.13% <ø> (+0.06%) ⬆️

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

@KevLehman KevLehman marked this pull request as ready for review May 31, 2024 16:47
packages/tools/src/getLoginExpiration.ts Outdated Show resolved Hide resolved
packages/tools/src/getLoginExpiration.spec.ts Show resolved Hide resolved
apps/meteor/app/api/server/v1/users.ts Outdated Show resolved Hide resolved
@scuciatto scuciatto added this to the 6.10 milestone Jun 5, 2024
packages/tools/src/getLoginExpiration.spec.ts Outdated Show resolved Hide resolved
packages/tools/src/converter.ts Show resolved Hide resolved
packages/tools/src/converter.ts Outdated Show resolved Hide resolved
@scuciatto scuciatto removed this from the 6.10 milestone Jun 17, 2024
@scuciatto scuciatto added this to the 6.11 milestone Jul 3, 2024
@jessicaschelly jessicaschelly added the stat: QA assured Means it has been tested and approved by a company insider label Jul 11, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Jul 11, 2024
@dionisio-bot dionisio-bot bot removed the stat: ready to merge PR tested and approved waiting for merge label Jul 11, 2024
@KevLehman KevLehman added the stat: ready to merge PR tested and approved waiting for merge label Jul 11, 2024
@kodiakhq kodiakhq bot merged commit 8fc6ca8 into develop Jul 16, 2024
49 checks passed
@kodiakhq kodiakhq bot deleted the fix/standard-login-exp branch July 16, 2024 19:19
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.

5 participants