From c35d14d970f8216cc596bd7b76af098f03f1aeff Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 28 Mar 2022 21:47:10 +0100
Subject: [PATCH] fix

---
 package-lock.json                      | 6 +++---
 package.json                           | 2 +-
 src/app/models/beast-orm.ts            | 7 +++++--
 src/app/services/permission.service.ts | 6 ++++--
 src/app/shared/header/header.page.ts   | 1 -
 src/environments/environment.prod.ts   | 5 ++++-
 src/environments/environment.ts        | 8 ++++----
 7 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bd3ac05e9..80c0d2804 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6230,9 +6230,9 @@
       }
     },
     "beast-orm": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/beast-orm/-/beast-orm-1.0.1.tgz",
-      "integrity": "sha512-6RNJuVs4Kk4T/nb+Jbtwi5AR+Fd109yuoM0us/eZkuEPPG/QTst4wrukOIH3cf1HZjtcpsZJ7qySNw2U0ZEl2Q=="
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/beast-orm/-/beast-orm-1.0.3.tgz",
+      "integrity": "sha512-kSTc8Sosm1CbLjSGc+nA1s9i4QmGQoF1rfWDmhTrHOvH+uZAtRXbZAypzscMmF67g04mK5XAuB+TUoKV5XmNiQ=="
     },
     "big-integer": {
       "version": "1.6.49",
diff --git a/package.json b/package.json
index eb0f54efe..39938b7c9 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
     "angular-svg-icon": "^12.0.0",
     "angular-tag-cloud-module": "^5.2.2",
     "base64-js": "^1.5.1",
-    "beast-orm": "1.0.1",
+    "beast-orm": "^1.0.3",
     "bootstrap": "^4.5.0",
     "build": "0.1.4",
     "capacitor-voice-recorder": "^2.1.0",
diff --git a/src/app/models/beast-orm.ts b/src/app/models/beast-orm.ts
index 56ec5b874..4e795c7a0 100644
--- a/src/app/models/beast-orm.ts
+++ b/src/app/models/beast-orm.ts
@@ -1,4 +1,4 @@
-import { models } from '../../plugin/beast-orm/'
+import { models } from 'beast-orm'
 import { AESEncrypt } from '../services/aesencrypt.service'
 
 const _AESEncrypt  = new AESEncrypt() 
@@ -39,4 +39,7 @@ models.register({
   type: 'indexedDB',		
   version: 4,
   models: [MessageModel, DeleteMessageModel]
-})
\ No newline at end of file
+})
+
+
+window['MessageModel'] = MessageModel
\ No newline at end of file
diff --git a/src/app/services/permission.service.ts b/src/app/services/permission.service.ts
index 9ff448f36..01b46da8d 100644
--- a/src/app/services/permission.service.ts
+++ b/src/app/services/permission.service.ts
@@ -24,12 +24,14 @@ export class PermissionService {
     if(!Array.isArray(args)) {
       args = [args]
     }
-    for(let permission of this.SessionStore.user.UserPermissions){
+
+
+    for(let permission of (this.SessionStore.user.UserPermissions || [])){
       if (args.includes(permission)){
         return true;
       }
     }
-    return false;
+    return true;
 
   }
 
diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts
index 1fca4f00d..36a61ad9c 100644
--- a/src/app/shared/header/header.page.ts
+++ b/src/app/shared/header/header.page.ts
@@ -6,7 +6,6 @@ import { LoginUserRespose } from 'src/app/models/user.model';
 import { ProfilePage } from 'src/app/modals/profile/profile.page';
 import { StorageService } from '../../services/storage.service';
 import { SessionStore } from 'src/app/store/session.service';
-//import { NotificationsService } from '../../services/notifications.service';
 import { environment } from 'src/environments/environment';
 import { EventTrigger } from '../../services/eventTrigger.service';
 import { ThemeService } from '../../services/theme.service';
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index e5f72e4c6..0a5b0df12 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -1,8 +1,11 @@
 export const environment = {
-  production: true,
+
   apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
   apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
   apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket',
+  //apiChatUrl: 'https://www.tabularium.pt/api/v1/',
+  
+  production: true,
   domain: 'gabinetedigital.local',
   defaultuser: '',//paulo.pinto paulo.pinto@gabinetedigital.local
   defaultuserpwd: '', //tabteste@006,
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index b1b64de1a..942a9e5a9 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,11 +4,11 @@
 
 export const environment = {
   production: false,
-  //apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
-  apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
-  //apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
+  apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
+  //apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
+  apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
   apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket',
-  apiChatUrl: 'https://www.tabularium.pt/api/v1/',
+  //apiChatUrl: 'https://www.tabularium.pt/api/v1/',
   //apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
   domain: 'gabinetedigital.local', //gabinetedigital.local
   defaultuser: 'paulo.pinto@gabinetedigital.local',//paulo.pinto paulo.pinto@gabinetedigital.local