Support OIDC for the SSO

pkg/app/server/httpapi/callback.go

@@ -178,10 +178,13 @@ func parseProjectAndState(r *http.Request) (string, string, error) {
 	if len(s) != 2 {
 		projectID := r.FormValue(projectFormKey)
 		if projectID == "" {
-			return "", "", fmt.Errorf("missing project id")
+			return s[0], "", fmt.Errorf("missing project id")
 		}
 		return state, projectID, nil
 	} else {
+		if s[1] == "" {
+			return s[0], "", fmt.Errorf("missing project id")
+		}
 		return s[0], s[1], nil
 	}
 }

pkg/app/server/httpapi/callback_test.go

@@ -13,3 +13,83 @@
 // limitations under the License.
 
 package httpapi
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestParseProjectAndState(t *testing.T) {
+	tests := []struct {
+		name          string
+		formValues    url.Values
+		expectedState string
+		expectedProj  string
+		expectErr     bool
+	}{
+		{
+			name:          "missing state",
+			formValues:    url.Values{},
+			expectedState: "",
+			expectedProj:  "",
+			expectErr:     true,
+		},
+		{
+			name: "state without project id",
+			formValues: url.Values{
+				stateFormKey: {"state-token"},
+			},
+			expectedState: "state-token",
+			expectedProj:  "",
+			expectErr:     true,
+		},
+		{
+			name: "state with project id",
+			formValues: url.Values{
+				stateFormKey: {"state-token:project-id"},
+			},
+			expectedState: "state-token",
+			expectedProj:  "project-id",
+			expectErr:     false,
+		},
+		{
+			name: "state without colon and project id in form",
+			formValues: url.Values{
+				stateFormKey:   {"state-token"},
+				projectFormKey: {"project-id"},
+			},
+			expectedState: "state-token",
+			expectedProj:  "project-id",
+			expectErr:     false,
+		},
+		{
+			name: "state with colon but missing project id in form",
+			formValues: url.Values{
+				stateFormKey: {"state-token:"},
+			},
+			expectedState: "state-token",
+			expectedProj:  "",
+			expectErr:     true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			req := httptest.NewRequest(http.MethodGet, "/", nil)
+			req.Form = tt.formValues
+
+			state, project, err := parseProjectAndState(req)
+			if tt.expectErr {
+				assert.Error(t, err)
+			} else {
+				assert.NoError(t, err)
+			}
+			assert.Equal(t, tt.expectedState, state)
+			assert.Equal(t, tt.expectedProj, project)
+		})
+	}
+}