fix: resolve cookie issues

ory · Jul 16, 2020 · 6e2b6d2 · 6e2b6d2
1 parent 753eb86
commit 6e2b6d2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/.schema/config.schema.json b/.schema/config.schema.json
@@ -889,7 +889,7 @@
               "default": "Lax"
             }
           },
-          "additionalProperties": false,
+          "additionalProperties": false
         }
       }
     }

diff --git a/session/manager_http.go b/session/manager_http.go
@@ -62,9 +62,15 @@ func (s *ManagerHTTP) CreateToRequest(ctx context.Context, w http.ResponseWriter
 func (s *ManagerHTTP) SaveToRequest(ctx context.Context, w http.ResponseWriter, r *http.Request, session *Session) error {
 	_ = s.r.CSRFHandler().RegenerateToken(w, r)
 	cookie, _ := s.r.CookieManager().Get(r, s.cookieName)
-	cookie.Options.Domain = s.c.SessionDomain()
-	cookie.Options.Path = s.c.SessionPath()
-	cookie.Options.SameSite = s.c.SessionSameSiteMode()
+	if s.c.SessionDomain() != "" {
+		cookie.Options.Domain = s.c.SessionDomain()
+	}
+	if s.c.SessionPath() != "" {
+		cookie.Options.Path = s.c.SessionPath()
+	}
+	if s.c.SessionSameSiteMode() != 0 {
+		cookie.Options.SameSite = s.c.SessionSameSiteMode()
+	}
 	cookie.Values["sid"] = session.ID.String()
 	if err := cookie.Save(r, w); err != nil {
 		return errors.WithStack(err)