From 2ce5f48c3c2632f79126d2b2cef3627e7bd028d5 Mon Sep 17 00:00:00 2001 From: Eric Villa Date: Fri, 11 Dec 2020 15:30:35 +0100 Subject: [PATCH] De-commented logic that avoid DevTools to be shown in prod mode --- package-lock.json | 19 +- package.json | 446 +++++++++++++++++++-------------------- src/app/app.component.ts | 29 ++- 3 files changed, 257 insertions(+), 237 deletions(-) diff --git a/package-lock.json b/package-lock.json index ff2d021cd..ea6d79d2e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "Leapp", - "version": "0.3.0", + "version": "0.3.4", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -3905,7 +3905,8 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.2.tgz", "integrity": "sha512-RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g==", - "dev": true + "dev": true, + "optional": true }, "bootstrap": { "version": "4.5.3", @@ -8960,7 +8961,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/imul/-/imul-1.0.1.tgz", "integrity": "sha1-nVhnFh6LPelsLDjV3HyxAvNeKsk=", - "dev": true + "dev": true, + "optional": true }, "imurmurhash": { "version": "0.1.4", @@ -9488,7 +9490,8 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz", "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=", - "dev": true + "dev": true, + "optional": true }, "is-regex": { "version": "1.1.1", @@ -16282,6 +16285,7 @@ "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, + "optional": true, "requires": { "arr-flatten": "^1.1.0", "array-unique": "^0.3.2", @@ -16300,6 +16304,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, + "optional": true, "requires": { "is-extendable": "^0.1.0" } @@ -16332,6 +16337,7 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, + "optional": true, "requires": { "extend-shallow": "^2.0.1", "is-number": "^3.0.0", @@ -16344,6 +16350,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, + "optional": true, "requires": { "is-extendable": "^0.1.0" } @@ -16399,6 +16406,7 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, + "optional": true, "requires": { "kind-of": "^3.0.2" }, @@ -16408,6 +16416,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, + "optional": true, "requires": { "is-buffer": "^1.1.5" } @@ -16419,6 +16428,7 @@ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, + "optional": true, "requires": { "arr-diff": "^4.0.0", "array-unique": "^0.3.2", @@ -16452,6 +16462,7 @@ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, + "optional": true, "requires": { "is-number": "^3.0.0", "repeat-string": "^1.6.1" diff --git a/package.json b/package.json index 2217dfc96..788953566 100644 --- a/package.json +++ b/package.json @@ -1,234 +1,234 @@ { - "name": "Leapp", - "version": "0.3.3", - "author": { - "name": "besharp", - "email": "info@besharp.it" + "name": "Leapp", + "version": "0.3.4", + "author": { + "name": "besharp", + "email": "info@besharp.it" + }, + "description": "Straight programmatic access via Single Sign-on to all your AWS accounts and resources.", + "contributors": [ + { + "name": "Andrea Cavagna", + "email": "andrea.cavagna@noovolari.com" }, - "description": "Straight programmatic access via Single Sign-on to all your AWS accounts and resources.", - "contributors": [ - { - "name": "Andrea Cavagna", - "email": "andrea.cavagna@noovolari.com" - }, - { - "name": "Paolo Diciaula", - "email": "paolo.diciaula@besharp.it" - }, - { - "name": "Alessandro Gaggia", - "email": "alex@besharp.it" - }, + { + "name": "Paolo Diciaula", + "email": "paolo.diciaula@besharp.it" + }, + { + "name": "Alessandro Gaggia", + "email": "alex@besharp.it" + }, + { + "name": "Nicolò Marchesi", + "email": "nicolo@noovolari.com" + }, + { + "name": "Eric Villa", + "email": "eric@noovolari.com" + } + ], + "repository": "https://github.com/Noovolari/leapp", + "private": true, + "category": "public.app-category.developer-tools", + "homepage": "https://leapp.cloud", + "main": "electron/dist/electron/main.js", + "scripts": { + "postinstall": "electron-builder install-app-deps", + "ng": "ng", + "start": "ng serve", + "rebuild-keytar": "electron-rebuild -f -w keytar", + "build": "rm -rf electron/dist && cp src/assets/icons/* dist/leapp-client/ && ng build --base-href ./", + "test": "ng test", + "lint": "ng lint", + "extract": "ngx-translate-extract --input ./src --output ./src/assets/i18n/en.json ./src/assets/i18n/it.json --clean --sort --format namespaced-json --marker _", + "electron-dev": "rm -rf electron/dist && rm -rf dist && mkdir -p dist/leapp-client && cp -a src/assets/icons/* dist/leapp-client/ && ng build --aot --base-href ./ && tsc --p electron && mkdir -p electron/dist/electron/assets/images && cp -a electron/assets/images/* electron/dist/electron/assets/images/ && electron --enable-accelerated-mjpeg-decode --enable-accelerated-video --ignore-gpu-blacklist --enable-native-gpu-memory-buffers --enable-gpu-rasterization --ignore-gpu-blacklist .", + "electron-stag": "rm -rf electron/dist && rm -rf dist && mkdir -p dist/leapp-client && cp -a src/assets/icons/* dist/leapp-client/ && ng build --configuration staging --base-href ./ && tsc --p electron && mkdir -p electron/dist/electron/assets/images && cp -a electron/assets/images/* electron/dist/electron/assets/images/ && electron .", + "electron-prod": "rm -rf electron/dist && rm -rf dist && mkdir -p dist/leapp-client && cp -a src/assets/icons/* dist/leapp-client/ && ng build --configuration production --base-href ./ && tsc --p electron && mkdir -p electron/dist/electron/assets/images && cp -a electron/assets/images/* electron/dist/electron/assets/images/ && electron .", + "electron-win": "DEL /Q electron\\dist && ng build --base-href ./ && tsc --p electron && electron .", + "e2e": "ng e2e", + "pack": "electron-builder --dir", + "dist-mac-dev": "rm -rf electron/dist && rm -rf release && rm -rf dist && tsc --p electron && ng build --aot --base-href ./ && mkdir -p electron/dist/electron/assets/images && cp -a electron/assets/images/* electron/dist/electron/assets/images/ && electron-builder build", + "dist-mac-stag": "rm -rf electron/dist && rm -rf release && rm -rf dist && tsc --p electron && ng build --aot --configuration staging --base-href ./ && mkdir -p electron/dist/electron/assets/images && cp -a electron/assets/images/* electron/dist/electron/assets/images/ && electron-builder build", + "dist-mac-prod": "rm -rf electron/dist && rm -rf release && rm -rf dist && tsc --p electron && ng build --aot --configuration production --base-href ./ && mkdir -p electron/dist/electron/assets/images && cp -a electron/assets/images/* electron/dist/electron/assets/images/ && electron-builder build", + "dist-deb-dev": "rm -rf electron/dist && rm -rf release && rm -rf dist && tsc --p electron && ng build --aot --base-href ./ && mkdir -p electron/dist/electron/assets/images && cp -a electron/assets/images/* electron/dist/electron/assets/images/ && electron-builder build --linux", + "dist-deb-stag": "rm -rf electron/dist && rm -rf release && rm -rf dist && tsc --p electron && ng build --aot --configuration staging --base-href ./ && mkdir -p electron/dist/electron/assets/images && cp -a electron/assets/images/* electron/dist/electron/assets/images/ && electron-builder build --linux", + "dist-deb-prod": "rm -rf electron/dist && rm -rf release && rm -rf dist && tsc --p electron && ng build --aot --configuration production --base-href ./ && mkdir -p electron/dist/electron/assets/images && cp -a electron/assets/images/* electron/dist/electron/assets/images/ && electron-builder build --linux", + "dist-win-dev": "rm -rf electron/dist && rm -rf release && rm -rf dist && tsc --p electron && ng build --aot --base-href ./ && mkdir -p electron/dist/electron/assets/images && cp -a electron/assets/images/* electron/dist/electron/assets/images/ && electron-builder build --win --x64", + "dist-win-stag": "rm -rf electron/dist && rm -rf release && rm -rf dist && tsc --p electron && ng build --aot --configuration staging --base-href ./ && mkdir -p electron/dist/electron/assets/images && cp -a electron/assets/images/* electron/dist/electron/assets/images/ && electron-builder build --win --x64", + "dist-win-prod": "rm -rf electron/dist && rm -rf release && rm -rf dist && tsc --p electron && ng build --aot --configuration production --base-href ./ && mkdir -p electron/dist/electron/assets/images && cp -a electron/assets/images/* electron/dist/electron/assets/images/ && electron-builder build --win --x64", + "dist-all-dev": "rm -rf electron/dist && rm -rf release && rm -rf dist && tsc --p electron && ng build --aot --base-href ./ && mkdir -p electron/dist/electron/assets/images && cp -a electron/assets/images/* electron/dist/electron/assets/images/ && electron-builder build --mac --win --linux", + "dist-all-stag": "rm -rf electron/dist && rm -rf release && rm -rf dist && tsc --p electron && ng build --aot --configuration staging --base-href ./ && mkdir -p electron/dist/electron/assets/images && cp -a electron/assets/images/* electron/dist/electron/assets/images/ && electron-builder build --mac --win --linux", + "dist-all-prod": "rm -rf electron/dist && rm -rf release && rm -rf dist && tsc --p electron && ng build --aot --configuration production --base-href ./ && mkdir -p electron/dist/electron/assets/images && cp -a electron/assets/images/* electron/dist/electron/assets/images/ && electron-builder build --mac --win --linux" + }, + "build": { + "publish": [ + { + "provider": "github", + "owner": "Noovolari", + "repo": "leapp", + "releaseType": "release" + } + ], + "afterSign": "scripts/notarize.js", + "productName": "Leapp", + "icon": "src/assets/icons/icon.icns", + "files": [ + "dist/leapp-client/*", + "dist/leapp-client/**/*", + "node_modules/**/*", + "package.json", + "electron/dist/*", + "electron/dist/**/*", + "dist/icon.icns", + "dist/icon.ico", + "dist/icon.png", + "dist/assets/images/Leapp.icns", + "dist/assets/images/Leapp.ico", + "dist/assets/images/Leapp.png" + ], + "directories": { + "output": "release", + "buildResources": "dist" + }, + "appId": "com.leapp.app", + "dmg": { + "icon": "src/assets/icons/icon.icns", + "background": "src/assets/icons/background.png", + "contents": [ { - "name": "Nicolò Marchesi", - "email": "nicolo@noovolari.com" + "x": 110, + "y": 150 }, { - "name": "Eric Villa", - "email": "eric@noovolari.com" + "x": 240, + "y": 150, + "type": "link", + "path": "/Applications" } - ], - "repository": "https://github.com/Noovolari/leapp", - "private": true, - "category": "public.app-category.developer-tools", - "homepage": "https://leapp.cloud", - "main": "electron/dist/electron/main.js", - "scripts": { - "postinstall": "electron-builder install-app-deps", - "ng": "ng", - "start": "ng serve", - "rebuild-keytar": "electron-rebuild -f -w keytar", - "build": "rm -rf electron/dist && cp src/assets/icons/* dist/leapp-client/ && ng build --base-href ./", - "test": "ng test", - "lint": "ng lint", - "extract": "ngx-translate-extract --input ./src --output ./src/assets/i18n/en.json ./src/assets/i18n/it.json --clean --sort --format namespaced-json --marker _", - "electron-dev": "rm -rf electron/dist && rm -rf dist && mkdir -p dist/leapp-client && cp -a src/assets/icons/* dist/leapp-client/ && ng build --aot --base-href ./ && tsc --p electron && mkdir -p electron/dist/electron/assets/images && cp -a electron/assets/images/* electron/dist/electron/assets/images/ && electron --enable-accelerated-mjpeg-decode --enable-accelerated-video --ignore-gpu-blacklist --enable-native-gpu-memory-buffers --enable-gpu-rasterization --ignore-gpu-blacklist .", - "electron-stag": "rm -rf electron/dist && rm -rf dist && mkdir -p dist/leapp-client && cp -a src/assets/icons/* dist/leapp-client/ && ng build --configuration staging --base-href ./ && tsc --p electron && mkdir -p electron/dist/electron/assets/images && cp -a electron/assets/images/* electron/dist/electron/assets/images/ && electron .", - "electron-prod": "rm -rf electron/dist && rm -rf dist && mkdir -p dist/leapp-client && cp -a src/assets/icons/* dist/leapp-client/ && ng build --configuration production --base-href ./ && tsc --p electron && mkdir -p electron/dist/electron/assets/images && cp -a electron/assets/images/* electron/dist/electron/assets/images/ && electron .", - "electron-win": "DEL /Q electron\\dist && ng build --base-href ./ && tsc --p electron && electron .", - "e2e": "ng e2e", - "pack": "electron-builder --dir", - "dist-mac-dev": "rm -rf electron/dist && rm -rf release && rm -rf dist && tsc --p electron && ng build --aot --base-href ./ && mkdir -p electron/dist/electron/assets/images && cp -a electron/assets/images/* electron/dist/electron/assets/images/ && electron-builder build", - "dist-mac-stag": "rm -rf electron/dist && rm -rf release && rm -rf dist && tsc --p electron && ng build --aot --configuration staging --base-href ./ && mkdir -p electron/dist/electron/assets/images && cp -a electron/assets/images/* electron/dist/electron/assets/images/ && electron-builder build", - "dist-mac-prod": "rm -rf electron/dist && rm -rf release && rm -rf dist && tsc --p electron && ng build --aot --configuration production --base-href ./ && mkdir -p electron/dist/electron/assets/images && cp -a electron/assets/images/* electron/dist/electron/assets/images/ && electron-builder build", - "dist-deb-dev": "rm -rf electron/dist && rm -rf release && rm -rf dist && tsc --p electron && ng build --aot --base-href ./ && mkdir -p electron/dist/electron/assets/images && cp -a electron/assets/images/* electron/dist/electron/assets/images/ && electron-builder build --linux", - "dist-deb-stag": "rm -rf electron/dist && rm -rf release && rm -rf dist && tsc --p electron && ng build --aot --configuration staging --base-href ./ && mkdir -p electron/dist/electron/assets/images && cp -a electron/assets/images/* electron/dist/electron/assets/images/ && electron-builder build --linux", - "dist-deb-prod": "rm -rf electron/dist && rm -rf release && rm -rf dist && tsc --p electron && ng build --aot --configuration production --base-href ./ && mkdir -p electron/dist/electron/assets/images && cp -a electron/assets/images/* electron/dist/electron/assets/images/ && electron-builder build --linux", - "dist-win-dev": "rm -rf electron/dist && rm -rf release && rm -rf dist && tsc --p electron && ng build --aot --base-href ./ && mkdir -p electron/dist/electron/assets/images && cp -a electron/assets/images/* electron/dist/electron/assets/images/ && electron-builder build --win --x64", - "dist-win-stag": "rm -rf electron/dist && rm -rf release && rm -rf dist && tsc --p electron && ng build --aot --configuration staging --base-href ./ && mkdir -p electron/dist/electron/assets/images && cp -a electron/assets/images/* electron/dist/electron/assets/images/ && electron-builder build --win --x64", - "dist-win-prod": "rm -rf electron/dist && rm -rf release && rm -rf dist && tsc --p electron && ng build --aot --configuration production --base-href ./ && mkdir -p electron/dist/electron/assets/images && cp -a electron/assets/images/* electron/dist/electron/assets/images/ && electron-builder build --win --x64", - "dist-all-dev": "rm -rf electron/dist && rm -rf release && rm -rf dist && tsc --p electron && ng build --aot --base-href ./ && mkdir -p electron/dist/electron/assets/images && cp -a electron/assets/images/* electron/dist/electron/assets/images/ && electron-builder build --mac --win --linux", - "dist-all-stag": "rm -rf electron/dist && rm -rf release && rm -rf dist && tsc --p electron && ng build --aot --configuration staging --base-href ./ && mkdir -p electron/dist/electron/assets/images && cp -a electron/assets/images/* electron/dist/electron/assets/images/ && electron-builder build --mac --win --linux", - "dist-all-prod": "rm -rf electron/dist && rm -rf release && rm -rf dist && tsc --p electron && ng build --aot --configuration production --base-href ./ && mkdir -p electron/dist/electron/assets/images && cp -a electron/assets/images/* electron/dist/electron/assets/images/ && electron-builder build --mac --win --linux" + ] }, - "build": { - "publish": [ - { - "provider": "github", - "owner": "Noovolari", - "repo": "leapp", - "releaseType": "release" - } - ], - "afterSign": "scripts/notarize.js", - "productName": "Leapp", - "icon": "src/assets/icons/icon.icns", - "files": [ - "dist/leapp-client/*", - "dist/leapp-client/**/*", - "node_modules/**/*", - "package.json", - "electron/dist/*", - "electron/dist/**/*", - "dist/icon.icns", - "dist/icon.ico", - "dist/icon.png", - "dist/assets/images/Leapp.icns", - "dist/assets/images/Leapp.ico", - "dist/assets/images/Leapp.png" - ], - "directories": { - "output": "release", - "buildResources": "dist" - }, - "appId": "com.leapp.app", - "dmg": { - "icon": "src/assets/icons/icon.icns", - "background": "src/assets/icons/background.png", - "contents": [ - { - "x": 110, - "y": 150 - }, - { - "x": 240, - "y": 150, - "type": "link", - "path": "/Applications" - } - ] - }, - "linux": { - "category": "Utility", - "synopsis": "Leapp Client is a tool that allows the user to obtain secure, temporary and refreshable credentials to access AWS Services with AWS CLI and tools based on it", - "description": "Leapp Client is a tool that allows the user to obtain secure, temporary and refreshable credentials to access AWS Services with AWS CLI and tools based on it, with versioning tools that work with AWS CodeCommit service and to easily use AWS SDK from your local environment during your everyday development.", - "icon": "src/assets/icons/1024x1024.png", - "desktop": { - "Icon": "/usr/share/icons/hicolor/0x0/apps/leapp.png" - }, - "target": [ - "deb", - "AppImage" - ] - }, - "win": { - "target": [ - "nsis" - ], - "icon": "src/assets/images/Leapp.ico", - "legalTrademarks": "beSharp", - "publisherName": "beSharp", - "requestedExecutionLevel": "highestAvailable", - "verifyUpdateCodeSignature": false - }, - "mac": { - "icon": "src/assets/images/Leapp.icns", - "forceCodeSigning": true, - "hardenedRuntime": true, - "entitlements": "./build/entitlements.mac.plist", - "entitlementsInherit": "./build/entitlements.mac.plist", - "gatekeeperAssess": false, - "target": [ - "dmg", - "zip" - ] - } + "linux": { + "category": "Utility", + "synopsis": "Leapp Client is a tool that allows the user to obtain secure, temporary and refreshable credentials to access AWS Services with AWS CLI and tools based on it", + "description": "Leapp Client is a tool that allows the user to obtain secure, temporary and refreshable credentials to access AWS Services with AWS CLI and tools based on it, with versioning tools that work with AWS CodeCommit service and to easily use AWS SDK from your local environment during your everyday development.", + "icon": "src/assets/icons/1024x1024.png", + "desktop": { + "Icon": "/usr/share/icons/hicolor/0x0/apps/leapp.png" + }, + "target": [ + "deb", + "AppImage" + ] }, - "dependencies": { - "@angular/animations": "~8.1.0", - "@angular/common": "~8.1.0", - "@angular/compiler": "~8.1.0", - "@angular/core": "~8.1.0", - "@angular/forms": "~8.1.0", - "@angular/platform-browser": "~8.1.0", - "@angular/platform-browser-dynamic": "~8.1.0", - "@angular/router": "~8.1.0", - "@ng-select/ng-select": "~3.7.3", - "@ngx-translate/core": "~11.0.1", - "@ngx-translate/http-loader": "~4.0.0", - "@sebgroup/ng-magic-iframe": "~1.0.2", - "@types/jest": "~25.2.3", - "aws-sdk": "~2.713.0", - "bootstrap": "~4.5.0", - "chdir": "0.0.0", - "copy-dir": "~1.3.0", - "crypto-js": "~3.3.0", - "electron-default-menu": "~1.0.2", - "electron-is-dev": "^0.3.0", - "electron-log": "~3.0.6", - "electron-notarize": "~0.1.1", - "electron-osx-sign": "~0.4.17", - "electron-reload": "~1.5.0", - "electron-updater": "^4.3.5", - "extract-zip": "~1.7.0", - "fix-path": "~3.0.0", - "follow-redirects": "1.13.0", - "fs-extra": "~8.1.0", - "github-url-to-object": "^4.0.4", - "global-tunnel": "~1.2.0", - "http-proxy-agent": "2.1.0", - "https-proxy-agent": "2.2.4", - "ini": "~1.3.5", - "is-url": "^1.2.4", - "jwt-decode": "~2.2.0", - "keytar": "~6.0.1", - "md5-file": "~4.0.0", - "menubar": "~6.0.3", - "mousetrap": "~1.6.5", - "ms": "^2.1.1", - "ngx-bootstrap": "4.3.0", - "ngx-json-viewer": "~2.4.0", - "ngx-toastr": "~10.0.4", - "node-log-rotate": "~0.1.5", - "node-machine-id": "~1.1.12", - "rimraf": "~3.0.2", - "rxjs": "~6.4.0", - "saml-encoder-decoder-js": "~1.0.1", - "semver": "~6.3.0", - "sudo-prompt": "~9.2.1", - "tslib": "~1.13.0", - "update-electron-app": "~2.0.1", - "uuid": "~8.3.0", - "v8-compile-cache": "~2.1.1", - "zlib": "~1.0.5", - "zone.js": "~0.9.1" + "win": { + "target": [ + "nsis" + ], + "icon": "src/assets/images/Leapp.ico", + "legalTrademarks": "beSharp", + "publisherName": "beSharp", + "requestedExecutionLevel": "highestAvailable", + "verifyUpdateCodeSignature": false }, - "devDependencies": { - "@angular-devkit/build-angular": "~0.803.24", - "@angular/cli": "~8.1.0", - "@angular/compiler-cli": "~8.1.0", - "@angular/language-service": "~8.1.0", - "@biesbjerg/ngx-translate-extract": "~2.3.4", - "@types/jasmine": "~3.5.11", - "@types/jasminewd2": "~2.0.3", - "@types/node": "~10.17.27", - "codelyzer": "~5.2.2", - "electron": "~8.5.2", - "electron-builder": "~22.7.0", - "electron-builder-squirrel-windows": "~21.1.3", - "electron-installer-dmg": "~3.0.0", - "electron-packager": "~14.2.1", - "electron-rebuild": "~2.0.3", - "jasmine-core": "~3.4.0", - "jasmine-spec-reporter": "~4.2.1", - "karma": "~4.4.1", - "karma-chrome-launcher": "~2.2.0", - "karma-coverage-istanbul-reporter": "~2.0.1", - "karma-jasmine": "~2.0.1", - "karma-jasmine-html-reporter": "~1.5.4", - "protractor": "~5.4.4", - "ts-node": "~7.0.0", - "tslint": "~5.15.0", - "typescript": "~3.4.3" + "mac": { + "icon": "src/assets/images/Leapp.icns", + "forceCodeSigning": true, + "hardenedRuntime": true, + "entitlements": "./build/entitlements.mac.plist", + "entitlementsInherit": "./build/entitlements.mac.plist", + "gatekeeperAssess": false, + "target": [ + "dmg", + "zip" + ] } + }, + "dependencies": { + "@angular/animations": "~8.1.0", + "@angular/common": "~8.1.0", + "@angular/compiler": "~8.1.0", + "@angular/core": "~8.1.0", + "@angular/forms": "~8.1.0", + "@angular/platform-browser": "~8.1.0", + "@angular/platform-browser-dynamic": "~8.1.0", + "@angular/router": "~8.1.0", + "@ng-select/ng-select": "~3.7.3", + "@ngx-translate/core": "~11.0.1", + "@ngx-translate/http-loader": "~4.0.0", + "@sebgroup/ng-magic-iframe": "~1.0.2", + "@types/jest": "~25.2.3", + "aws-sdk": "~2.713.0", + "bootstrap": "~4.5.0", + "chdir": "0.0.0", + "copy-dir": "~1.3.0", + "crypto-js": "~3.3.0", + "electron-default-menu": "~1.0.2", + "electron-is-dev": "^0.3.0", + "electron-log": "~3.0.6", + "electron-notarize": "~0.1.1", + "electron-osx-sign": "~0.4.17", + "electron-reload": "~1.5.0", + "electron-updater": "^4.3.5", + "extract-zip": "~1.7.0", + "fix-path": "~3.0.0", + "follow-redirects": "1.13.0", + "fs-extra": "~8.1.0", + "github-url-to-object": "^4.0.4", + "global-tunnel": "~1.2.0", + "http-proxy-agent": "2.1.0", + "https-proxy-agent": "2.2.4", + "ini": "~1.3.5", + "is-url": "^1.2.4", + "jwt-decode": "~2.2.0", + "keytar": "~6.0.1", + "md5-file": "~4.0.0", + "menubar": "~6.0.3", + "mousetrap": "~1.6.5", + "ms": "^2.1.1", + "ngx-bootstrap": "4.3.0", + "ngx-json-viewer": "~2.4.0", + "ngx-toastr": "~10.0.4", + "node-log-rotate": "~0.1.5", + "node-machine-id": "~1.1.12", + "rimraf": "~3.0.2", + "rxjs": "~6.4.0", + "saml-encoder-decoder-js": "~1.0.1", + "semver": "~6.3.0", + "sudo-prompt": "~9.2.1", + "tslib": "~1.13.0", + "update-electron-app": "~2.0.1", + "uuid": "~8.3.0", + "v8-compile-cache": "~2.1.1", + "zlib": "~1.0.5", + "zone.js": "~0.9.1" + }, + "devDependencies": { + "@angular-devkit/build-angular": "~0.803.24", + "@angular/cli": "~8.1.0", + "@angular/compiler-cli": "~8.1.0", + "@angular/language-service": "~8.1.0", + "@biesbjerg/ngx-translate-extract": "~2.3.4", + "@types/jasmine": "~3.5.11", + "@types/jasminewd2": "~2.0.3", + "@types/node": "~10.17.27", + "codelyzer": "~5.2.2", + "electron": "~8.5.2", + "electron-builder": "~22.7.0", + "electron-builder-squirrel-windows": "~21.1.3", + "electron-installer-dmg": "~3.0.0", + "electron-packager": "~14.2.1", + "electron-rebuild": "~2.0.3", + "jasmine-core": "~3.4.0", + "jasmine-spec-reporter": "~4.2.1", + "karma": "~4.4.1", + "karma-chrome-launcher": "~2.2.0", + "karma-coverage-istanbul-reporter": "~2.0.1", + "karma-jasmine": "~2.0.1", + "karma-jasmine-html-reporter": "~1.5.4", + "protractor": "~5.4.4", + "ts-node": "~7.0.0", + "tslint": "~5.15.0", + "typescript": "~3.4.3" + } } diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 0b8bf48d4..22c0928ac 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -27,7 +27,8 @@ export class AppComponent implements OnInit { private app: AppService, private credentialsService: CredentialsService, private menuService: MenuService - ) {} + ) { + } ngOnInit() { // Use ngx bootstrap 4 @@ -38,8 +39,10 @@ export class AppComponent implements OnInit { if (environment.production) { // Clear both info and warn message in production mode without removing them from code actually - console.warn = () => {}; - console.log = () => {}; + console.warn = () => { + }; + console.log = () => { + }; } // If we have credentials copy them from workspace file to the .aws credential file @@ -53,12 +56,12 @@ export class AppComponent implements OnInit { this.verifyWorkspace(); // Prevent Dev Tool to show on production mode -// this.app.currentBrowserWindow().webContents.on('devtools-opened', () => { -// if (environment.production) { -// this.app.logger('Closing Web tools in production mode', LoggerLevel.INFO, this); -// this.app.currentBrowserWindow().webContents.closeDevTools(); -// } -// }); + this.app.currentBrowserWindow().webContents.on('devtools-opened', () => { + if (environment.production) { + this.app.logger('Closing Web tools in production mode', LoggerLevel.INFO, this); + this.app.currentBrowserWindow().webContents.closeDevTools(); + } + }); // We get the right moment to set an hook to app close const ipc = this.app.getIpcRenderer(); @@ -87,7 +90,13 @@ export class AppComponent implements OnInit { const hasNewConf = workspace.proxyConfiguration !== undefined; if (!hasNewConf) { const proxyUrl = workspace.proxyUrl ? workspace.proxyUrl : ''; - workspace.proxyConfiguration = { proxyPort: '8080', proxyProtocol: 'https', proxyUrl, username: '', password: '' }; + workspace.proxyConfiguration = { + proxyPort: '8080', + proxyProtocol: 'https', + proxyUrl, + username: '', + password: '' + }; this.configurationService.updateWorkspaceSync(workspace); } }