added new login API

.env.development

@@ -1,17 +1,17 @@
 PORT=3011
-VITE_APP_BASE_LAYOUT_CONFIG_KEY='metronic-react-demo1-8150'
+VITE_APP_BASE_LAYOUT_CONFIG_KEY='digifi-agent'
-VITE_APP_API_URL=https://preview.keenthemes.com/metronic8/laravel/api
+VITE_APP_API_URL=https://dev-agents.digifi.com
 VITE_APP_VERSION=v8.2.3
-VITE_APP_THEME_NAME=WrenchBoard
+VITE_APP_THEME_NAME=digifi
-VITE_APP_THEME_DEMO=demo1
+VITE_APP_THEME_DEMO=digifi
 VITE_APP_BOOTSTRAP_DOCS_LINK=https://getbootstrap.com/docs/5.0
 VITE_APP_SASS_PATH=src/_digifi/assets/sass/core/components
 VITE_APP_SASS_VARIABLES_PATH=src/_digifi/assets/sass/core/components/_variables.scss
-VITE_APP_PURCHASE_URL=https://themeforest.net/item/metronic-responsive-admin-dashboard-template/4021469
+VITE_APP_PURCHASE_URL=https://www.digifi.com/
-VITE_APP_PREVIEW_URL=https://preview.keenthemes.com/metronic8/react/demo1/
+VITE_APP_PREVIEW_URL=https://www.digifi.com/demo1/
-VITE_APP_PREVIEW_REACT_URL=https://preview.keenthemes.com/metronic8/react
+VITE_APP_PREVIEW_REACT_URL=https://www.digifi.com
-VITE_APP_PREVIEW_DOCS_URL=https://preview.keenthemes.com/metronic8/react/docs
+VITE_APP_PREVIEW_DOCS_URL=https://www.digifi.com/
-VITE_APP_THEME_API_URL=https://preview.keenthemes.com/theme-api/api
+VITE_APP_THEME_API_URL=https://api.digifi/api/api
 
 # CUSTOM ENV VARIABLES ADDED
 VITE_APP_USER_ENDPOINT=https://digifi-apidev.chiefsoft.net/digibko/v1

.env.production

@@ -1,17 +1,17 @@
 PORT=3011
-VITE_APP_BASE_LAYOUT_CONFIG_KEY='metronic-react-demo1-8150'
+VITE_APP_BASE_LAYOUT_CONFIG_KEY='digifi-agent'
-VITE_APP_API_URL=https://preview.keenthemes.com/metronic8/laravel/api
+VITE_APP_API_URL=https://dev-agents.digifi.com
 VITE_APP_VERSION=v8.2.3
-VITE_APP_THEME_NAME=DigiFi
+VITE_APP_THEME_NAME=digifi
-VITE_APP_THEME_DEMO=demo1
+VITE_APP_THEME_DEMO=digifi
 VITE_APP_BOOTSTRAP_DOCS_LINK=https://getbootstrap.com/docs/5.0
 VITE_APP_SASS_PATH=src/_digifi/assets/sass/core/components
 VITE_APP_SASS_VARIABLES_PATH=src/_digifi/assets/sass/core/components/_variables.scss
-VITE_APP_PURCHASE_URL=https://themeforest.net/item/metronic-responsive-admin-dashboard-template/4021469
+VITE_APP_PURCHASE_URL=https://www.digifi.com/
-VITE_APP_PREVIEW_URL=https://preview.keenthemes.com/metronic8/react/demo1/
+VITE_APP_PREVIEW_URL=https://www.digifi.com/demo1/
-VITE_APP_PREVIEW_REACT_URL=https://preview.keenthemes.com/metronic8/react
+VITE_APP_PREVIEW_REACT_URL=https://www.digifi.com
-VITE_APP_PREVIEW_DOCS_URL=https://preview.keenthemes.com/metronic8/react/docs
+VITE_APP_PREVIEW_DOCS_URL=https://www.digifi.com/
-VITE_APP_THEME_API_URL=https://preview.keenthemes.com/theme-api/api
+VITE_APP_THEME_API_URL=https://api.digifi/api/api
 
 # CUSTOM ENV VARIABLES ADDED
 VITE_APP_USER_ENDPOINT=https://digifi-apidev.chiefsoft.net/digibko/v1

src/app/modules/apps/user-management/users-list/core/_requests.ts

@@ -4,20 +4,20 @@ import { User, UsersQueryResponse } from "./_models";
 
 const API_URL = import.meta.env.VITE_APP_THEME_API_URL;
 const USER_URL = `${API_URL}/user`;
-const GET_USERS_URL = `${API_URL}/users/query`;
+// const GET_USERS_URL = `${API_URL}/users/query`;
 
-// const NEW_USER_ENDPOINT = import.meta.env.VITE_APP_USER_ENDPOINT
+const NEW_USER_ENDPOINT = import.meta.env.VITE_APP_USER_ENDPOINT
 
