fixes #195

.travis.yml

@@ -43,3 +43,16 @@ deploy:
       tags: true
 before_cache:
 - rm -rf $HOME/.cache/electron-builder/wine
+after_deploy:
+- git config --global user.email "travis@travis-ci.org"
+- git config --global user.name "Travis CI"
+- test "$TRAVIS_TAG" != "" && test "$TRAVIS_OS_NAME" == "osx" && sha256=$(shasum -a 256 dist/balloon-desktop-$version.pkg | cut -d ' ' -f1) && echo $sha256
+- test "$TRAVIS_TAG" != "" && test "$TRAVIS_OS_NAME" == "osx" && git clone https://github.com/gyselroth/homebrew-cask
+- test "$TRAVIS_TAG" != "" && test "$TRAVIS_OS_NAME" == "osx" && sed -i '' 's/sha256.*$/sha256 "'$sha256'"/g' homebrew-cask/Casks/balloon-desktop.rb
+- test "$TRAVIS_TAG" != "" && test "$TRAVIS_OS_NAME" == "osx" && sed -i '' 's/version.*$/version "'$version'"/g' homebrew-cask/Casks/balloon-desktop.rb
+- test "$TRAVIS_TAG" != "" && test "$TRAVIS_OS_NAME" == "osx" && sed -i '' 's/pkg.*$/pkg "'balloon-desktop-$version.pkg'"/g' homebrew-cask/Casks/balloon-desktop.rb
+- test "$TRAVIS_TAG" != "" && test "$TRAVIS_OS_NAME" == "osx" && sed -i '' 's/url.*$/url "https:\/\/github.com\/gyselroth\/balloon-client-desktop\/releases\/download\/v'$version'\/balloon-desktop-$version.pkg"/g' homebrew-cask/Casks/balloon-desktop.rb
+- test "$TRAVIS_TAG" != "" && test "$TRAVIS_OS_NAME" == "osx" && cd homebrew-cask
+- test "$TRAVIS_TAG" != "" && test "$TRAVIS_OS_NAME" == "osx" && git commit --message "balloon-desktop release $version" Casks/balloon-desktop.rb
+- test "$TRAVIS_TAG" != "" && test "$TRAVIS_OS_NAME" == "osx" && git remote set-url --push origin https://raffis:${GITHUB_TOKEN}@github.com/gyselroth/homebrew-cask.git > /dev/null 2>&1
+- test "$TRAVIS_TAG" != "" && test "$TRAVIS_OS_NAME" == "osx" && git push origin master --quiet

CHANGELOG.md

@@ -1,14 +1,22 @@
-## 1.2.0-beta1
+## 1.2.0
 **Maintainer**: balloon-team <opensource@gyselroth.net>\
-**Date**:
+**Date**: 
 
-* CORE: [FIX] Missleading message during check for update while downloading latest update #74
-* CORE: [FIX] Change of allowPrerelease flag should work without app restart #169
-* CORE: [FIX] Soft fail if no rights to send events to system events #193
-* CORE: [FIX] Adding missing localizations #205
-* CORE: [FIX] Wrong status after link account #205
-* CORE: [FIX] Empty Message Prevents Sending Error Report #204
-* CORE: [FIX] Fix tray window positioning on osx #112
+### Bugfixes
+* Missleading message during check for update while downloading latest update #74
+* Change of allowPrerelease flag should work without app restart #169
+* Soft fail if no rights to send events to system events #193
+* Adding missing localizations #205
+* Wrong status after link account #205
+* Empty Message Prevents Sending Error Report #204
+* Fix tray window positioning on osx #112
+* Do not unlink account if access token can not get refreshed #188
+
+### Deployment
+* Submit balloon-desktop to brew #195
+
+### Common
+* Starting with v1.2.0 the changelog has a new format, all changes get splitted into sub categeories within the changelog to get a better readability.
 
 
 ## 1.1.1

CONTRIBUTING.md

