From 4569b85489e863465395f84e995dd3fdc44471b4 Mon Sep 17 00:00:00 2001 From: Piotr Russ Date: Sun, 22 Nov 2020 13:49:09 +0100 Subject: implement refresh tokens --- client/src/admin/api/getUser.js | 6 ++++++ client/src/admin/api/index.js | 4 ++++ client/src/admin/api/logout.js | 1 + client/src/admin/jsx/App.jsx | 3 ++- client/src/admin/jsx/User.jsx | 2 +- 5 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 client/src/admin/api/getUser.js create mode 100644 client/src/admin/api/index.js (limited to 'client/src') diff --git a/client/src/admin/api/getUser.js b/client/src/admin/api/getUser.js new file mode 100644 index 0000000..930ed3b --- /dev/null +++ b/client/src/admin/api/getUser.js @@ -0,0 +1,6 @@ +export default (setUser) => ( + fetch('/api/user/me') + .then(res => res.json()) + .then(data => setUser(data.email)) + .catch(() => {}) +); diff --git a/client/src/admin/api/index.js b/client/src/admin/api/index.js new file mode 100644 index 0000000..5b4f9dc --- /dev/null +++ b/client/src/admin/api/index.js @@ -0,0 +1,4 @@ +import getUser from './getUser'; +import logout from './logout'; + +export { getUser, logout }; diff --git a/client/src/admin/api/logout.js b/client/src/admin/api/logout.js index b0a9841..76137da 100644 --- a/client/src/admin/api/logout.js +++ b/client/src/admin/api/logout.js @@ -3,5 +3,6 @@ export default () => ( method: 'POST', }) .then(() => window.location.href = "/") + .then(() => console.log('it will logout')) .catch(() => {}) ); diff --git a/client/src/admin/jsx/App.jsx b/client/src/admin/jsx/App.jsx index 146af70..93b6a33 100644 --- a/client/src/admin/jsx/App.jsx +++ b/client/src/admin/jsx/App.jsx @@ -8,6 +8,7 @@ import Info from './Info.jsx'; import MainScreen from './MainScreen.jsx'; import Context from '../context'; import { defaultLanguage } from '../data/translations'; +import { getUser } from '../api'; const App = () => { const [lang, setLang] = useState(defaultLanguage); @@ -18,8 +19,8 @@ const App = () => { const [user, setUser] = useState(null); useEffect(() => { + getUser(setUser); setInfo('no-saved-websites'); - setUser('admin@op.pl'); }, []); return ( diff --git a/client/src/admin/jsx/User.jsx b/client/src/admin/jsx/User.jsx index 22b96b4..131251e 100644 --- a/client/src/admin/jsx/User.jsx +++ b/client/src/admin/jsx/User.jsx @@ -1,6 +1,6 @@ import React from 'react'; import { WithHover, t } from '../hocs'; -import logout from '../api/logout'; +import { logout } from '../api'; const User = ({ user, setUser, opened, setOpened }) => { const handleLogout = () => { -- cgit v1.2.3