Merge branch 'develop' into fix/url-focus

Author: jarrodek

.env.enc

@@ -0,0 +1 @@
+9�R9�^�❆b�Y�8�������f>�Ԧ�*�������i���a�G�YK]=��K���7���i6�a���
�Ϟ

.gitignore

@@ -30,7 +30,6 @@ Temporary Items
 !.vscode/extensions.json
 
 test/tests-exe-dir
-advancedrestclient.pfx
-arc-mac-certs.p12
-certs.tar
 web_modules
+secrets/
+secrets.tar

.travis.yml

@@ -22,14 +22,17 @@ before_cache:
 - rm -rf $HOME/.cache/electron-builder/wine
 branches:
   except:
-    - "/^\\d+\\.\\d+\\.\\d+$/"
+  - "/^\\d+\\.\\d+\\.\\d+$/"
 install:
 - npm install
 script: "./test/travis-build.sh"
 after_success:
 - tasks/arc-publish.sh
 env:
   global:
-  - secure: vqjLjFS1r21KkSV6g5rrnHnEDvytxFZUZGglmVBfEMWMTLmUt6tpUOZ9fQhNK02Lwoqabx+jwqkqQH3n2Qh4rdgrHciaZz8rVpB+BNRbGpk8Av9pvJEFt5P2UUfjgthgBEUCAkcMlFAWvVgGoiaZPTLufxh9YZvjilG6QrZq6907+YZmxanFfQs/YpCwhG1S36BZ5ce3FxWk7z46DETD3LIe5ThImdmxruEv31F1pNNfInoDGg1qucQiZ2Icd6e+TK6tHH76KJbWc7kaJFSaubu1zIepmUNAxwdLN13nCPcxZaTkPs+LkCel3/C0hD/GLYEc48qC6zQDiQ61/JbUqtfZqShR5qpWhG0jETwpJqlUGNeWjO8KaPUcsolDy49Iiyy+ZMN8g7qiVcxqInLM3BT0Do3vyEZA3Z3WxXDF5wGeHy8PhUbFa3wZdRxtTgNoXCPJCPAzZIPYNUbby6auhWraBHU5UfyitH+CDP34FPaM9eG9TcJbEmdoA9rB9RYEH2T6OxGN/IntSuSP1cdkN/gi4c1ZsWlZSpCS9l5emakrGa4CMl7PKUBhefvKmn/UeYi+REHR2+iNOBYGBBAzfuwSn2iLg//Cg0SdDOs557vKFozVjM2u35Qp1zoncvEZWPSL3WaVGNzmlV35yjgculysZt1tEQpLWGIBmNjEa0c=
-  - secure: rBRZZG8d933qFaCaakId+GMrZFHVPHr1hJtpy/2UN8wvqvnbo9ChHGer79cfhohc23Ligx+OhdSLSVl+bC4uesVX1kUssiFUFFDcYciEsJHplO1CtvPkApsEUJL3cndrvYrA52HPOmhtpuh74Npxdn8LrPyiNnLCTdNSt86dp/w8ve2N2ZI3CSEO9nG9L+rMqEkGC5fLQxXNsD4bJoDomg9tntXQYO2anyLnHa767SkbsbfHmrrF5BRPcX8i6/ZPtqG1hOnD72rHJwN0mpLJVsL7htbs9iyMkMciQn5j+BTfV00o51Id3rR0AxrAJUPfb+62i3s7vwJh9cyOTSJ7tBQSxe5EGa0gUlikHJ3elhDFylZXQM/Tmch5yJ0btNWQTsJI7ZwWe+RImDmPtWcNijxU144VdLq8nPz7rBuV4ouIgnnLA1QUT9IjS9vR09xa0DBH2Amjoea2bj7wHj86gfb/ECMkTfRysLrs+DVysC0pqAOONuvz6mBF7OLvK7uN08w6LG3VwwHJ28K52cudiHNv1NXv9hwWxPzizg3VG6WhTlA8y/wSoNDf3Q0UROfPouwx+AM+ojpM5gYVApAwHZvAjsn/Nu+lMQVT3xfnnr+SehTJprK+9Yv1HAFMJNFKbN71w7pdUx05B/YWxMxElg6Pp8s6mlntrsFbCNJ6lCo=
-  - secure: os+mH9yyl753fv3ro3mat5wzmw6BpHIOva4JFF3BtCUqZ6wIZgUyS9TwglEwpVuS1DGzzEBqwMF83azvJ63cdlLrSAkfVPtqfWxnhHQeCEN9vy1n0PBFaYOkteeng1ltHdiwSq9wNNNeiYT3cHPWhUwZM/kGelGm/AAGlQn6ZQXJp3c0g9xjnynaMpVpvRXOiBwKW4iWvIhSPDNLVJRzyGB2laZAwQFkiyA6+d3yrsMz4iJmqpicedBg1JrSe7ssIOjZ11Ypa8D875BN6hQQFCEuFr/vtEhrnettvEkmVBD83eVA9hTj5CyqlYf3nwY10kQ5VoiFuDIv67AFI+7Ty7+OSKU9TjItdXfyoGjLF+9k1NEFCDR+MvGUWLx9VV2QEw8WJ8N3ngmchk0vCqgQ/bSB1K9qCTlDiQfvGtjmnMWdG2LxewIRQlQWueYhMOvDvDEECmAYlvn32TY/w9ay3wp/uxZkJZuIDv+plE6GK+QMr3EuR/0p6RpQnpNljDbXOYHxBQ9kwbsanUoecgXjPypZkulpAPSwICMQ7SO07rJEdGZqaGquraeiERT91t+7j/2+c3I3h5YTj2IYj4EdD+0a9Dt8cO3skfw3Y4r/ThYKtK/TLpShtCQWGPGpOpGgjhTRIDb8wr612Fsc45pD+VgrtH1ZA4pr7NyApXpvJQE=
+  # Mac
+  - secure: SSAr0zXHZ7hhoOOciN5FtW0hcT+7xYFUyPSqguyLFGd+O3o1dvvFCqc783bIdeMZCvRwUhPuAFIVw3ykTUWTDCYKktSMjjjvI0S1pVixPdDaV883bk2Pq4hKEdJYaQK7ErbLOQd7uMW9Cqe2l/uQt21t4Ld3LeX6QMgM1IZLRdTIRjhUDQ0TeDVSStA4dMemUpTJ8Pf2PgwVcjxFbBb858OXplb+2VVGj0KQ3yz3/k5IF0X1qxaRMo9zT/bdB89bbD75c6+Pv7OwGR4p5nPFUBKnHNyOkUeE9NQF2GJzuBtGpM+Qc+SpDj0ToJcJ0a9ztccPbTZioaHxTLmDRBHjUqB49jSCC2W+Wilf6WrmqrdtFNfDml/40U/WDUhJflG6/qFBj6ogJ9qlqkpyJST09Csuj94feiCBSCY5ADosCLZZ6wosbJqE533CUnyWki/DsVJl4FSmM2K2/7Sj5YGc6EX6BOv80UXyNxZGaoF2GrdZ6hKvSyUtz/jtsw/GrEsC1rI0aoWXXmhxDbE3plAjSB54AG5Pzw8i7ROFWL5lbMB6I+UoEtw7g47V5o4j65rkNoOQp5vKb9g2JfkoAJ6+cEVR6TfsZ9dCD+eLWnOK8K/V1+H2U5RZgNQ3rGLDW7O3hf1TaNhHr6v1VzEoHr/RKsArLdjqnAJHCr+PLJElcBU=
+  # GH token
+  - secure: Evz9xCvbNhG7AKKKJIXtvSLBb6n8WCzNnqGevbgq8LhtZHYzt0SNDqbOs3701G/tzeOtueCdqARB13Xzt5TkTwWeDp+B9hQCKmT9uOKERMs9JK3EHnzdPJVSrIvcmp4X1M7RIEbqZ0rnn4wGtrwS6bbYqpTY+sRYyRoa2u2lrOVN4H9/BGiVPScBpZmbSxXlM5k2oJKv7pb2NV4NECU/CptEwV0DJHQnaQG1//mVYF+1LJSt9Ztqqk5qWVB/+cDBs49kJLjiv+s+LSzvRt+KLWt80/O6bjAXx2+bas2PMUDuj4/X2zTLH0dcU80MNMC8kukDbcKmRIbq7BQiqJvc1E9zhjSzIDGuUW9XvHbTFMw/+NfcQdiD/XAUKzjD9Gc0lllig0K7xeswhgtE55t4AkADQjFF9j0YqKMfYZ8kvDH8LiQfpQYRrXDh4fHzbKhe2yXsHArSbJV9p+Fl8UMct94im5VuLWghzMKf7HN5EUperl40FM4Hx7hwI5qhn/Ksp6/FHjkk1Xlwup9SNTKoDX6PmhCE8oWq0UGXVpb4FVOVSYBxLVnOMCThWZW/URF/BVHKtJFQF7sg+4hBLNQ90WlPAnun3enNUNpEDtXkapbDXW+SUfRu7Zm3YuT2muHSQIsbpC1CM7IIn+3g8xVuWRGNcUNUdsR63VPhgyZr/LU=
+  # Windows
+  - secure: L8M+lS+Ymr4RgIPd4QAvMSpmNN/ay2S8asQdkeNJpDf2C4sha+HI8WkH9qkRmsp79CK96zmM1wRhNgC49oRD/9r9GVQljMrtKa61e11diQqge7Xu4Kv1zs8m1yuFGRQUoxUdKZIVYnv0D8/5zwUQlQ27oHkkpxyeSkdPBAR/kVDRSlVwMsg/R3ZnXm4e6MNOfB02GXBvtXvYU11rRaoRHErKnywevDk+pOs8F0dom3E75JzBMB773PBrECH4PJjYKGSKRCjOP2o+1rXfNMoSc3o67N4uLPmVq/cLRRD8kliJNoWqKAATT3BjUE2oQeL7spyxnV25LZp7r7U0mzbFrX24TZQL3yZAEV/rQepqCWgzNsQMId67rn56jeUd3IoXHLsHzqy2YYJIB8xmbxd6n8x0SU8n+usBLXR55zT+eIQzCcdCLcRJncGxFWXa2HAwDIHNh5sNANYYLmDO1ZrxrCBQ0os8Jemkg6KwGiLauROJkSejWdWDs+aXdfhu5Fhs9xYE2kvB1WeCJIyyFFi3pmVmri2cJ7tez2gLZov6dfbRq/XAFidrEb7llXl754zkprXkW/NDfmaepJ8AXmeBkmo7ZXMlSMphALEG9r8nKFR3mbOiXt1YCqeP5MqYYV2wUUafL58iQiVPIDPV0ISRvyqHGz+OZ/T0kCDzXmyfJ4g=

