aboutsummaryrefslogtreecommitdiff
path: root/vnext/src
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2018-06-27 16:32:53 +0300
committerGravatar Vitaly Takmazov2023-01-13 10:37:53 +0300
commit660cc823d4f2446dbc3113b2de4d3164664303fb (patch)
treead6b807841a926313806892e2410f7932d717837 /vnext/src
parent930736e7b3ff29de16aaec9229242bd83c09f3b7 (diff)
fix social login
Diffstat (limited to 'vnext/src')
-rw-r--r--vnext/src/api/index.js7
-rw-r--r--vnext/src/components/LoginButton.js4
-rw-r--r--vnext/src/index.js10
3 files changed, 16 insertions, 5 deletions
diff --git a/vnext/src/api/index.js b/vnext/src/api/index.js
index 130a5dc2..b190bc48 100644
--- a/vnext/src/api/index.js
+++ b/vnext/src/api/index.js
@@ -12,12 +12,13 @@ client.interceptors.request.use(config => {
return config;
})
-export function auth(username, password) {
+export function me(username = '', password = '') {
return new Promise((resolve, reject) => {
+
client.get('/me', {
- headers: {
+ headers: username ? {
'Authorization': 'Basic ' + window.btoa(unescape(encodeURIComponent(username + ":" + password)))
- }
+ } : {}
}).then(response => {
localStorage.visitor = JSON.stringify(response.data);
resolve(response.data)
diff --git a/vnext/src/components/LoginButton.js b/vnext/src/components/LoginButton.js
index fbce6982..e59dabdf 100644
--- a/vnext/src/components/LoginButton.js
+++ b/vnext/src/components/LoginButton.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import Icon from './Icon';
import Modal from './Modal';
-import { auth } from '../api';
+import { me } from '../api';
export default class LoginButton extends React.Component {
constructor(props) {
@@ -32,7 +32,7 @@ export default class LoginButton extends React.Component {
}
login = (event) => {
event.preventDefault();
- auth(this.state.username, this.state.password)
+ me(this.state.username, this.state.password)
.then(response => {
this.toggleModal();
this.props.onAuth(response);
diff --git a/vnext/src/index.js b/vnext/src/index.js
index 9527178e..9dbf21e7 100644
--- a/vnext/src/index.js
+++ b/vnext/src/index.js
@@ -15,11 +15,14 @@ import Footer from './components/Footer';
import Avatar from './components/Avatar';
import Header from './components/Header';
+import { me } from './api';
+
class App extends React.Component {
constructor(props) {
super(props);
let params = qs.parse(window.location.search)
if (params.hash) {
+ localStorage.visitor = JSON.stringify({uid: 0, hash: params.hash});
window.history.replaceState({}, document.title, `${window.location.protocol}//${window.location.host}${window.location.pathname}`)
}
this.state = {
@@ -30,6 +33,13 @@ class App extends React.Component {
};
}
+ componentDidMount() {
+ const {hash, uid} = this.state.visitor;
+ if (uid === 0 && hash) {
+ me().then(visitor => this.auth(visitor))
+ }
+ }
+
render() {
const user = this.state.visitor;
return (