Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

MM-T581 Regen token #6642

Merged
merged 7 commits into from
Oct 8, 2020
Merged

MM-T581 Regen token #6642

merged 7 commits into from
Oct 8, 2020

Conversation

MikeworX
Copy link
Contributor

@MikeworX MikeworX commented Oct 5, 2020 •
edited
Loading

This PR validates that the regenerate token link/button on the Integrations>Slash Commands page works as expected. The test does the following:

  • creates a test team/channel and logs in as admin (admin is required to enable slash commands and regenerate the token)
  • creates a slash command that triggers a bot post that includes the token used
  • validates that the token used matches the token in the message
  • regenerates the token
  • validates that the slash command works, and that the new token is present in the new message, and the old token is not
  • removes the slash command in the after hook

Screen Shot 2020-10-05 at 5 23 38 PM

vercel
TM4J

@mattermod
Copy link
Contributor

Hello @MikeworX,

Thanks for your pull request! A Core Committer will review your pull request soon. For code contributions, you can learn more about the review process here.

@jasonblais jasonblais added the 2: Dev Review Requires review by a core commiter label Oct 5, 2020
saturninoabril
saturninoabril suggested changes Oct 6, 2020
View reviewed changes
e2e/cypress/integration/integrations/regen_token_spec.js Outdated Show resolved Hide resolved
e2e/cypress/integration/integrations/regen_token_spec.js Outdated Show resolved Hide resolved
e2e/cypress/integration/integrations/regen_token_spec.js Outdated Show resolved Hide resolved
e2e/cypress/integration/integrations/regen_token_spec.js Outdated Show resolved Hide resolved
e2e/cypress/integration/integrations/regen_token_spec.js Outdated Show resolved Hide resolved
e2e/cypress/integration/integrations/regen_token_spec.js Outdated Show resolved Hide resolved
e2e/cypress/integration/integrations/regen_token_spec.js Outdated Show resolved Hide resolved
e2e/cypress/integration/integrations/regen_token_spec.js Outdated Show resolved Hide resolved
e2e/cypress/integration/integrations/regen_token_spec.js Outdated Show resolved Hide resolved
e2e/cypress/integration/integrations/regen_token_spec.js Show resolved Hide resolved
saturninoabril
saturninoabril suggested changes Oct 8, 2020
View reviewed changes
Copy link
Member

@saturninoabril saturninoabril left a comment

Choose a reason for hiding this comment

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

Thanks @MikeworX! Last clean up that I missed on my initial review and I'm all good.

e2e/cypress/integration/integrations/regen_token_spec.js Outdated Show resolved Hide resolved
e2e/cypress/integration/integrations/regen_token_spec.js Outdated Show resolved Hide resolved
@saturninoabril saturninoabril added 3: QA Review Requires review by a QA tester and removed 2: Dev Review Requires review by a core commiter labels Oct 8, 2020
@saturninoabril
Copy link
Member

/update-branch

srkgupta
srkgupta approved these changes Oct 8, 2020
View reviewed changes
Copy link
Contributor

@srkgupta srkgupta left a comment

Choose a reason for hiding this comment

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

Thanks @MikeworX. The changes LGTM. Tested and passed.

@srkgupta srkgupta added 4: Reviews Complete All reviewers have approved the pull request and removed 3: QA Review Requires review by a QA tester labels Oct 8, 2020
@srkgupta srkgupta merged commit 5f3c678 into mattermost:master Oct 8, 2020
@amyblais amyblais added Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation labels Oct 8, 2020
Tak-Iwamoto pushed a commit to Tak-Iwamoto/mattermost-webapp that referenced this pull request Oct 10, 2020
Merge branch 'master' of github.com:Tak-Iwamoto/mattermost-webapp int…
8f76d21 
…o MM-20499

