Merge pull request #551 from kbase/develop

Develop -> Master (1.5.5)

config/release.yml

@@ -6,4 +6,4 @@
 ---
 # Note that this file is merged into the master config in the release namespace.
 release:
-  version: 1.5.4
+  version: 1.5.5

release-notes/RELEASE_NOTES_1.5.5.md

@@ -0,0 +1,26 @@
+# KBase kbase-ui 1.5.5 Release Notes
+
+Fix to sign-in; backup cookie configuration to support html viewer in production was not being passed correctly
+
+## CHANGES
+
+
+### NEW
+
+n/a
+
+### REMOVED
+
+n/a
+
+### UNRELEASED
+
+n/a
+
+### IMPROVEMENTS
+
+n/a
+
+### FIXES
+
+- fix backup cookie configuration reference (https://github.com/kbase/kbase-ui/commit/23a5cb27e41bb840b9b9772610dfc4bde2ccf4f0)

release-notes/index.md

@@ -6,6 +6,7 @@
 
 | Version                           | Date       | Notes               |
 |-----------------------------------|------------|---------------------|
+| [1.5.5](RELEASE_NOTES_1.5.5.html) | 2018-02-01 |  |
 | [1.5.4](RELEASE_NOTES_1.5.4.html) | 2018-02-01 |  |
 | [1.5.3](RELEASE_NOTES_1.5.3.html) | 2018-02-01 |  |
 | [1.5.2](RELEASE_NOTES_1.5.2.html) | 2018-01-25 |  |

src/client/modules/app/services/session.js

@@ -30,7 +30,7 @@ define([
         // TODO: all of this from config?
         var auth2Session = new M_auth2Session.Auth2Session({
             cookieName: runtime.config('services.auth2.cookieName'),
-            extraCookies: config.extraCookies,
+            extraCookies: extraCookies,
             baseUrl: runtime.config('services.auth2.url'),
             providers: runtime.config('services.auth2.providers')
         });