From 40432b21755010e3ffa0da4f7acd9092abab9810 Mon Sep 17 00:00:00 2001
From: Michael Dodge <michael.dodge@vivint.com>
Date: Thu, 17 May 2018 16:08:03 -0600
Subject: [PATCH] Adjustments per rbuckton
 (https://github.com/DefinitelyTyped/DefinitelyTyped/pull/25849)

---
 .../axios-token-interceptor-tests.ts          |  6 +--
 types/axios-token-interceptor/index.d.ts      | 45 +++++++++----------
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/types/axios-token-interceptor/axios-token-interceptor-tests.ts b/types/axios-token-interceptor/axios-token-interceptor-tests.ts
index 63f40c611a..036223b699 100644
--- a/types/axios-token-interceptor/axios-token-interceptor-tests.ts
+++ b/types/axios-token-interceptor/axios-token-interceptor-tests.ts
@@ -1,9 +1,9 @@
-import tokenProvider from 'axios-token-interceptor';
+import tokenProvider = require('axios-token-interceptor');
 
 tokenProvider(); // $ExpectError
 
 const validOptions = {
-    getToken: () => Promise.resolve('qwerty'),
+	getToken: () => Promise.resolve('qwerty'),
 };
 tokenProvider(validOptions); // $ExpectType TokenProvider
 
@@ -11,7 +11,7 @@ tokenCache(); // $ExpectError
 
 const getToken = Promise.resolve('qwerty');
 const validCacheOptions = {
-    maxAge: 3600,
+	maxAge: 3600,
 };
 const cache = tokenProvider.tokenCache(getToken, validCacheOptions); // $Expect TokenCache
 
diff --git a/types/axios-token-interceptor/index.d.ts b/types/axios-token-interceptor/index.d.ts
index c2bcd259d2..85121f8165 100644
--- a/types/axios-token-interceptor/index.d.ts
+++ b/types/axios-token-interceptor/index.d.ts
@@ -6,28 +6,27 @@
 import { AxiosRequestConfig } from 'axios';
 
 // Module
-export function AxiosTokenProvider(Options: InterceptorOptions): TokenProvider;
-export namespace AxiosTokenProvider {
+declare function AxiosTokenProvider(Options: AxiosTokenProvider.InterceptorOptions): AxiosTokenProvider.TokenProvider;
+declare namespace AxiosTokenProvider {
 	function tokenCache(getToken: Promise<string>, options: TokenCacheOptions): TokenCache;
+
+	// Interfaces
+	interface InterceptorOptions {
+		token?: string;
+		getToken?: () => string | Promise<string>;
+		header?: string;
+		headerFormatter?: (token: string) => string;
+	}
+
+	type TokenProvider = (config: AxiosRequestConfig) => Promise<AxiosRequestConfig>;
+
+	interface TokenCacheOptions {
+		getMaxAge?: () => number;
+		maxAge?: number;
+	}
+
+	interface TokenCache {
+		reset(): void;
+	}
 }
-export default AxiosTokenProvider;
-
-// Interfaces
-
-export interface InterceptorOptions {
-    token?: string;
-    getToken?: () => string | Promise<string>;
-    header?: string;
-    headerFormatter?: (token: string) => string;
-}
-
-export type TokenProvider = (config: AxiosRequestConfig) => Promise<AxiosRequestConfig>;
-
-export interface TokenCacheOptions {
-    getMaxAge?: () => number;
-    maxAge?: number;
-}
-
-export interface TokenCache {
-    reset(): void;
-}
+export = AxiosTokenProvider;