From: Stas Vilchik Date: Tue, 18 Jul 2017 12:08:11 +0000 (+0200) Subject: SONAR-9357 support two or more providers (#2259) X-Git-Tag: 6.5-RC2~10 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f1d8457e3eb8d1104f63da028c7aaa8fc83a45c9;p=sonarqube.git SONAR-9357 support two or more providers (#2259) --- diff --git a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavUser.js b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavUser.js index a4e39e09398..eadbc23ff02 100644 --- a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavUser.js +++ b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavUser.js @@ -40,8 +40,7 @@ type Props = { fetchMyOrganizations: () => Promise<*>, location: Object, organizations: Array<{ key: string, name: string }>, - router: { push: string => void }, - sonarCloud: boolean + router: { push: string => void } }; type State = { @@ -157,24 +156,13 @@ export default class GlobalNavUser extends React.PureComponent { } renderAnonymous() { - return this.props.sonarCloud - ?
  • - - GitHub - {translate('layout.login')} - -
    • - :
  • - - {translate('layout.login')} - -
    • ; + return ( +
  • + + {translate('layout.login')} + +
    • + ); } render() { diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutAppForSonarQubeDotCom.js b/server/sonar-web/src/main/js/apps/about/components/AboutAppForSonarQubeDotCom.js index 6072a5afb54..2e9eee74ed4 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutAppForSonarQubeDotCom.js +++ b/server/sonar-web/src/main/js/apps/about/components/AboutAppForSonarQubeDotCom.js @@ -28,6 +28,7 @@ import AboutQualityGates from './AboutQualityGates'; import AboutLeakPeriod from './AboutLeakPeriod'; import AboutStandards from './AboutStandards'; import AboutScanners from './AboutScanners'; +import SonarCloudGetStarted from './SonarCloudGetStarted'; import '../sonarqube-dot-com-styles.css'; type Props = { @@ -55,11 +56,7 @@ export default function AboutAppForSonarQubeDotCom(props: Props) {

    Continuous Code Quality
    as a Service

    - {!props.currentUser.isLoggedIn && - - GitHub - Connect With GitHub to Get Started - } + {!props.currentUser.isLoggedIn && }
    diff --git a/server/sonar-web/src/main/js/apps/about/components/SonarCloudGetStarted.js b/server/sonar-web/src/main/js/apps/about/components/SonarCloudGetStarted.js new file mode 100644 index 00000000000..e467dfc3874 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/about/components/SonarCloudGetStarted.js @@ -0,0 +1,76 @@ +/* + * SonarQube + * Copyright (C) 2009-2017 SonarSource SA + * mailto:info AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +// @flow +import React from 'react'; +import OAuthProviders from '../../sessions/components/OAuthProviders'; +import { getIdentityProviders } from '../../../api/users'; + +type State = { + identityProviders: Array<{ + backgroundColor: string, + iconPath: string, + key: string, + name: string + }>, + loading: boolean +}; + +export default class SonarCloudGetStarted extends React.PureComponent { + mounted: boolean; + state: State = { + identityProviders: [], + loading: true + }; + + componentDidMount() { + this.mounted = true; + this.fetchIdentityProviders(); + } + + componentWillUnmount() { + this.mounted = false; + } + + fetchIdentityProviders = () => { + this.setState({ loading: true }); + getIdentityProviders().then(({ identityProviders }) => { + if (this.mounted) { + this.setState({ identityProviders, loading: false }); + } + }); + }; + + formatLabel = (name: string) => `Start with ${name}`; + + render() { + if (this.state.loading) { + return null; + } + + return ( +
    + +
    + ); + } +} diff --git a/server/sonar-web/src/main/js/apps/about/sonarqube-dot-com-styles.css b/server/sonar-web/src/main/js/apps/about/sonarqube-dot-com-styles.css index 1895646e681..dc5a19e0559 100644 --- a/server/sonar-web/src/main/js/apps/about/sonarqube-dot-com-styles.css +++ b/server/sonar-web/src/main/js/apps/about/sonarqube-dot-com-styles.css @@ -22,12 +22,13 @@ align-items: center; } -.sqcom-about-page-intro {} +.sqcom-about-page-intro { +} .sqcom-about-page-intro > h1 { - line-height: 56px; + line-height: 44px; color: #fff; - font-size: 44px; + font-size: 36px; font-weight: 300; } @@ -136,3 +137,10 @@ .sqcom-about-quality-model svg { transform: translateY(-3px) !important; } + +.sqcom-get-started .oauth-providers > ul { + width: 380px; + justify-content: space-between; + font-size: 14px; + margin-bottom: -30px; +} diff --git a/server/sonar-web/src/main/js/apps/sessions/components/LoginForm.js b/server/sonar-web/src/main/js/apps/sessions/components/LoginForm.js index 3ac61372fdf..76d51dfcfd5 100644 --- a/server/sonar-web/src/main/js/apps/sessions/components/LoginForm.js +++ b/server/sonar-web/src/main/js/apps/sessions/components/LoginForm.js @@ -19,6 +19,7 @@ */ // @flow import React from 'react'; +import OAuthProviders from './OAuthProviders'; import GlobalMessagesContainer from '../../../app/components/GlobalMessagesContainer'; import { translate } from '../../../helpers/l10n'; @@ -67,26 +68,7 @@ export default class LoginForm extends React.PureComponent {

    {translate('login.login_to_sonarqube')}

    {this.props.identityProviders.length > 0 && -
    - -
    } + } {this.state.collapsed ?
    diff --git a/server/sonar-web/src/main/js/apps/sessions/components/OAuthProviders.js b/server/sonar-web/src/main/js/apps/sessions/components/OAuthProviders.js new file mode 100644 index 00000000000..096637eb543 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/sessions/components/OAuthProviders.js @@ -0,0 +1,63 @@ +/* + * SonarQube + * Copyright (C) 2009-2017 SonarSource SA + * mailto:info AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +// @flow +import React from 'react'; +import { translateWithParameters } from '../../../helpers/l10n'; + +type Props = { + formatLabel?: string => string, + identityProviders: Array<{ + backgroundColor: string, + iconPath: string, + key: string, + name: string + }> +}; + +export default function OAuthProviders(props: Props) { + return ( +
    + +
    + ); +} + +OAuthProviders.defaultProps = { + formatLabel: (name: string) => translateWithParameters('login.login_with_x', name) +}; diff --git a/server/sonar-web/src/main/js/apps/sessions/components/__tests__/__snapshots__/LoginForm-test.js.snap b/server/sonar-web/src/main/js/apps/sessions/components/__tests__/__snapshots__/LoginForm-test.js.snap index 58c919aa1e8..42113f43dc0 100644 --- a/server/sonar-web/src/main/js/apps/sessions/components/__tests__/__snapshots__/LoginForm-test.js.snap +++ b/server/sonar-web/src/main/js/apps/sessions/components/__tests__/__snapshots__/LoginForm-test.js.snap @@ -9,34 +9,19 @@ exports[`expands more options 1`] = ` > login.login_to_sonarqube -
    - -
    +
    @@ -60,34 +45,19 @@ exports[`expands more options 2`] = ` > login.login_to_sonarqube -
    - -
    +
    @@ -165,34 +135,19 @@ exports[`logs in with identity provider 1`] = ` > login.login_to_sonarqube -
    - -
    +
    diff --git a/server/sonar-web/src/main/less/pages/login.less b/server/sonar-web/src/main/less/pages/login.less index 991fa4383b3..a87804cb352 100644 --- a/server/sonar-web/src/main/less/pages/login.less +++ b/server/sonar-web/src/main/less/pages/login.less @@ -90,6 +90,7 @@ color: #fff; white-space: nowrap; overflow: hidden; + text-align: center; text-overflow: ellipsis; &:hover, &:focus { diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties index 6b132ffad97..474ae2f9420 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -1867,6 +1867,7 @@ user.password_cant_be_changed_on_external_auth=Password cannot be changed when e login.login_to_sonarqube=Log In to SonarQube login.more_options=More options +login.login_with_x=Log in with {0} #------------------------------------------------------------------------------ #