* 'master' of github.com:Tak-Iwamoto/mattermost-webapp: (71 commits)
  Fix bot icon heigth (mattermost#6578)
  Cypress/E2E: Update quick switch hint (mattermost#6691)
  migrate string-refs in search_results.jsx (mattermost#6671)
  MM-T581 Regen token (mattermost#6642)
  Switch button-bg-## to use button-bg-rgb variables (mattermost#6635)
  [MM-27142] In-Web-App purchase of Mattermost Cloud  (mattermost#6583)
  migrate user_list_row_with_error to ts (mattermost#6624)
  [MM-28217] Front-end for displaying company info (mattermost#6580)
  [MM-28211] Plan Details Card (mattermost#6582)
  [MM-28216] Billing History View (UX Only) (mattermost#6637)
  Added final set of cypress tests part of MM-29347 (mattermost#6659)
  [MM-24507] - Pin comment box on bottom of RHS thread (mattermost#6167)
  Cypress/E2E: Fix channel switcher spec (mattermost#6662)
  [MM-28781] migrate string refs in channelView (mattermost#6607)
  [GH-15777] Replace center-channel-color-## with center-channel-color-rgb variables (mattermost#6643)
  [GH-15776]Switch center-channel-color-## with center-channel-color-rgb variables (mattermost#6641)
  MM-29038 Removed usage of centre-channel-color from post comments (mattermost#6633)
  [MM-29034] Remove usage of sidebar-text-## CSS variables (mattermost#6634)
  Translations update from Weblate (mattermost#6673)
  [MM-20462] migrate any_team_permission_gate to typescript (mattermost#6547)
  ...
Tak-Iwamoto pushed a commit to Tak-Iwamoto/mattermost-webapp that referenced this pull request Oct 10, 2020
Merge branch 'master' of github.com:Tak-Iwamoto/mattermost-webapp int…
0f3c332 
…o MM-20465

* 'master' of github.com:Tak-Iwamoto/mattermost-webapp: (71 commits)
  Fix bot icon heigth (mattermost#6578)
  Cypress/E2E: Update quick switch hint (mattermost#6691)
  migrate string-refs in search_results.jsx (mattermost#6671)
  MM-T581 Regen token (mattermost#6642)
  Switch button-bg-## to use button-bg-rgb variables (mattermost#6635)
  [MM-27142] In-Web-App purchase of Mattermost Cloud  (mattermost#6583)
  migrate user_list_row_with_error to ts (mattermost#6624)
  [MM-28217] Front-end for displaying company info (mattermost#6580)
  [MM-28211] Plan Details Card (mattermost#6582)
  [MM-28216] Billing History View (UX Only) (mattermost#6637)
  Added final set of cypress tests part of MM-29347 (mattermost#6659)
  [MM-24507] - Pin comment box on bottom of RHS thread (mattermost#6167)
  Cypress/E2E: Fix channel switcher spec (mattermost#6662)
  [MM-28781] migrate string refs in channelView (mattermost#6607)
  [GH-15777] Replace center-channel-color-## with center-channel-color-rgb variables (mattermost#6643)
  [GH-15776]Switch center-channel-color-## with center-channel-color-rgb variables (mattermost#6641)
  MM-29038 Removed usage of centre-channel-color from post comments (mattermost#6633)
  [MM-29034] Remove usage of sidebar-text-## CSS variables (mattermost#6634)
  Translations update from Weblate (mattermost#6673)
  [MM-20462] migrate any_team_permission_gate to typescript (mattermost#6547)
  ...
Tak-Iwamoto pushed a commit to Tak-Iwamoto/mattermost-webapp that referenced this pull request Oct 10, 2020
Merge remote-tracking branch 'upstream/master' into MM-20469
02663a8 
* upstream/master: (84 commits)
  Fix bot icon heigth (mattermost#6578)
  Cypress/E2E: Update quick switch hint (mattermost#6691)
  migrate string-refs in search_results.jsx (mattermost#6671)
  MM-T581 Regen token (mattermost#6642)
  Switch button-bg-## to use button-bg-rgb variables (mattermost#6635)
  [MM-27142] In-Web-App purchase of Mattermost Cloud  (mattermost#6583)
  migrate user_list_row_with_error to ts (mattermost#6624)
  [MM-28217] Front-end for displaying company info (mattermost#6580)
  [MM-28211] Plan Details Card (mattermost#6582)
  [MM-28216] Billing History View (UX Only) (mattermost#6637)
  Added final set of cypress tests part of MM-29347 (mattermost#6659)
  [MM-24507] - Pin comment box on bottom of RHS thread (mattermost#6167)
  Cypress/E2E: Fix channel switcher spec (mattermost#6662)
  [MM-28781] migrate string refs in channelView (mattermost#6607)
  [GH-15777] Replace center-channel-color-## with center-channel-color-rgb variables (mattermost#6643)
  [GH-15776]Switch center-channel-color-## with center-channel-color-rgb variables (mattermost#6641)
  MM-29038 Removed usage of centre-channel-color from post comments (mattermost#6633)
  [MM-29034] Remove usage of sidebar-text-## CSS variables (mattermost#6634)
  Translations update from Weblate (mattermost#6673)
  [MM-20462] migrate any_team_permission_gate to typescript (mattermost#6547)
  ...
@MikeworX MikeworX deleted the regen-token branch October 16, 2020 00:28
jfrerich pushed a commit that referenced this pull request Oct 23, 2020
@MikeworX @mattermod @jfrerich
MM-T581 Regen token (#6642)
1aceeee 
* regen token pr - issues with function brackets

* formatting

* fixed an issue with cleanup

* fixes

* more changes

* cleanup

Co-authored-by: Mattermod <[email protected]>
calebroseland pushed a commit that referenced this pull request Oct 27, 2020
@MikeworX @mattermod @calebroseland
MM-T581 Regen token (#6642)
867fadd 
* regen token pr - issues with function brackets

* formatting

* fixed an issue with cleanup

* fixes

* more changes

* cleanup

Co-authored-by: Mattermod <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@srkgupta srkgupta srkgupta approved these changes

@saturninoabril saturninoabril saturninoabril approved these changes

Assignees
No one assigned
Labels
4: Reviews Complete All reviewers have approved the pull request Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation Hacktoberfest hacktoberfest-accepted
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@MikeworX @mattermod @saturninoabril @srkgupta @jasonblais @amyblais