Fix OIDC callback to properly append newUser query parameter

Tool: gitpod/catfood.gitpod.cloud

Author: filiptronicek

components/public-api-server/pkg/oidc/router.go

@@ -177,7 +177,15 @@ func (s *Service) getCallbackHandler() http.HandlerFunc {
 				return
 			}
 			if message.NewUser {
-				oauth2Result.ReturnToURL += "&newUser=true"
+				returnURL, err := url.Parse(oauth2Result.ReturnToURL)
+				if err != nil {
+					log.WithError(err).Warn("Failed to parse return URL")
+				} else {
+					q := returnURL.Query()
+					q.Set("newUser", "true")
+					returnURL.RawQuery = q.Encode()
+					oauth2Result.ReturnToURL = returnURL.String()
+				}
 			}
 			for _, cookie := range cookies {
 				http.SetCookie(rw, cookie)

components/public-api-server/pkg/oidc/router_test.go

@@ -101,7 +101,7 @@ func TestRoute_callback(t *testing.T) {
 
 	url, err := resp.Location()
 	require.NoError(t, err)
-	require.Equal(t, "/relative/url/to/some/page", url.Path, "callback redirects properly")
+	require.Equal(t, "/relative/url/to/some/page?newUser=true", url.Path, "callback redirects properly")
 
 }