Merge branch 'feature-oidc' of https://github.com/canonical/jimm into…

… css-6646/sessions
canonical · Mar 6, 2024 · 35e11ad · 35e11ad
2 parents ad3861d + 122abfb
commit 35e11ad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/internal/jimmhttp/auth_handler.go b/internal/jimmhttp/auth_handler.go
@@ -135,10 +135,10 @@ func (oah *OAuthHandler) Callback(w http.ResponseWriter, r *http.Request) {
 		writeError(ctx, w, http.StatusBadRequest, err, "failed to get session")
 	}
 
-	session.IsNew = true             // Sets cookie to a fresh new cookie
-	session.Options.MaxAge = 86400   // 24 Hours expiry
-	session.Options.Secure = false   // Ensures only sent with HTTPS
-	session.Options.HttpOnly = false // Allow Javascript to read it
+	session.IsNew = true                       // Sets cookie to a fresh new cookie
+	session.Options.MaxAge = oah.cookieExpiry  // 24 Hours expiry
+	session.Options.Secure = oah.secureCookies // Ensures only sent with HTTPS
+	session.Options.HttpOnly = false           // Allow Javascript to read it
 
 	session.Values["jimm-session"] = email
 	if err = session.Save(r, w); err != nil {

diff --git a/internal/jimmhttp/auth_handler_test.go b/internal/jimmhttp/auth_handler_test.go
@@ -56,7 +56,6 @@ func setupTestServer(c *qt.C, dashboardURL string, db *db.Database, sessionStore
 
 	// Remember redirect url to check it matches after test server starts
 	redirectURL := "http://127.0.0.1:" + port + "/callback"
-
 	authSvc, err := auth.NewAuthenticationService(context.Background(), auth.AuthenticationServiceParams{
 		IssuerURL:          "http://localhost:8082/realms/jimm",
 		ClientID:           "jimm-device",