+
+ );
}
diff --git a/src/api/ShlinkApiClient.js b/src/api/ShlinkApiClient.js
index fea32406..9355ac81 100644
--- a/src/api/ShlinkApiClient.js
+++ b/src/api/ShlinkApiClient.js
@@ -3,6 +3,7 @@ import qs from 'qs';
import { isEmpty, isNil, reject } from 'ramda';
const API_VERSION = '1';
+const STATUS_UNAUTHORIZED = 401;
export class ShlinkApiClient {
constructor(axios) {
@@ -14,8 +15,6 @@ export class ShlinkApiClient {
/**
* Sets the base URL to be used on any request
- * @param {String} baseUrl
- * @param {String} apiKey
*/
setConfig = ({ url, apiKey }) => {
this._baseUrl = `${url}/rest/v${API_VERSION}`;
@@ -24,45 +23,46 @@ export class ShlinkApiClient {
listShortUrls = (options = {}) =>
this._performRequest('/short-codes', 'GET', options)
- .then(resp => resp.data.shortUrls)
- .catch(e => this._handleAuthError(e, this.listShortUrls, [options]));
+ .then((resp) => resp.data.shortUrls)
+ .catch((e) => this._handleAuthError(e, this.listShortUrls, [ options ]));
+
+ createShortUrl = (options) => {
+ const filteredOptions = reject((value) => isEmpty(value) || isNil(value), options);
- createShortUrl = options => {
- const filteredOptions = reject(value => isEmpty(value) || isNil(value), options);
return this._performRequest('/short-codes', 'POST', {}, filteredOptions)
- .then(resp => resp.data)
- .catch(e => this._handleAuthError(e, this.createShortUrl, [filteredOptions]));
+ .then((resp) => resp.data)
+ .catch((e) => this._handleAuthError(e, this.createShortUrl, [ filteredOptions ]));
};
getShortUrlVisits = (shortCode, dates) =>
this._performRequest(`/short-codes/${shortCode}/visits`, 'GET', dates)
- .then(resp => resp.data.visits.data)
- .catch(e => this._handleAuthError(e, this.getShortUrlVisits, [shortCode, dates]));
+ .then((resp) => resp.data.visits.data)
+ .catch((e) => this._handleAuthError(e, this.getShortUrlVisits, [ shortCode, dates ]));
- getShortUrl = shortCode =>
+ getShortUrl = (shortCode) =>
this._performRequest(`/short-codes/${shortCode}`, 'GET')
- .then(resp => resp.data)
- .catch(e => this._handleAuthError(e, this.getShortUrl, [shortCode]));
+ .then((resp) => resp.data)
+ .catch((e) => this._handleAuthError(e, this.getShortUrl, [ shortCode ]));
updateShortUrlTags = (shortCode, tags) =>
this._performRequest(`/short-codes/${shortCode}/tags`, 'PUT', {}, { tags })
- .then(resp => resp.data.tags)
- .catch(e => this._handleAuthError(e, this.updateShortUrlTags, [shortCode, tags]));
+ .then((resp) => resp.data.tags)
+ .catch((e) => this._handleAuthError(e, this.updateShortUrlTags, [ shortCode, tags ]));
listTags = () =>
this._performRequest('/tags', 'GET')
- .then(resp => resp.data.tags.data)
- .catch(e => this._handleAuthError(e, this.listTags, []));
+ .then((resp) => resp.data.tags.data)
+ .catch((e) => this._handleAuthError(e, this.listTags, []));
- deleteTags = tags =>
+ deleteTags = (tags) =>
this._performRequest('/tags', 'DELETE', { tags })
.then(() => ({ tags }))
- .catch(e => this._handleAuthError(e, this.deleteTags, [tags]));
+ .catch((e) => this._handleAuthError(e, this.deleteTags, [ tags ]));
editTag = (oldName, newName) =>
this._performRequest('/tags', 'PUT', {}, { oldName, newName })
.then(() => ({ oldName, newName }))
- .catch(e => this._handleAuthError(e, this.editTag, [oldName, newName]));
+ .catch((e) => this._handleAuthError(e, this.editTag, [ oldName, newName ]));
_performRequest = async (url, method = 'GET', query = {}, body = {}) => {
if (isEmpty(this._token)) {
@@ -72,14 +72,16 @@ export class ShlinkApiClient {
return await this.axios({
method,
url: `${this._baseUrl}${url}`,
- headers: { 'Authorization': `Bearer ${this._token}` },
+ headers: { Authorization: `Bearer ${this._token}` },
params: query,
data: body,
- paramsSerializer: params => qs.stringify(params, { arrayFormat: 'brackets' })
- }).then(resp => {
+ paramsSerializer: (params) => qs.stringify(params, { arrayFormat: 'brackets' }),
+ }).then((resp) => {
// Save new token
const { authorization = '' } = resp.headers;
+
this._token = authorization.substr('Bearer '.length);
+
return resp;
});
};
@@ -88,15 +90,17 @@ export class ShlinkApiClient {
const resp = await this.axios({
method: 'POST',
url: `${this._baseUrl}/authenticate`,
- data: { apiKey: this._apiKey }
+ data: { apiKey: this._apiKey },
});
+
return resp.data.token;
};
_handleAuthError = (e, method, args) => {
// If auth failed, reset token to force it to be regenerated, and perform a new request
- if (e.response.status === 401) {
+ if (e.response.status === STATUS_UNAUTHORIZED) {
this._token = '';
+
return method(...args);
}
@@ -105,4 +109,6 @@ export class ShlinkApiClient {
};
}
-export default new ShlinkApiClient(axios);
+const shlinkApiClient = new ShlinkApiClient(axios);
+
+export default shlinkApiClient;
diff --git a/src/common/AsideMenu.js b/src/common/AsideMenu.js
index bf2f0a32..ace7c5c0 100644
--- a/src/common/AsideMenu.js
+++ b/src/common/AsideMenu.js
@@ -4,11 +4,11 @@ import tagsIcon from '@fortawesome/fontawesome-free-solid/faTags';
import FontAwesomeIcon from '@fortawesome/react-fontawesome';
import React from 'react';
import { NavLink } from 'react-router-dom';
+import PropTypes from 'prop-types';
+import classnames from 'classnames';
import DeleteServerButton from '../servers/DeleteServerButton';
import './AsideMenu.scss';
-import PropTypes from 'prop-types';
import { serverType } from '../servers/prop-types';
-import classnames from 'classnames';
const defaultProps = {
className: '',
diff --git a/src/common/Home.js b/src/common/Home.js
index 8efcd317..3aa66f89 100644
--- a/src/common/Home.js
+++ b/src/common/Home.js
@@ -1,14 +1,20 @@
-import chevronIcon from '@fortawesome/fontawesome-free-solid/faChevronRight'
-import FontAwesomeIcon from '@fortawesome/react-fontawesome'
-import { isEmpty, pick, values } from 'ramda'
-import React from 'react'
-import { connect } from 'react-redux'
-import { Link } from 'react-router-dom'
-import { ListGroup, ListGroupItem } from 'reactstrap'
-import { resetSelectedServer } from '../servers/reducers/selectedServer'
-import './Home.scss'
+import chevronIcon from '@fortawesome/fontawesome-free-solid/faChevronRight';
+import FontAwesomeIcon from '@fortawesome/react-fontawesome';
+import { isEmpty, pick, values } from 'ramda';
+import React from 'react';
+import { connect } from 'react-redux';
+import { Link } from 'react-router-dom';
+import { ListGroup, ListGroupItem } from 'reactstrap';
+import PropTypes from 'prop-types';
+import { resetSelectedServer } from '../servers/reducers/selectedServer';
+import './Home.scss';
-export class Home extends React.Component {
+const propTypes = {
+ resetSelectedServer: PropTypes.func,
+ servers: PropTypes.object,
+};
+
+export class HomeComponent extends React.Component {
componentDidMount() {
this.props.resetSelectedServer();
}
@@ -45,4 +51,8 @@ export class Home extends React.Component {
}
}
-export default connect(pick(['servers']), { resetSelectedServer })(Home);
+HomeComponent.propTypes = propTypes;
+
+const Home = connect(pick([ 'servers' ]), { resetSelectedServer })(HomeComponent);
+
+export default Home;
diff --git a/src/common/MainHeader.js b/src/common/MainHeader.js
index 54261623..87b6d2ef 100644
--- a/src/common/MainHeader.js
+++ b/src/common/MainHeader.js
@@ -2,18 +2,23 @@ import plusIcon from '@fortawesome/fontawesome-free-solid/faPlus';
import arrowIcon from '@fortawesome/fontawesome-free-solid/faChevronDown';
import FontAwesomeIcon from '@fortawesome/react-fontawesome';
import React from 'react';
-import { Link, withRouter } from 'react-router-dom'
+import { Link, withRouter } from 'react-router-dom';
import { Collapse, Nav, Navbar, NavbarBrand, NavbarToggler, NavItem, NavLink } from 'reactstrap';
+import classnames from 'classnames';
+import PropTypes from 'prop-types';
import ServersDropdown from '../servers/ServersDropdown';
import './MainHeader.scss';
import shlinkLogo from './shlink-logo-white.png';
-import classnames from 'classnames';
-export class MainHeader extends React.Component {
+const propTypes = {
+ location: PropTypes.object,
+};
+
+export class MainHeaderComponent extends React.Component {
state = { isOpen: false };
- toggle = () => {
+ handleToggle = () => {
this.setState(({ isOpen }) => ({
- isOpen: !isOpen
+ isOpen: !isOpen,
}));
};
@@ -33,10 +38,10 @@ export class MainHeader extends React.Component {
return (
-
-
-
+
+
+
- );
- }
+