Merge v4.2.1 (#4737)

* Move GET `/tokens` into `api` group (#4719) * Move GET `/tokens` into `api` group - this means it's available via the api (the redirect is correctly returned but will not show in browser) - fixes #4716 - test both endpoint and stratos SSO log in * Ensure travis runs on the new branch (will be removed after release) * Update version, change log and package lock for 4.2.1 (#4720) * Update .travis.yml
cloudfoundry · Nov 3, 2020 · 27c9fed · 27c9fed
1 parent 4a34dfd
commit 27c9fed
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Change Log
 
+## 4.2.1
+
+[Full Changelog](https://github.com/cloudfoundry/stratos/compare/4.2.0...4.2.1)
+
+This release contains a single fix relating to Single Sign On:
+
+**Fixes:**
+- SSO Auth Doesn't Work for Endpoints [\#4716](https://github.com/cloudfoundry/stratos/issues/4716)
+
+
+
 ## 4.2.0
 
 [Full Changelog](https://github.com/cloudfoundry/stratos/compare/4.1.0...4.2.0)

diff --git a/deploy/kubernetes/console/README.md b/deploy/kubernetes/console/README.md
@@ -22,7 +22,7 @@ Check the repository was successfully added by searching for the `console`, for
 ```
 helm search repo console
 NAME               	CHART VERSION   APP VERSION	DESCRIPTION                                  
-stratos/console    	4.2.0           4.2.0      	A Helm chart for deploying Stratos UI Console
+stratos/console    	4.2.1           4.2.1      	A Helm chart for deploying Stratos UI Console
 ```
 
 > Note: Version numbers will depend on the version of Stratos available from the Helm repository

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stratos",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "Stratos Console",
   "main": "index.js",
   "scripts": {

diff --git a/src/jetstream/main.go b/src/jetstream/main.go
@@ -1021,14 +1021,12 @@ func (p *portalProxy) registerRoutes(e *echo.Echo, needSetupMiddleware bool) {
 	// Disconnect endpoint
 	stableAPIGroup.DELETE("/tokens/:cnsi_guid", p.logoutOfCNSI)
 
+	// Connect to Endpoint (SSO)
+	stableAPIGroup.GET("/tokens", p.ssoLoginToCNSI)
+
 	// CNSI operations
 	stableAPIGroup.GET("/endpoints", p.listCNSIs)
 
-	sessionAuthGroup := sessionGroup.Group("/auth")
-
-	// Connect to Endpoint (SSO)
-	sessionAuthGroup.GET("/tokens", p.ssoLoginToCNSI)
-
 	// Info
 	sessionGroup.GET("/info", p.info)