Merge pull request #185 from k2maan/#85zrm1ktj

Implemented: support for using api and client methods from OMS api package (#85zrm1ktj)

package.json

@@ -16,17 +16,14 @@
     "@capacitor/core": "^2.4.7",
     "@hotwax/app-version-info": "^1.0.0",
     "@hotwax/apps-theme": "^1.1.0",
-    "@hotwax/oms-api": "1.1.0",
+    "@hotwax/oms-api": "^1.5.1",
     "@ionic/core": "6.2.9",
     "@ionic/vue": "6.2.9",
     "@ionic/vue-router": "6.2.9",
     "@types/file-saver": "^2.0.4",
     "@types/papaparse": "^5.3.1",
-    "axios": "^0.21.1",
-    "axios-cache-adapter": "^2.7.3",
     "core-js": "^3.6.5",
     "file-saver": "^2.0.5",
-    "http-status-codes": "^2.1.4",
     "luxon": "^3.2.0",
     "mitt": "^2.1.0",
     "register-service-worker": "^1.7.1",

src/App.vue

@@ -16,6 +16,7 @@ import { mapGetters, useStore } from 'vuex';
 import { init, resetConfig } from '@/adapter'
 import { showToast } from "@/utils";
 import { translate } from "@/i18n";
+import { useRouter } from 'vue-router';
 
 export default defineComponent({
   name: 'App',
@@ -79,6 +80,10 @@ export default defineComponent({
       this.store.dispatch('user/updatePwaState', { registration, updateExists });
       showToast(translate("New version available, please update the app."));
     },
+    async unauthorized() {
+      this.store.dispatch("user/logout");
+      this.router.push("/login")
+    }
   },
   async mounted() {
     this.loader = await loadingController
@@ -90,10 +95,9 @@ export default defineComponent({
     emitter.on('presentLoader', this.presentLoader);
     emitter.on('dismissLoader', this.dismissLoader);
     emitter.on('playAnimation', this.playAnimation);
-
-    init(this.userToken, this.instanceUrl, this.maxAge)
   },
   created() {
+    init(this.userToken, this.instanceUrl, this.maxAge)
     document.addEventListener('swUpdated', this.updateAvailable, { once: true })
     navigator.serviceWorker.addEventListener('controllerchange', () => {
       if (this.refreshing) return
@@ -115,8 +119,10 @@ export default defineComponent({
   },
   setup(){
     const store = useStore();
+    const router = useRouter();
     return {
-      store,
+      router,
+      store
     }
   },
 });

src/adapter/index.ts

@@ -1,4 +1,6 @@
 import {
+  api,
+  client,
   fetchProducts,
   init,
   isError,
@@ -9,6 +11,8 @@ import {
 } from '@hotwax/oms-api'
 
 export {
+  api,
+  client,
   fetchProducts,
   init,
   isError,

src/services/UploadService.ts

@@ -1,4 +1,4 @@
-import api from '../api'
+import { api } from '@/adapter';
 import { UploadRequest } from '@/types'
 
 const uploadJsonFile = async (payload: any): Promise <any>  => {

src/services/UserService.ts

@@ -1,4 +1,4 @@
-import api, {client} from '@/api'
+import { api, client } from '@/adapter'
 import store from '@/store';
 
 const login = async (username: string, password: string): Promise <any> => {

src/services/UtilService.ts

@@ -1,4 +1,4 @@
-import api from '@/api';
+import { api } from '@/adapter'
 
 const getFacilities= async (payload: any): Promise <any> => {
     return api({