From 776b495d21c108c7125c96aaa15d6b36106a6f39 Mon Sep 17 00:00:00 2001
From: Wouter Admiraal <wouter.admiraal@sonarsource.com>
Date: Wed, 19 Jun 2019 17:01:07 +0200
Subject: [PATCH] SONAR-12142 Authorization error not displayed correctly on
 login form

---
 .../sonar-web/src/main/js/apps/sessions/components/Login.tsx   | 3 +++
 .../src/main/js/apps/sessions/components/LoginForm.tsx         | 3 ---
 .../components/__tests__/__snapshots__/Login-test.tsx.snap     | 2 ++
 .../components/__tests__/__snapshots__/LoginForm-test.tsx.snap | 3 ---
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/server/sonar-web/src/main/js/apps/sessions/components/Login.tsx b/server/sonar-web/src/main/js/apps/sessions/components/Login.tsx
index 96d4edcf1ae..2e497e0ca29 100644
--- a/server/sonar-web/src/main/js/apps/sessions/components/Login.tsx
+++ b/server/sonar-web/src/main/js/apps/sessions/components/Login.tsx
@@ -20,6 +20,7 @@
 import * as React from 'react';
 import LoginForm from './LoginForm';
 import OAuthProviders from './OAuthProviders';
+import GlobalMessagesContainer from '../../../app/components/GlobalMessagesContainer';
 import { translate } from '../../../helpers/l10n';
 import './Login.css';
 
@@ -34,6 +35,8 @@ export default function Login({ identityProviders, onSubmit, returnTo }: Props)
     <div className="login-page" id="login_form">
       <h1 className="login-title text-center">{translate('login.login_to_sonarqube')}</h1>
 
+      <GlobalMessagesContainer />
+
       {identityProviders.length > 0 && (
         <OAuthProviders identityProviders={identityProviders} returnTo={returnTo} />
       )}
diff --git a/server/sonar-web/src/main/js/apps/sessions/components/LoginForm.tsx b/server/sonar-web/src/main/js/apps/sessions/components/LoginForm.tsx
index c20f6a5942c..2fa113117de 100644
--- a/server/sonar-web/src/main/js/apps/sessions/components/LoginForm.tsx
+++ b/server/sonar-web/src/main/js/apps/sessions/components/LoginForm.tsx
@@ -19,7 +19,6 @@
  */
 import * as React from 'react';
 import DeferredSpinner from '../../../components/common/DeferredSpinner';
-import GlobalMessagesContainer from '../../../app/components/GlobalMessagesContainer';
 import { SubmitButton } from '../../../components/ui/buttons';
 import { translate } from '../../../helpers/l10n';
 import { getBaseUrl } from '../../../helpers/urls';
@@ -87,8 +86,6 @@ export default class LoginForm extends React.PureComponent<Props, State> {
     }
     return (
       <form className="login-form" onSubmit={this.handleSubmit}>
-        <GlobalMessagesContainer />
-
         <div className="big-spacer-bottom">
           <label className="login-label" htmlFor="login">
             {translate('login')}
diff --git a/server/sonar-web/src/main/js/apps/sessions/components/__tests__/__snapshots__/Login-test.tsx.snap b/server/sonar-web/src/main/js/apps/sessions/components/__tests__/__snapshots__/Login-test.tsx.snap
index 1d254a9eed4..9319b5a2187 100644
--- a/server/sonar-web/src/main/js/apps/sessions/components/__tests__/__snapshots__/Login-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/sessions/components/__tests__/__snapshots__/Login-test.tsx.snap
@@ -10,6 +10,7 @@ exports[`logs in with form alone 1`] = `
   >
     login.login_to_sonarqube
   </h1>
+  <Connect(GlobalMessages) />
   <LoginForm
     collapsed={false}
     onSubmit={[MockFunction]}
@@ -28,6 +29,7 @@ exports[`logs in with identity provider 1`] = `
   >
     login.login_to_sonarqube
   </h1>
+  <Connect(GlobalMessages) />
   <OAuthProviders
     identityProviders={
       Array [
diff --git a/server/sonar-web/src/main/js/apps/sessions/components/__tests__/__snapshots__/LoginForm-test.tsx.snap b/server/sonar-web/src/main/js/apps/sessions/components/__tests__/__snapshots__/LoginForm-test.tsx.snap
index 4790486f71e..d01ad4543c2 100644
--- a/server/sonar-web/src/main/js/apps/sessions/components/__tests__/__snapshots__/LoginForm-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/sessions/components/__tests__/__snapshots__/LoginForm-test.tsx.snap
@@ -19,7 +19,6 @@ exports[`expands more options 2`] = `
   className="login-form"
   onSubmit={[Function]}
 >
-  <Connect(GlobalMessages) />
   <div
     className="big-spacer-bottom"
   >
@@ -92,7 +91,6 @@ exports[`logs in with simple credentials 1`] = `
   className="login-form"
   onSubmit={[Function]}
 >
-  <Connect(GlobalMessages) />
   <div
     className="big-spacer-bottom"
   >
@@ -165,7 +163,6 @@ exports[`should display a spinner and disabled button while loading 1`] = `
   className="login-form"
   onSubmit={[Function]}
 >
-  <Connect(GlobalMessages) />
   <div
     className="big-spacer-bottom"
   >
-- 
2.39.5