github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-25 03:00:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Syntax fixes (#5367)

Browse Source 
* Declare return types on functions

And a very few other type related minor fixes

* Minor syntax fixes

* Remove unnecessary escape chars in regexes
* Remove unnecessary awaits
* Replace deprecated req.connection with req.socket
* Replace deprecated upload with uploadOne
* Remove unnecessary eslint-disable-next-line comments
* Comment empty functions / catch or finally clauses
* Fix irregular whitespaces
* Add missing returns (null)
* Remove unreachable code
* A few logical fixes
* Remove / Handle non-null assertions which are certainly unnecessary (e.g. in
tests)
This commit is contained in:
Pascal Jufer
2021-04-29 18:11:43 +02:00
committed by GitHub
parent 40eba791fa
commit acd41eb0be
231 changed files with 646 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/api.ts
View File

@@ -24,7 +24,7 @@ export interface RequestError extends AxiosError {
response: Response;
}
export const onRequest = (config: AxiosRequestConfig) => {
export const onRequest = (config: AxiosRequestConfig): RequestConfig => {
const requestsStore = useRequestsStore();
const id = requestsStore.startRequest();
@@ -36,14 +36,14 @@ export const onRequest = (config: AxiosRequestConfig) => {
return requestConfig;
};
export const onResponse = (response: AxiosResponse | Response) => {
export const onResponse = (response: AxiosResponse | Response): AxiosResponse | Response => {
const requestsStore = useRequestsStore();
const id = (response.config as RequestConfig).id;
requestsStore.endRequest(id);
return response;
};
export const onError = async (error: RequestError) => {
export const onError = async (error: RequestError): Promise<RequestError> => {
const requestsStore = useRequestsStore();
const id = (error.response.config as RequestConfig).id;
requestsStore.endRequest(id);
@@ -64,7 +64,7 @@ export const onError = async (error: RequestError) => {
error.request.responseURL.includes('login') === false &&
error.request.responseURL.includes('tfa') === false
) {
let newToken: string;
let newToken: string | undefined;
try {
newToken = await refresh();
@@ -95,7 +95,7 @@ function getToken() {
return api.defaults.headers?.['Authorization']?.split(' ')[1] || null;
}
export function addTokenToURL(url: string, token?: string) {
export function addTokenToURL(url: string, token?: string): string {
token = token || getToken();
if (!token) return url;