Merge pull request #58 from silverlogic/update-auth-endpoint-default-…

…path update auth endpoint url path to match baseapp-django-v3
silverlogic · Oct 2, 2023 · 97fabc9 · 97fabc9
2 parents 4575eeb + 6bab71f
commit 97fabc9
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 14 deletions.
diff --git a/apps/docs/pages/auth/index.tsx b/apps/docs/pages/auth/index.tsx
@@ -16,7 +16,7 @@ export default function Auth() {
 
   const mockForSuccessAndLogIn = (e: any) => {
     e.preventDefault()
-    axiosMock.onPost('/login').reply(
+    axiosMock.onPost('/auth/login').reply(
       (_config) =>
         new Promise((resolve, _reject) => {
           setTimeout(() => {
@@ -29,7 +29,7 @@ export default function Auth() {
 
   const mockForErrorAndLogIn = () => {
     axiosMock
-      .onPost('/login')
+      .onPost('/auth/login')
       .reply(400, { email: ['Testing Api Error'], password: ['Wrong Password'] })
     form.handleSubmit()
   }

diff --git a/packages/authentication/CHANGELOG.md b/packages/authentication/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @baseapp-frontend/authentication
 
+## 1.1.3
+
+### Patch Changes
+
+- update auth endpoint url path to match baseapp-django-v3. The default login path is `/auth/login` for both SimpleToken and JWT auth
+
 ## 1.1.2
 
 ### Patch Changes

diff --git a/packages/authentication/modules/access/useLogin/__tests__/useLogin.test.tsx b/packages/authentication/modules/access/useLogin/__tests__/useLogin.test.tsx
@@ -13,7 +13,7 @@ export const axiosMock = new MockAdapter(axios)
 
 describe('useLogin', () => {
   test('should run onSuccess', async () => {
-    axiosMock.onPost('/auth').reply(200, {
+    axiosMock.onPost('/auth/login').reply(200, {
       token: 'fake token',
     })
     cookiesMock.set.mockImplementation((cookieName: string) => cookieName)

diff --git a/packages/authentication/modules/access/useLogin/index.ts b/packages/authentication/modules/access/useLogin/index.ts
@@ -87,8 +87,7 @@ const useLogin = ({
   })
 
   const mutation = useMutation({
-    mutationFn: (data: ILoginRequest) =>
-      tokenType === TokenTypes.jwt ? ApiClass.login(data) : ApiClass.simpleTokenLogin(data),
+    mutationFn: (data: ILoginRequest) => ApiClass.login(data),
     ...loginOptions, // needs to be placed bellow all overridable options
     onError: (err, variables, context) => {
       loginOptions?.onError?.(err, variables, context)

diff --git a/packages/authentication/modules/access/useLogin/types.ts b/packages/authentication/modules/access/useLogin/types.ts
@@ -5,7 +5,7 @@ import { UseMutationOptions } from '@tanstack/react-query'
 import AuthApi from '../../../services/auth'
 import { ICookieName, ILoginMfaRequest, ILoginRequest, LoginResponse } from '../../../types/auth'
 
-type ApiClass = Pick<typeof AuthApi, 'login' | 'simpleTokenLogin'>
+type ApiClass = Pick<typeof AuthApi, 'login'>
 
 export interface IUseLogin extends ICookieName {
   // TODO: refactor types

diff --git a/packages/authentication/package.json b/packages/authentication/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@baseapp-frontend/authentication",
   "description": "Authentication modules.",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "main": "./dist/index.ts",
   "module": "./dist/index.mjs",
   "scripts": {

diff --git a/packages/authentication/services/auth.ts b/packages/authentication/services/auth.ts
@@ -10,10 +10,6 @@ import {
 
 export default class AuthApi {
   static login({ email, password }: ILoginRequest): Promise<LoginResponse> {
-    return axios.post(`/auth`, { email, password })
-  }
-
-  static simpleTokenLogin({ email, password }: ILoginRequest): Promise<LoginResponse> {
     return axios.post(`/auth/login`, { email, password })
   }
 

diff --git a/packages/authentication/services/mfa.ts b/packages/authentication/services/mfa.ts
@@ -42,7 +42,7 @@ export default class MfaApi {
   }
 
   static loginStep2(data: ILoginMfaRequest): Promise<ILoginSimpleTokenResponse> {
-    return axios.post('/login/code', data)
+    return axios.post('/auth/login/code', data)
   }
 }
 

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @baseapp-frontend/core
 
+## 2.7.3
+
+### Patch Changes
+
+- update auth endpoint url path to match baseapp-django-v3. The default login path is `/auth/login` for both SimpleToken and JWT auth
+
 ## 2.7.2
 
 ### Patch Changes

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@baseapp-frontend/core",
-  "version": "2.7.2",
+  "version": "2.7.3",
   "description": "Core utilities.",
   "main": "./src/index.tsx",
   "scripts": {

diff --git a/packages/core/src/mfa/api.ts b/packages/core/src/mfa/api.ts
@@ -45,6 +45,6 @@ export default class MfaApi {
   }
 
   static loginStep2(data: ILoginMfaRequest): Promise<AxiosResponse<ILoginResponse>> {
-    return axios.post('/login/code', data)
+    return axios.post('/auth/login/code', data)
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,7 +42,7 @@ export default class MfaApi { @@
       }
       static loginStep2(data: ILoginMfaRequest): Promise<ILoginSimpleTokenResponse> {
-        return axios.post('/login/code', data)
+        return axios.post('/auth/login/code', data)
       }
     }
@@ Expand Down @@