fix: Issue enforcing user limits on start plan #7188

RicardoE105 · 2023-09-15T19:41:09Z

Github issue / Community forum post (link here to close automatically):

github-actions · 2023-09-15T19:41:27Z

Great PR! Please pay attention to the following items before merging:

Files matching packages/**:

If fixing bug, added test to cover scenario.
If addressing forum or Github issue, added link to description.

Files matching packages/**/*.ts:

Added unit tests to cover new or updated functionality.

Make sure to check off this list before asking for review.

codecov · 2023-09-15T20:04:45Z

Codecov Report

Patch coverage has no change and project coverage change: -0.01% ⚠️

Comparison is base (d317e09) 32.66% compared to head (33350e8) 32.65%.
Report is 17 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #7188      +/-   ##
==========================================
- Coverage   32.66%   32.65%   -0.01%     
==========================================
  Files        3337     3337              
  Lines      199394   199394              
  Branches    21833    21831       -2     
==========================================
- Hits        65129    65121       -8     
- Misses     133189   133197       +8     
  Partials     1076     1076

Files Changed	Coverage Δ
...es/cli/src/controllers/passwordReset.controller.ts	`74.13% <ø> (ø)`

... and 3 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

netroy

Can we add a test that would fail without this fix, and then passes with this fix? 🙏🏽

netroy · 2023-09-18T08:59:44Z

packages/cli/src/controllers/passwordReset.controller.ts

