Merge branch 'master' of https://github.com/noflo/noflo-ui

noflo · Oct 25, 2017 · 409fa45 · 409fa45
2 parents f7bbcad + 7f3c6f4
commit 409fa45
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,12 @@
 NoFlo UI ChangeLog
 ==================
 
+## 0.22.1 (2017 October 26)
+
+Bugfixes:
+
+* Fixed GitHub tab not opening
+
 ## 0.22.0 (2017 October 24)
 
 New features:

diff --git a/components/GetRemoteUser.coffee b/components/GetRemoteUser.coffee
@@ -29,9 +29,7 @@ exports.getComponent = ->
         userData = JSON.parse req.responseText
       catch e
         return callback e
-      out.beginGroup token
       out.send userData
-      out.endGroup()
       do callback
       return
     req.open 'GET', "$NOFLO_OAUTH_SERVICE_USER$NOFLO_OAUTH_ENDPOINT_USER", true

diff --git a/components/RefreshRemoteUser.coffee b/components/RefreshRemoteUser.coffee
@@ -56,9 +56,7 @@ exports.getComponent = ->
         do callback
         return
       # Update user information based on remote data
-      out.updated.beginGroup data['grid-token']
       out.updated.send userData
-      out.updated.endGroup()
       do callback
       return
     req.open 'GET', "$NOFLO_OAUTH_SERVICE_USER$NOFLO_OAUTH_ENDPOINT_USER", true

diff --git a/components/StoreUser.coffee b/components/StoreUser.coffee
@@ -48,15 +48,14 @@ exports.getComponent = ->
     async: true
   , (user, groups, out, callback) ->
 
-    token = groups.pop()
     plan = user.plan?.type or 'free'
     githubToken = user.github?.token or ''
     githubUsername = user.github?.username or ''
 
     downloadAvatar user.avatar, (err, avatar) ->
       userData =
         'grid-avatar': avatar
-        'grid-token': token
+        'grid-token': githubToken
         'grid-user': JSON.stringify user
         'github-token': githubToken
         'github-username': githubUsername

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "noflo-ui",
   "description": "NoFlo Development Environment",
-  "version": "0.22.0",
+  "version": "0.22.1",
   "author": {
     "name": "Henri Bergius",
     "email": "henri.bergius@iki.fi"