-const getStartedUsers = (query: string): Promise<UsersQueryResponse> => {
-  return axios
-    .get(`${GET_USERS_URL}?${query}`)
-    .then((d: AxiosResponse<UsersQueryResponse>) => d.data);
-};
 // const getStartedUsers = (query: string): Promise<UsersQueryResponse> => {
 //   return axios
-//     .get(`${NEW_USER_ENDPOINT}/loan/started`)
+//     .get(`${GET_USERS_URL}?${query}`)
 //     .then((d: AxiosResponse<UsersQueryResponse>) => d.data);
 // };
+const getStartedUsers = (query: string): Promise<UsersQueryResponse> => { // FUNCTION TO GET USERS THAT HAVE STARTED LOAN APPLICATION
+  return axios
+    .get(`${NEW_USER_ENDPOINT}/loan/started`)
+    .then((d: AxiosResponse<UsersQueryResponse>) => d.data);
+};
 
 const getUserById = (id: ID): Promise<User | undefined> => {
   return axios

src/app/modules/auth/core/AuthHelpers.ts

@@ -53,9 +53,9 @@ export function setupAxios(axios: any) {
   axios.interceptors.request.use(
     (config: {headers: {Authorization: string}}) => {
       const auth = getAuth()
-      if (auth && auth.api_token) {
+      // if (auth && auth.api_token) {
-        config.headers.Authorization = `Bearer ${auth.api_token}`
+      //   config.headers.Authorization = `Bearer ${auth.api_token}`
-      }
+      // }
 
       return config
     },

src/app/modules/auth/core/AxiosCallHelper.ts

@@ -1,12 +1,12 @@
 import axios from "axios";
 
 export function postAuxEnd(uri:string, reqData:any):Promise<any> {
-    // const endPoint = process.env.REACT_APP_USERS_ENDPOINT + uri;
+    const endPoint = import.meta.env.VITE_APP_USER_ENDPOINT + uri;
     const formData = new FormData();
     for (let value in reqData) {
       formData.append(value, reqData[value]);
     }
-    return axios.post(uri, reqData)
+    return axios.post(endPoint, formData)
         .then((response) => {
           console.log(response);
         //   if (response.data.internal_return == "-9999") {

src/app/modules/auth/core/_models.ts

@@ -1,6 +1,18 @@
 export interface AuthModel {
   api_token: string
   refreshToken?: string
+
+  message?: string
+  call_return?: string
+  username: string
+  token?: string
+  id?: string
+  first_name?: string
+  last_name?: string
+  email?: string
+  email_verified_at?: string
+  created_at?: string
+  updated_at?: string
 }
 
 export interface UserAddressModel {
@@ -64,4 +76,13 @@ export interface UserModel {
   communication?: UserCommunicationModel
   address?: UserAddressModel
   socialNetworks?: UserSocialNetworksModel
+
+  api_token: string
+  refreshToken?: string
+  message?: string
+  call_return?: string
+  token?: string
+  email_verified_at?: string
+  created_at?: string
+  updated_at?: string
 }

src/app/modules/auth/core/_requests.ts

@@ -5,9 +5,11 @@ import { postAuxEnd } from "./AxiosCallHelper";
 
 const API_URL = import.meta.env.VITE_APP_API_URL;
 
-export const GET_USER_BY_ACCESSTOKEN_URL = `${API_URL}/verify_token`;
+// export const GET_USER_BY_ACCESSTOKEN_URL = `${API_URL}/verify_token`;
-export const LOGIN_URL = `${API_URL}/login`;
+// export const LOGIN_URL = `${API_URL}/login`;
-// export const LOGIN_URL = 'https://digifi-apidev.chiefsoft.net/digibko/v1/identity/token'
+
+export const GET_USER_BY_ACCESSTOKEN_URL = '/identity/verify_token'
+export const LOGIN_URL = '/identity/token'
 export const REGISTER_URL = `${API_URL}/register`;
 export const REQUEST_PASSWORD_URL = `${API_URL}/forgot_password`;
 
@@ -17,13 +19,7 @@ export function login(email: string, password: string) {
   //   email,
   //   password,
   // });
-
+  return postAuxEnd(LOGIN_URL, {username:email, pass:password})
-  // let formData = new FormData()
-  // formData.append('username', email)
-  // formData.append('pass', password)
-  // return axios.post<AuthModel>(LOGIN_URL, formData);
-
-  return postAuxEnd(LOGIN_URL, {email, password})
 }
 
 // Server should return AuthModel
@@ -50,8 +46,12 @@ export function requestPassword(email: string) {
   });
 }
 
+// export function getUserByToken(token: string) {
+//   return axios.post<UserModel>(GET_USER_BY_ACCESSTOKEN_URL, {
+//     api_token: token,
+//   });
+// }
+
 export function getUserByToken(token: string) {
-  return axios.post<UserModel>(GET_USER_BY_ACCESSTOKEN_URL, {
+  return postAuxEnd(GET_USER_BY_ACCESSTOKEN_URL, {token})
-    api_token: token,
-  });
 }