This repository has been archived by the owner on Mar 13, 2024. It is now read-only.
MM-31735 - ReDisplay OpenID Connect #7325
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit f56689c.
sbishel
added
1: PM Review
|
Waiting to make sure Mobile changes are merged. |
hahmadia
approved these changes
Jan 15, 2021
wiersgallak
approved these changes
Jan 15, 2021
|
/update-branch |
…t-webapp into MM-31735-enable-openid
sbishel
removed
the
Do Not Merge/Awaiting PR
mkraft
reviewed
Jan 21, 2021
| @@ -4117,7 +4118,11 @@ const AdminDefinition = { | |||
| type: Constants.SettingsTypes.TYPE_CUSTOM, | |||
| component: OpenIdConvert, | |||
| key: 'OpenIdConvert', | |||
| isHidden: () => true, | |||
| isHidden: it.any( | |||
There was a problem hiding this comment.
Should this be like this? Namely, only hidden if none of them are licensed?
Suggested change
| isHidden: it.any( | |
| isHidden: it.all( |
There was a problem hiding this comment.
Removed check on Google and Office365 completely. Now only check for "OpenId" license.
So it is hidden if it is NOT Licensed for "OpenId".
It is also hidden if it is licensed for OpenId and does NOT use LegacyOAuth.
|
Getting |
sbishel
commented
Jan 21, 2021
| @@ -4062,10 +4062,14 @@ const AdminDefinition = { | |||
| defaultMessage='deprecated' | |||
| /> | |||
| ), | |||
| shouldDisplay: () => false, | |||
| shouldDisplay: (license) => license.IsLicensed && license.OpenId === 'true', | |||
There was a problem hiding this comment.
@furqanmlk - Fixes displaying "Deprecated"
Nice Catch.
sbishel
commented
Jan 21, 2021
| it.all( | ||
| it.licensedForFeature('OpenId'), | ||
| it.not(usesLegacyOauth), | ||
| ), |
There was a problem hiding this comment.
OAuth should be hidden if it is licensed for OpenId AND does NOT use legacy oauth.
|
@mkraft - Let me know if you want to talk through some of logic on displaying. With the negative checks it gets confusing, but I think I have it straight now and tested all 6 iterations. |
|
/update-branch |
furqanmlk
approved these changes
Jan 25, 2021
mkraft
approved these changes
Jan 29, 2021
sbishel
added
4: Reviews Complete
chetanyakan
added a commit
to brightscout-alpha/mattermost-webapp
that referenced
this pull request
Feb 2, 2021
… MM-2020 * 'master' of github.com:mattermost/mattermost-webapp: (175 commits) fix/update failed E2E tests (mattermost#7430) [MM-31791] Support Packet Generation FRONTEND (mattermost#7314) [MM-32269] System Console: TeamIcon edge cases (mattermost#7395) update steps for google openid (mattermost#7327) git checkout -b fix-slash-commands-tm4j (mattermost#7397) MM-31646: Update Office instructions (mattermost#7326) Cypress/E2E: Fix tests for archived channels (mattermost#7424) Cypress/E2E: Fix tests for bots in list and in sidebar (mattermost#7421) [MM-29108] Simplifies emoji reaction animation (mattermost#7386) Cypress/E2E: Overwrite cy.visit and cy.reload to have default 3s wait (mattermost#7410) [MM-22369] Filter out ldap group sync teams when adding a team to a user (mattermost#7324) MM 31192 - license renewal telemetry (mattermost#7413) Migrate message_attachments folder to Typescript (mattermost#7339) Cypress/E2E: Fix and reorganize tests for custom emojis (mattermost#7415) promote tests with 23 tm4j test cases (mattermost#7402) fix failed tests due to recent change in add users modal (mattermost#7398) fix for more channels and auth specs (mattermost#7416) fix e2e for sidebar channels (mattermost#7412) remove duplicate MM-T3294, fix MM-T1253 and fix/reorganize other keyboard shortcuts tests (mattermost#7390) MM-31735 - ReDisplay OpenID Connect (mattermost#7325) ...
amyblais
added
Changelog/Done
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This reverts commit f56689c.
Summary
Displays OpenID section in System Console.
Ticket Link
https://mattermost.atlassian.net/browse/MM-31735
Screenshots