SAML support (#3494)
* PLT-3073: Implement SAML/Okta Server side (EE) (#3422) * PLT-3137 Support for SAML configuration * PLT-3410 SAML Database Store * PLT-3411 CLI to add Identity Provider Certificate and Service Provider Private Key * PLT-3409 SAML Interface for EE * PLT-3139 Handle SAML authentication server side * Add localization messages * PLT-3443 SAML Obtain SP metadata * PLT-3142 Login & Switch to/from SAML * Remove Certs for Database & Clean SAML Request * Make required Username, FirstName and LastName * PLT-3140 Add SAML to System Console (#3476) * PLT-3140 Add SAML to System Console * Move web_client functions to client.jsx * Fix issues found by PM * update package.json mattermost driver * Fix text messages for SAML
Этот коммит содержится в:
@@ -3,6 +3,7 @@
|
||||
|
||||
import * as Utils from 'utils/utils.jsx';
|
||||
import Client from 'utils/web_client.jsx';
|
||||
import Constants from 'utils/constants.jsx';
|
||||
|
||||
import React from 'react';
|
||||
import ReactDOM from 'react-dom';
|
||||
@@ -55,7 +56,8 @@ export default class EmailToOAuth extends React.Component {
|
||||
formClass += ' has-error';
|
||||
}
|
||||
|
||||
const uiType = Utils.toTitleCase(this.props.newType) + ' SSO';
|
||||
const type = (this.props.newType === Constants.SAML_SERVICE ? Constants.SAML_SERVICE.toUpperCase() : Utils.toTitleCase(this.props.newType));
|
||||
const uiType = `${type} SSO`;
|
||||
|
||||
return (
|
||||
<div>
|
||||
@@ -74,7 +76,7 @@ export default class EmailToOAuth extends React.Component {
|
||||
id='claim.email_to_oauth.ssoType'
|
||||
defaultMessage='Upon claiming your account, you will only be able to login with {type} SSO'
|
||||
values={{
|
||||
type: Utils.toTitleCase(this.props.newType)
|
||||
type
|
||||
}}
|
||||
/>
|
||||
</p>
|
||||
@@ -83,7 +85,7 @@ export default class EmailToOAuth extends React.Component {
|
||||
id='claim.email_to_oauth.ssoNote'
|
||||
defaultMessage='You must already have a valid {type} account'
|
||||
values={{
|
||||
type: Utils.toTitleCase(this.props.newType)
|
||||
type
|
||||
}}
|
||||
/>
|
||||
</p>
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
import * as Utils from 'utils/utils.jsx';
|
||||
import Client from 'utils/web_client.jsx';
|
||||
import Constants from 'utils/constants.jsx';
|
||||
|
||||
import React from 'react';
|
||||
import ReactDOM from 'react-dom';
|
||||
@@ -62,7 +63,7 @@ export default class OAuthToEmail extends React.Component {
|
||||
formClass += ' has-error';
|
||||
}
|
||||
|
||||
const uiType = Utils.toTitleCase(this.props.currentType) + ' SSO';
|
||||
const uiType = `${(this.props.currentType === Constants.SAML_SERVICE ? Constants.SAML_SERVICE.toUpperCase() : Utils.toTitleCase(this.props.currentType))} SSO`;
|
||||
|
||||
return (
|
||||
<div>
|
||||
@@ -85,7 +86,7 @@ export default class OAuthToEmail extends React.Component {
|
||||
<p>
|
||||
<FormattedMessage
|
||||
id='claim.oauth_to_email.enterNewPwd'
|
||||
defaultMessage='Enter a new password for your {site} account'
|
||||
defaultMessage='Enter a new password for your {site} email account'
|
||||
values={{
|
||||
site: global.window.mm_config.SiteName
|
||||
}}
|
||||
|
||||
Ссылка в новой задаче
Block a user