build/entitlements.mac.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+  </dict>
+</plist>

certs.tar.enc

@@ -1,7 +1,7 @@
 {
   "name": "advanced-rest-client",
   "description": "The Advanced REST Client desktop application.",
-  "version": "15.0.1",
+  "version": "0.0.0-develop.noversion",
   "homepage": "https://advancedrestclient.com",
   "license": "Apache-2.0",
   "author": {
@@ -62,9 +62,12 @@
     "chai": "^4.2.0",
     "cors": "^2.8.5",
     "cross-env": "^6.0.3",
+    "dotenv": "^8.2.0",
     "electron": "^8.0.1",
     "electron-builder": "^22.2.0",
     "electron-mocha": "^8.2.1",
+    "electron-notarize": "^0.2.1",
+    "electron-windows-store": "^2.1.0",
     "eslint-config-google": "^0.14.0",
     "esm": "^3.2.25",
     "express": "^4.17.1",
@@ -115,6 +118,7 @@
     "detectUpdateChannel": true,
     "npmRebuild": true,
     "buildDependenciesFromSource": false,
+    "afterSign": "tasks/notarize.js",
     "files": [
       "app.html",
       "app.js",
@@ -131,6 +135,10 @@
     "mac": {
       "category": "public.app-category.developer-tools",
       "icon": "build/icon.icns",
+      "hardenedRuntime": true,
+      "gatekeeperAssess": false,
+      "entitlements": "build/entitlements.mac.plist",
+      "entitlementsInherit": "build/entitlements.mac.plist",
       "target": [
         {
           "target": "dmg",
@@ -147,6 +155,7 @@
       ]
     },
     "dmg": {
+      "sign": false,
       "contents": [
         {
           "x": 110,

package-lock.json

@@ -3,17 +3,21 @@ if [ $TRAVIS_BRANCH != 'alpha' ] && [ $TRAVIS_BRANCH != 'master' ] && [ $TRAVIS_
   exit 0
 fi
 
-echo "Decrypting signing keys..."
-openssl aes-256-cbc -K $encrypted_cb8606543db7_key -iv $encrypted_cb8606543db7_iv -in certs.tar.enc -out certs.tar -d
-echo "Extracting certificates to certs/..."
-tar xvf certs.tar
-echo "Copying certificate files to main directory..."
-cp certs/advancedrestclient.pfx .
-cp certs/arc-mac-certs.p12 .
+# Fails the build when the publishing process fails.
+set -e
+
+echo "Decrypting secrets..."
+openssl aes-256-cbc -K $encrypted_2038aea4e984_key -iv $encrypted_2038aea4e984_iv -in secrets.tar.enc -out secrets.tar -d
+
+echo "Extracting secrets..."
+tar xvf secrets.tar
+
+echo "Copying .env file..."
+cp secrets/.env .
 
 export CSC_NAME="Pawel Psztyc"
-export WIN_CSC_LINK="advancedrestclient.pfx"
-export CSC_LINK="arc-mac-certs.p12"
+export WIN_CSC_LINK="secrets/advancedrestclient.pfx"
+export CSC_LINK="secrets/arc-mac-certs.p12"
 
 if [ -f "$WIN_CSC_LINK" ]; then
   echo "Windows sign key ready."