[@dhealthdapps/frontend] fix: update websocket environment and add BA…

…CKEND_DOMAIN variable
dhealthproject · Jan 4, 2023 · 11b9ced · 11b9ced
1 parent d3cfccc
commit 11b9ced
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/runtime/dapp-frontend-vue/.env-sample b/runtime/dapp-frontend-vue/.env-sample
@@ -1,4 +1,5 @@
 VUE_APP_BACKEND_URL=http://localhost:7903
+VUE_APP_BACKEND_DOMAIN=localhost:7903
 VUE_APP_FRONTEND_URL=http://localhost:8080
 VUE_APP_FRONTEND_DOMAIN=localhost
 VUE_APP_FRONTEND_PORT=8080

diff --git a/runtime/dapp-frontend-vue/src/registerServiceWorker.ts b/runtime/dapp-frontend-vue/src/registerServiceWorker.ts
@@ -11,7 +11,7 @@
 import { register } from "register-service-worker";
 
 if (process.env.NODE_ENV === "production") {
-  register(`${process.env.BASE_URL}service-worker.js`, {
+  register(`${process.env.VUE_APP_FRONTEND_URL}/service-worker.js`, {
     ready() {
       console.log(
         "[INFO] dHealth dApp is being served from cache by a service worker.\n" +

diff --git a/runtime/dapp-frontend-vue/src/router.ts b/runtime/dapp-frontend-vue/src/router.ts
@@ -64,7 +64,7 @@ export const createRouter = ($store: any): VueRouter => {
   // configures the `vue-router` routes
   const router = new VueRouter({
     mode: "history",
-    base: process.env.BASE_URL,
+    /* base: "/" */
     routes: [
       ...dynamicRoutes,
       {

diff --git a/runtime/dapp-frontend-vue/src/state/store/AppModule.ts b/runtime/dapp-frontend-vue/src/state/store/AppModule.ts
@@ -192,7 +192,7 @@ export const AppModule = {
         try {
           const response = await handler.getConfig();
           context.commit("setConfig", response);
-          context.commit("auth/setAuthRegistry", response.authRegistry, {
+          context.commit("auth/setAuthRegistry", response.authRegistry[0], {
             root: true,
           });
           return response;

diff --git a/runtime/dapp-frontend-vue/src/views/LoginScreen/LoginScreen.ts b/runtime/dapp-frontend-vue/src/views/LoginScreen/LoginScreen.ts
@@ -328,7 +328,9 @@ export default class LoginScreen extends MetaView {
   public async mounted() {
     this.qrConfig = this.createLoginQRCode();
 
-    this.wsConnection = new WebSocket(`ws://${process.env.BACKEND_DOMAIN}:${process.env.BACKEND_PORT}/ws`);
+    this.wsConnection = new WebSocket(
+      `ws://${process.env.VUE_APP_BACKEND_DOMAIN}/ws`
+    );
 
     this.wsConnection.onopen = function () {
       console.log("Successfully connected to the echo websocket server...");