From 4f4aa94c710314aef5a6a0de28eb0fc77054c2a7 Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jan.tuomi@eficode.com>
Date: Thu, 17 Jan 2019 21:12:46 +0200
Subject: [PATCH] Improve login page

---
 src/pages/AdminLoginPage/AdminLoginPage.tsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/pages/AdminLoginPage/AdminLoginPage.tsx b/src/pages/AdminLoginPage/AdminLoginPage.tsx
index 7716e3f..a7cfcab 100644
--- a/src/pages/AdminLoginPage/AdminLoginPage.tsx
+++ b/src/pages/AdminLoginPage/AdminLoginPage.tsx
@@ -20,6 +20,7 @@ export interface AdminLoginPageState {
   error: string;
 }
 
+const DEFAULT_REDIRECT = "/admin";
 class AdminLoginPage extends React.Component<AdminLoginPageProps, AdminLoginPageState> {
   constructor(props) {
     super(props);
@@ -90,13 +91,14 @@ class AdminLoginPage extends React.Component<AdminLoginPageProps, AdminLoginPage
     const { search } = location;
     const params = qs.parse(search);
     const { next } = params;
-    return next || "/admin";
+    return next || DEFAULT_REDIRECT;
   }
 
   render() {
     const { username, password, isAuthenticated } = this.state;
+    const next = this.getRedirectURL();
+
     if (isAuthenticated) {
-      const next = this.getRedirectURL();
       return <Redirect to={next} />;
     }
 
@@ -105,6 +107,9 @@ class AdminLoginPage extends React.Component<AdminLoginPageProps, AdminLoginPage
         <Helmet>
           <link rel="canonical" href="https://sik.ayy.fi/admin/login" />
         </Helmet>
+        { next && next !== DEFAULT_REDIRECT && (
+          <div>You have to log in first.</div>
+        ) }
         <form className="admin-login-form" onSubmit={this.handleSubmit}>
           <label>Username
             <input id="login-username" type="text" name="username" value={username} onChange={this.handleUserNameChange} />