@@ -231,7 +231,7 @@ export class PasswordResetController {

 		const user = await this.userService.findOne({
 			where: { id: decodedToken.sub },
-			relations: ['authIdentities'],
+			relations: ['authIdentities', 'globalRole'],


We really need better sub-classing of DB entities in the ORM code. So, instead of guessing if user.globalRole exists or not, we have have separate types with and without the globalRole property. That way issues like these could be caught during compile time.

Can we just create a new type from User where the role is required (UserWithRole) and use in the functions where we need the role. Then developers will use a type guard function to narrow the type from User to UserWithRole? is that what you are suggesting?

friendly ping @netroy

cypress · 2023-09-21T07:16:58Z

Passing run #2230 ↗︎

0	238	3	0	0

Details:

🌳 ado-1093-fix-bug-when-trailing-user-reset-password-on-instance 🖥️ browsers:n...
Project: n8n	Commit: `33350e810b`
Status: Passed	Duration: 08:05 💡
Started: Sep 21, 2023 7:08 AM	Ended: Sep 21, 2023 7:16 AM

_{This comment has been generated by cypress-bot as a result of this
project's GitHub integration settings.}

github-actions · 2023-09-21T07:17:09Z

✅ All Cypress E2E specs passed

## [1.8.1](https://github.com/n8n-io/n8n/compare/n8n@1.8.0...n8n@1.8.1) (2023-09-21) ### Bug Fixes * **Airtable Node:** Attachments field type fix ([#7227](#7227)) ([ebfcc87](ebfcc87)) * **core:** Handle filename* with quotes in Content-Disposition header ([#7229](#7229)) ([fb36b0a](fb36b0a)) * Ensure new Set node is on top of search list ([#7215](#7215)) ([c8fb06f](c8fb06f)) * Issue enforcing user limits on start plan ([#7188](#7188)) ([50a4c5e](50a4c5e)) ### Reverts * **core:** Add command to trigger license refresh on workers ([#7184](#7184)) ([6ac19a5](6ac19a5)) Co-authored-by: netroy <netroy@users.noreply.github.com>

janober · 2023-09-21T16:38:10Z

Got released with n8n@1.8.1

This reverts commit 303bc8e.

## [1.8.2](https://github.com/n8n-io/n8n/compare/n8n@1.8.1...n8n@1.8.2) (2023-09-25) ### Bug Fixes * **editor:** Add debug feature docs link ([#7240](#7240)) ([1b2ccca](1b2ccca)) * **editor:** Fix SQL editor issue ([#7236](#7236)) ([539f954](539f954)) ### Reverts * Revert "fix: Issue enforcing user limits on start plan (#7188)" ([6589580](6589580)) Co-authored-by: netroy <netroy@users.noreply.github.com>

# [1.9.0](https://github.com/n8n-io/n8n/compare/n8n@1.8.0...n8n@1.9.0) (2023-09-28) ### Bug Fixes * **Airtable Node:** Attachments field type fix ([#7227](#7227)) ([2af967c](2af967c)) * **core:** Change WorkflowHistory nodes/connections columns to be json ([#7282](#7282)) ([a80abad](a80abad)) * **core:** Fix binary data manager check on pruning ([#7251](#7251)) ([484035e](484035e)) * **core:** Fix missing execution ID in webhook-based workflow producing binary data ([#7244](#7244)) ([33991e9](33991e9)) * **core:** Handle filename* with quotes in Content-Disposition header ([#7229](#7229)) ([67b985f](67b985f)) * **core:** Make DNS resolution order configurable ([#7272](#7272)) ([5b3121c](5b3121c)) * **core:** Make senderId required for all command messages ([#7252](#7252)) ([4b01428](4b01428)) * **core:** Prevent executions from displaying Running status incorrectly ([#7261](#7261)) ([861cac5](861cac5)) * **core:** Use consistent timezone-aware timestamps in postgres ([#6948](#6948)) ([0132514](0132514)), closes [#2178](#2178) [#2810](#2810) [#3855](#3855) [#2813](#2813) * **editor:** Add debug feature docs link ([#7240](#7240)) ([4614e1e](4614e1e)) * **editor:** Fix SQL editor issue ([#7236](#7236)) ([647fc6c](647fc6c)) * **editor:** Ensure new Set node is on top of search list ([#7215](#7215)) ([2491ccf](2491ccf)) * **editor:** Forbid password reset when cloud account is limited in the number of users [7188](#7188) ([303bc8e](303bc8e)) * **HTTP Request Node:** Add suggestion how to fix '429 - too many requests' errors ([#7293](#7293)) ([0bc33b1](0bc33b1)) * **Item Lists Node:** Concatenate operation pairedItems fix ([#7286](#7286)) ([cde23a1](cde23a1)) * **Respond to Webhook Node:** JSON output from expression fix ([#7294](#7294)) ([8bc369d](8bc369d)) ### Features * Add onboarding flow ([#7212](#7212)) ([01e9340](01e9340)) * **core:** Add secrets provider reload and refactor ([#7277](#7277)) ([53a7502](53a7502)) * **core:** Add Tournament as the new default expression evaluator ([#6964](#6964)) ([bf74f09](bf74f09)) * **core:** Initial workflow history API ([#7234](#7234)) ([0083a9e](0083a9e)) * **core:** Introduce object store service ([#7225](#7225)) ([fa84545](fa84545)) * **editor:** Add user cloud ID to telemetry [#7232](#7232) ([60c152d](60c152d)) * **editor:** Rework banners framework and add email confirmation banner ([#7205](#7205)) ([b0e98b5](b0e98b5)) * **MISP Node:** Update credential to support HTTP Request node ([#7268](#7268)) ([e4c302c](e4c302c)) ### Performance Improvements * **core:** Skip unneeded calls on every pruning cycle ([#7260](#7260)) ([db01164](db01164)) Co-authored-by: netroy <netroy@users.noreply.github.com>

Fix issue enforcing user limits

1ead917

RicardoE105 changed the title ~~Fix issue enforcing user limits~~ fix: Issue enforcing user limits Sep 15, 2023

RicardoE105 changed the title ~~fix: Issue enforcing user limits~~ fix: Issue enforcing user limits on start plan Sep 15, 2023

RicardoE105 requested a review from mutdmour September 15, 2023 19:43

n8n-assistant bot added core Enhancement outside /nodes-base and /editor-ui n8n team Authored by the n8n team labels Sep 15, 2023

netroy requested changes Sep 18, 2023

View reviewed changes

Add tests

33350e8

RicardoE105 requested review from netroy and removed request for mutdmour September 18, 2023 21:27

netroy approved these changes Sep 21, 2023

View reviewed changes

RicardoE105 merged commit 303bc8e into master Sep 21, 2023
22 checks passed

RicardoE105 deleted the ado-1093-fix-bug-when-trailing-user-reset-password-on-instance branch September 21, 2023 09:56

netroy pushed a commit that referenced this pull request Sep 21, 2023

fix: Issue enforcing user limits on start plan (#7188)

50a4c5e

github-actions bot mentioned this pull request Sep 21, 2023

🚀 Release 1.8.1 #7231

Merged

janober added the Released label Sep 21, 2023

netroy added a commit that referenced this pull request Sep 25, 2023

Revert "fix: Issue enforcing user limits on start plan (#7188)"

6589580

This reverts commit 303bc8e.

github-actions bot mentioned this pull request Sep 25, 2023

🚀 Release 1.8.2 #7243

Merged

This was referenced Sep 27, 2023

🚀 Release 1.9.0 #7280

Closed

🚀 Release 1.9.0 #7288

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Issue enforcing user limits on start plan #7188

fix: Issue enforcing user limits on start plan #7188

RicardoE105 commented Sep 15, 2023

github-actions bot commented Sep 15, 2023

codecov bot commented Sep 15, 2023 •

edited

Loading

netroy left a comment

netroy Sep 18, 2023

RicardoE105 Sep 18, 2023 •

edited

Loading

RicardoE105 Sep 20, 2023

cypress bot commented Sep 21, 2023

github-actions bot commented Sep 21, 2023

janober commented Sep 21, 2023

fix: Issue enforcing user limits on start plan #7188

fix: Issue enforcing user limits on start plan #7188

Conversation

RicardoE105 commented Sep 15, 2023

github-actions bot commented Sep 15, 2023

codecov bot commented Sep 15, 2023 • edited Loading

Codecov Report

netroy left a comment

Choose a reason for hiding this comment

netroy Sep 18, 2023

Choose a reason for hiding this comment

RicardoE105 Sep 18, 2023 • edited Loading

Choose a reason for hiding this comment

RicardoE105 Sep 20, 2023

Choose a reason for hiding this comment

cypress bot commented Sep 21, 2023

Passing run #2230 ↗︎

github-actions bot commented Sep 21, 2023

janober commented Sep 21, 2023

codecov bot commented Sep 15, 2023 •

edited

Loading

RicardoE105 Sep 18, 2023 •

edited

Loading