@@ -102,46 +102,3 @@ If you do not want to sign your build, you can also leave out CSC_LINK and CSC_K
 ## Release
 npm run release-* automatically drafts releases to github if you export a github oauth2 access token (GH_TOKEN), otherwise you can get your builds from ./dist. 
 See balloon desktop client [releases](https://github.com/gyselroth/balloon-client-desktop/releases).
-
-
-# Custom configuration
-Add your configuration in `config/env_[CONTEXT].json` (usuallly config/env_production.json)
-
-The following configuration options are available:
-
-* `name` String (optional) - the name of the context. `production` or `development`. Default: `production`
-* `version` Integer (optional) - version of this configuration (Increase if you want to update env configuration between build updates). Default: `0`
-* `tlsVerifyCert` Boolean (optional) - Accept self signed SSl certificates. Default: `true` on development, `false` on production
-* `blnUrl` String (optional) - the url under which your Balloon installation is running. If no set user is prompted to enter URL on first start (eg: `https://example-balloon.io`)
-* `apiPath` String (optional) - the path to the API Default: `'/api/v1/'`
-* `configDir` String (optional) - path to the directory where configuration is stored on the client. You can use {home}/{username} which gets replaced with the current home directory/local username. This setting only works well if update.enable is set on `false`. Default: `{home}/.balloon`
-* `configFileName` String (optional) - name of the configuration file inside `configDirName`. Default: `config.json`
-* `balloonDir` String (optional) - default path to the directory where the synced files are saved. You can use {home}/{username} which gets replaced with the current home directory/local username. Default: `{home}/Balloon`
-* `log` Object (optional) - logging configuration
-  * `level` String (optional) - maximum level that should be logged. Default: `debug`. Available levels: `{error: 3, warning: 4, notice: 5, info: 6, debug: 7}`
-  * `maxsize` Integer (optional) - maximum size of a single lg file. Default: `10000000`
-  * `maxFiles` Integer (optional) - maximum number of log files. Default: `10`
-* `requestTimeout` Integer (optional) - api request timeout in miliseconds. Default: `30000`
-* `sync`: Object (optional) - sync configuration
-  * `interval` Integer (optional) - interval in which syncs run in production context. Default: `5`
-  * `maxConcurentConnections` Integer (optional) - maximum simultaneous connections for file up- and downloads
-* `enableAutoLaunch` Boolean (optional) - if app should be launched on system startup. Default: true
-* `allowPrerelease` Boolean (optional) - if auto updater should install pre releases. Default: false
-* `update` Object (optional) - update configuration
-  * `enable` Boolean (optional) - enables automatic (and manual) updates - Default: `true`
-  * `checkInterval` Integer (optional) - interval in hours the client should check for updates. A first check is always done on app start. Default: `4`
-* `winClsId` String (optional) - Windows explorer ClsId
-* `auth`: Object (optional) - authentication configuration
-  * `secretStorage` String (optional) - credential storage, either config or keytar (OS keychain). Default: `keytar`
-  * `credentials` null|'basic'|'token' - if `null` only oidc auth is active, `token` for internal token flow, `basic` for basic authentication. Be sure your server supports the configured authentication method. Default: `token`
-  * `oidc` Array (optional) - configure multiple OpenID-connect provider, be sure that your server also supports those oidc provider
-    * `clientId` String (required) client id
-    * `clientSecret` String (required) client secret
-    * `providerUrl` String (required) URL to the discovery document
-    * `redirectUri` String (required) redirect uri to local http port (for example: http://127.0.0.1:13005)
-    * `revokeAuthenticationRequired` Boolean (otional) should be false if the /revoke endpoint does not require client authentication. Default: `true`
-    * `scope` String (required) OAUTH2 scopes (For example: openid profile)
-    * `imgBase64` String (required) base64 encoded Oidc sign-in button
-* `autoReport` Boolean (optional) - If true report will be sent every `autoReportInterval` to `autoReportPutUrl` Default: `false`
-* `autoReportPutUrl` String (optional) - Url to which to send auto reports
-* `autoReportInterval` Integer (optional) - Interval to send auto reports in milliseconds. Default: `300000`

README.md

@@ -23,7 +23,7 @@ This is the desktop client for the [balloon](https://github.com/gyselroth/balloo
 * NodeJS application, which is compatible with all popular operating systems (e.g. OS X, Windows and Linux)
 
 ## Download
-See [Releases](https://github.com/gyselroth/balloon-client-desktop/releases) to download your Windows/Mac OS X/Linux balloon desktop client or visit the [wiki](https://github.com/gyselroth/balloon-client-desktop/wiki/Installation) to get further information on how to install the balloon client on your platform.
+Visit the [Documentation](https://gyselroth.github.io/balloon-docs/desktop-client/installation/) to get information on how to install the balloon desktop client on your platform.
 
 ## Requirements
 You need a running balloon server to operate a balloon web client. Please see [balloon](https://github.com/gyselroth/balloon) for further information.

package.json

@@ -2,7 +2,7 @@
   "name": "balloon-desktop",
   "productName": "Balloon",
   "description": "Balloon Desktop Client",
-  "version": "1.2.0-alpha4",
+  "version": "1.2.0-alpha5",
   "author": "gyselroth GmbH  <opensource@gyselroth.net>",
   "copyright": "© 2017-2019, gyselroth GmbH",
   "homepage": "https://www.gyselroth.com",
@@ -90,7 +90,7 @@
     "minimist": "~1.2.0"
   },
   "dependencies": {
-    "@gyselroth/balloon-node-sync": "0.5.1",
+    "@gyselroth/balloon-node-sync": "0.5.2",
     "@gyselroth/icon-collection": "^1.0.9",
     "@gyselroth/node-advanced-desktop": "^1.0.5",
     "@openid/appauth": "^1.1.2",