diff --git a/package-lock.json b/package-lock.json index f1577e74b..fc33943ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -152,7 +152,6 @@ "ngx-socket-io": "^3.2.0", "pdfjs": "^2.4.6", "pdfjs-dist": "^2.9.359", - "puppeteer": "^15.1.1", "rocket.chat.realtime.api.rxjs": "^2.1.1", "rxjs": "~6.6.3", "rxjs-compat": "^6.6.7", @@ -6791,6 +6790,7 @@ "version": "2.10.0", "license": "MIT", "optional": true, + "peer": true, "dependencies": { "@types/node": "*" } @@ -10974,13 +10974,6 @@ "yarn": ">=1" } }, - "node_modules/cross-fetch": { - "version": "3.1.5", - "license": "MIT", - "dependencies": { - "node-fetch": "2.6.7" - } - }, "node_modules/cross-spawn": { "version": "7.0.3", "license": "MIT", @@ -12032,8 +12025,10 @@ } }, "node_modules/devtools-protocol": { - "version": "0.0.1011705", - "license": "BSD-3-Clause" + "version": "0.0.869402", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz", + "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==", + "peer": true }, "node_modules/di": { "version": "0.0.1", @@ -13270,6 +13265,7 @@ "node_modules/extract-zip": { "version": "2.0.1", "license": "BSD-2-Clause", + "peer": true, "dependencies": { "debug": "^4.1.1", "get-stream": "^5.1.0", @@ -13288,6 +13284,7 @@ "node_modules/extract-zip/node_modules/get-stream": { "version": "5.2.0", "license": "MIT", + "peer": true, "dependencies": { "pump": "^3.0.0" }, @@ -26073,30 +26070,34 @@ } }, "node_modules/puppeteer": { - "version": "15.3.0", + "version": "9.1.1", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-9.1.1.tgz", + "integrity": "sha512-W+nOulP2tYd/ZG99WuZC/I5ljjQQ7EUw/jQGcIb9eu8mDlZxNY2SgcJXTLG9h5gRvqA3uJOe4hZXYsd3EqioMw==", + "deprecated": "< 18.1.0 is no longer supported", "hasInstallScript": true, - "license": "Apache-2.0", + "peer": true, "dependencies": { - "cross-fetch": "3.1.5", - "debug": "4.3.4", - "devtools-protocol": "0.0.1011705", - "extract-zip": "2.0.1", - "https-proxy-agent": "5.0.1", - "pkg-dir": "4.2.0", - "progress": "2.0.3", - "proxy-from-env": "1.1.0", - "rimraf": "3.0.2", - "tar-fs": "2.1.1", - "unbzip2-stream": "1.4.3", - "ws": "8.8.0" + "debug": "^4.1.0", + "devtools-protocol": "0.0.869402", + "extract-zip": "^2.0.0", + "https-proxy-agent": "^5.0.0", + "node-fetch": "^2.6.1", + "pkg-dir": "^4.2.0", + "progress": "^2.0.1", + "proxy-from-env": "^1.1.0", + "rimraf": "^3.0.2", + "tar-fs": "^2.0.0", + "unbzip2-stream": "^1.3.3", + "ws": "^7.2.3" }, "engines": { - "node": ">=14.1.0" + "node": ">=10.18.1" } }, "node_modules/puppeteer/node_modules/debug": { "version": "4.3.4", "license": "MIT", + "peer": true, "dependencies": { "ms": "2.1.2" }, @@ -26109,25 +26110,6 @@ } } }, - "node_modules/puppeteer/node_modules/ws": { - "version": "8.8.0", - "license": "MIT", - "engines": { - "node": ">=10.0.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": "^5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, "node_modules/q": { "version": "1.5.1", "license": "MIT", @@ -36462,6 +36444,7 @@ "node_modules/unbzip2-stream": { "version": "1.4.3", "license": "MIT", + "peer": true, "dependencies": { "buffer": "^5.2.1", "through": "^2.3.8" @@ -43086,6 +43069,7 @@ "@types/yauzl": { "version": "2.10.0", "optional": true, + "peer": true, "requires": { "@types/node": "*" } @@ -45788,12 +45772,6 @@ "cross-spawn": "^7.0.1" } }, - "cross-fetch": { - "version": "3.1.5", - "requires": { - "node-fetch": "2.6.7" - } - }, "cross-spawn": { "version": "7.0.3", "requires": { @@ -46443,7 +46421,10 @@ "version": "1.0.1" }, "devtools-protocol": { - "version": "0.0.1011705" + "version": "0.0.869402", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz", + "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==", + "peer": true }, "di": { "version": "0.0.1", @@ -47285,6 +47266,7 @@ }, "extract-zip": { "version": "2.0.1", + "peer": true, "requires": { "@types/yauzl": "^2.9.1", "debug": "^4.1.1", @@ -47294,6 +47276,7 @@ "dependencies": { "get-stream": { "version": "5.2.0", + "peer": true, "requires": { "pump": "^3.0.0" } @@ -55860,31 +55843,31 @@ } }, "puppeteer": { - "version": "15.3.0", + "version": "9.1.1", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-9.1.1.tgz", + "integrity": "sha512-W+nOulP2tYd/ZG99WuZC/I5ljjQQ7EUw/jQGcIb9eu8mDlZxNY2SgcJXTLG9h5gRvqA3uJOe4hZXYsd3EqioMw==", + "peer": true, "requires": { - "cross-fetch": "3.1.5", - "debug": "4.3.4", - "devtools-protocol": "0.0.1011705", - "extract-zip": "2.0.1", - "https-proxy-agent": "5.0.1", - "pkg-dir": "4.2.0", - "progress": "2.0.3", - "proxy-from-env": "1.1.0", - "rimraf": "3.0.2", - "tar-fs": "2.1.1", - "unbzip2-stream": "1.4.3", - "ws": "8.8.0" + "debug": "^4.1.0", + "devtools-protocol": "0.0.869402", + "extract-zip": "^2.0.0", + "https-proxy-agent": "^5.0.0", + "node-fetch": "^2.6.1", + "pkg-dir": "^4.2.0", + "progress": "^2.0.1", + "proxy-from-env": "^1.1.0", + "rimraf": "^3.0.2", + "tar-fs": "^2.0.0", + "unbzip2-stream": "^1.3.3", + "ws": "^7.2.3" }, "dependencies": { "debug": { "version": "4.3.4", + "peer": true, "requires": { "ms": "2.1.2" } - }, - "ws": { - "version": "8.8.0", - "requires": {} } } }, @@ -63019,6 +63002,7 @@ }, "unbzip2-stream": { "version": "1.4.3", + "peer": true, "requires": { "buffer": "^5.2.1", "through": "^2.3.8" diff --git a/package.json b/package.json index 0b4d7ada1..abe37d011 100644 --- a/package.json +++ b/package.json @@ -162,7 +162,6 @@ "ngx-socket-io": "^3.2.0", "pdfjs": "^2.4.6", "pdfjs-dist": "^2.9.359", - "puppeteer": "^15.1.1", "rocket.chat.realtime.api.rxjs": "^2.1.1", "rxjs": "~6.6.3", "rxjs-compat": "^6.6.7", diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts index 311c3a700..b1184a9a1 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -80,6 +80,8 @@ export class AuthService { } + // async UpdateLogin() {} + SetSession(response: LoginUserRespose, user:UserForm) { const session: UserSession = Object.assign(SessionStore.user, response) diff --git a/src/app/services/chat/chat-system.service.ts b/src/app/services/chat/chat-system.service.ts index 2b6483d54..0cbe52090 100644 --- a/src/app/services/chat/chat-system.service.ts +++ b/src/app/services/chat/chat-system.service.ts @@ -184,14 +184,18 @@ export class ChatSystemService { async getAllRooms () { this.loadingWholeList = true var rooms; - try { - rooms = await this.RochetChatConnectorService.getRooms(); - } catch (error) { - console.error('chatgetrooms',error) - } + + if(this.RochetChatConnectorService.isLogin) { try { - await this.storage.remove('Rooms'); - } catch(e) {} + rooms = await this.RochetChatConnectorService.getRooms(); + } catch (error) { + this.loadingWholeList = false + console.error('chatgetrooms',error) + } + try { + await this.storage.remove('Rooms'); + } catch(e) {} + } let index = 0 diff --git a/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html b/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html index 76623bbd2..692456d7e 100644 --- a/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html +++ b/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html @@ -3,7 +3,7 @@
- + diff --git a/version/git-version.ts b/version/git-version.ts index 0360f4907..aab83843c 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "d8e8066ea", - "SHA": "d8e8066eaef190243233370651928d9571bcb07d", + "shortSHA": "39f1884aa", + "SHA": "39f1884aac462aefbe93eec560febe4636b13b1a", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Jan 19 11:48:43 2023 +0100'", - "lastCommitMessage": "event permission on chat", - "lastCommitNumber": "4660", + "lastCommitTime": "'Thu Jan 19 12:05:14 2023 +0100'", + "lastCommitMessage": "fix create action mobile", + "lastCommitNumber": "4661", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged