Clean unnecessary code up

packages/authentication/modules/user/useUser/__tests__/useSimpleTokenUser.test.tsx

@@ -17,22 +17,7 @@ import request from './fixtures/request.json'
 export const axiosMock = new MockAdapter(axios)
 
 describe('useSimpleTokenUser', () => {
-  const OLD_ENV = process.env
-  // let axiosMock: MockAdapter
-
-  beforeEach(() => {
-    // jest.resetModules()
-    // process.env = { ...OLD_ENV, NEXT_PUBLIC_TOKEN_TYPE: 'simple' }
-    // const { axios } = require('@baseapp-frontend/utils')
-    // axiosMock = new MockAdapter(axios)
-  })
-
-  afterAll(() => {
-    process.env = OLD_ENV
-  })
-
   test('should user be present for authenticated', async () => {
-    // const { useSimpleTokenUser } = require('../index')
     ;(Cookies.get as CookiesGetByNameFn) = jest.fn(() => 'fake token')
 
     axiosMock.onGet('/users/me').reply(200, request)
@@ -48,7 +33,6 @@ describe('useSimpleTokenUser', () => {
   })
 
   test('can use a custom type interface', async () => {
-    // const { useSimpleTokenUser } = require('../index')
     ;(Cookies.get as CookiesGetByNameFn) = jest.fn(() => 'fake token')
 
     interface ICustomUser extends IUser {
@@ -67,7 +51,6 @@ describe('useSimpleTokenUser', () => {
   })
 
   test('should remove cookie if 401', async () => {
-    // const { useSimpleTokenUser } = require('../index')
     ;(Cookies.get as CookiesGetByNameFn) = jest.fn(() => 'fake token')
     ;(Cookies.remove as CookiesGetByNameFn) = jest.fn(() => '')
 

packages/authentication/services/user.ts

@@ -1,6 +1,5 @@
 import { axios } from '@baseapp-frontend/utils'
 
-// import { getAxiosInstance } from '@baseapp-frontend/utils'
 import { IUser } from '../types/user'
 
 export default class UserApi {

packages/authentication/types/auth.d.ts

@@ -44,10 +44,6 @@ export interface IRegisterRequest {
   acceptConsent?: boolean
 }
 
-export interface IRefreshTokenRequest {
-  refreshToken: string
-}
-
 export interface ICookieName {
   cookieName?: string
   refreshCookieName?: string

packages/core/src/axios.ts

@@ -2,19 +2,8 @@ import _axios from 'axios'
 import humps from 'humps'
 import Cookies from 'js-cookie'
 
-import { readExpiry, storeExpiry } from './local-storage-helper'
 import { buildQueryString } from './queryString'
 
-// decrypt encrypted data
-async function refreshToken() {
-  // place request to backend service to refresh token
-  const response = await _axios.put('/api/token/refresh/')
-  // update stored instance
-  storeExpiry('auth_token', response.data.token, true)
-  // update axios instance with new token
-  return response.refresh
-}
-
 function createAxiosInstance({ file = false } = {}) {
   const instance = _axios.create({
     baseURL: process.env.NEXT_PUBLIC_API_BASE_URL,
@@ -29,19 +18,14 @@ function createAxiosInstance({ file = false } = {}) {
   instance.defaults.headers.patch['Content-Type'] = contentType
   instance.defaults.headers.put['Content-Type'] = contentType
 
-  instance.interceptors.request.use(async (request) => {
-    let authToken = Cookies.get('Authorization')
+  instance.interceptors.request.use((request) => {
+    const authToken = Cookies.get('Authorization')
     if (authToken) {
       if (request.headers && !request.headers.Authorization) {
-        const token = readExpiry(authToken)
-        if (token.response != null && token.expired) {
-          authToken = await refreshToken()
-        }
         request.headers.Authorization = `Token ${authToken}`
       }
     }
-    console.log('!!!authToken', authToken)
-    console.log('!!!request', request)
+
     if (request.data && !file) {
       request.data = JSON.stringify(humps.decamelizeKeys(request.data))
     }
@@ -56,34 +40,12 @@ function createAxiosInstance({ file = false } = {}) {
       }
       return response
     },
-    async (error) => {
+    (error) => {
       if (error.response.data && error.response.headers?.['content-type'] === 'application/json') {
         const newError = { response: { data: {} } }
         newError.response.data = humps.camelizeKeys(error.response.data)
       }
-      const { status, data } = error.response
-      switch (status) {
-        case 401:
-          // check if 401 error was token
-          console.log('!!!data.message', data.message)
-          if (data.message === 'An unauthenticated request was made, Please try again') {
-            // token has expired;
-            try {
-              // attempting to refresh token;
-              await refreshToken()
-              // token refreshed, reattempting request;
-              const { config } = error
-              // configure new request in a new instance;
-              return await _axios({ method: config.method, url: config.url, data: config.data })
-            } catch (e) {
-              console.log(e)
-            }
-          }
-          return Promise.reject(error)
-
-        default:
-          return Promise.reject(error)
-      }
+      return Promise.reject(error)
     },
   )
 

packages/utils/index.ts

@@ -11,8 +11,6 @@ export * from './functions/form'
 export * from './functions/string'
 export * from './functions/token'
 
-export * from './functions/axios/utils'
-
 export { default as useDebounce } from './hooks/useDebounce'
 
 export type { IDjangoPaginatedResponse, OrderingDirection } from './types/django'

packages/utils/types/jwt.ts

@@ -1,10 +1,3 @@
-export interface IJWT {
-  token_type: 'access' | 'refresh'
-  exp: number
-  iat: number
-  jti: string
-}
-
 export interface IJWTResponse {
   access: string
   refresh: string