From 0947b64287f7dd39310b7da10c7d8675c090b230 Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jan.tuomi@eficode.com>
Date: Tue, 25 Feb 2020 15:03:07 +0200
Subject: yep

---
 frontend/src/Activate.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'frontend/src/Activate.js')

diff --git a/frontend/src/Activate.js b/frontend/src/Activate.js
index 8a420f4..17d980e 100644
--- a/frontend/src/Activate.js
+++ b/frontend/src/Activate.js
@@ -2,14 +2,19 @@ import React, { useEffect, useState } from 'react';
 import axios from './axios';
 import { Link } from '@reach/router';
 
-const Activate = ({ activationToken }) => {
+import userState from './UserState';
+
+const Activate = ({ user, activationToken }) => {
   const [ data, setData ] = useState({});
   useEffect(() => {
     (async () => {
       try {
-        await axios.post('/activate', { activationToken });
+        const resp = await axios.post('/activate', { activationToken });
+        const { username } = resp.data;
+        user.authError = null;
+        user.username = username;
         setData({
-          message: 'Account succesfully activated. You can now log in.',
+          message: 'Account succesfully activated. You are now logged in.',
         });
       } catch (err) {
         setData({
@@ -27,10 +32,10 @@ const Activate = ({ activationToken }) => {
           {data.error}
         </div>
         <div>{data.message}</div>
-        {data.message && <Link to="/login">To login page</Link>}
+        {data.message && <Link to="/">To front page</Link>}
       </div>
     </div>
   );
 };
 
-export default Activate;
+export default props => <Activate user={userState} {...props} />;
-- 
cgit v1.3