Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #20 - Items cannot be added to cart if .NET incorrectly detects browser cookie capability #25

Merged
merged 3 commits into from
Jul 13, 2017
Merged

Issue #20 - Items cannot be added to cart if .NET incorrectly detects browser cookie capability #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
013136a
Remove cookie capability checks
MarkXA Jun 23, 2017
45709af
Remove cookie capability checks
MarkXA Jun 23, 2017
962adb5
Merge branch 'cookie-fix' of https://github.com/MarkXA/core into cook…
MarkXA Jun 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Project-specific editor settings

[*.cs]
indent_style = space
indent_size = 4
46 changes: 20 additions & 26 deletions Libraries/Hotcakes.Commerce/SessionManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,11 +474,8 @@ public static string GetCookieString(string cookieName)
{
if (Factory.HttpContext != null)
{
if (Factory.HttpContext.Request.Browser.Cookies)
{
var cookies = Factory.HttpContext.Request.Cookies;
return GetCookieString(cookieName, cookies);
}
var cookies = Factory.HttpContext.Request.Cookies;
return GetCookieString(cookieName, cookies);
}
}
catch
Expand Down Expand Up @@ -533,27 +530,24 @@ public static void SetCookieString(string cookieName, string value)

public static void SetCookieString(string cookieName, string value, DateTime? expirationDate, bool secure)
{
if (Factory.HttpContext != null)
{
if (Factory.HttpContext.Request.Browser.Cookies)
{
try
{
var saveCookie = new HttpCookie(cookieName, value);
if (expirationDate.HasValue)
saveCookie.Expires = expirationDate.Value;
else
saveCookie.Expires = DateTime.Now.AddYears(50);
saveCookie.Secure = secure;
Factory.HttpContext.Request.Cookies.Remove(cookieName);
Factory.HttpContext.Response.Cookies.Add(saveCookie);
}
catch (Exception Ex)
{
EventLog.LogEvent(Ex);
}
}
}
if (Factory.HttpContext != null)
{
try
{
var saveCookie = new HttpCookie(cookieName, value);
if (expirationDate.HasValue)
saveCookie.Expires = expirationDate.Value;
else
saveCookie.Expires = DateTime.Now.AddYears(50);
saveCookie.Secure = secure;
Factory.HttpContext.Request.Cookies.Remove(cookieName);
Factory.HttpContext.Response.Cookies.Add(saveCookie);
}
catch (Exception Ex)
{
EventLog.LogEvent(Ex);
}
}
}

#endregion
Expand Down
34 changes: 14 additions & 20 deletions Libraries/Hotcakes.Web/Cookies.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public static string GetCookieString(string cookieName, HttpContextBase context,
{
if (context.Request != null)
{
if (context.Request.Browser.Cookies && context.Request.Cookies.AllKeys.Contains(cookieName))
if (context.Request.Cookies.AllKeys.Contains(cookieName))
{
var checkCookie = context.Request.Cookies[cookieName];
if (checkCookie != null)
Expand Down Expand Up @@ -119,29 +119,23 @@ public static void SetCookieString(string cookieName, string value, HttpContextB
{
if (context != null)
{
if (context.Request != null)
var saveCookie = new HttpCookie(cookieName, value);
if (!temporary)
{
if (context.Request.Browser.Cookies)
if (expirationDate.HasValue)
{
var saveCookie = new HttpCookie(cookieName, value);
if (!temporary)
{
if (expirationDate.HasValue)
{
saveCookie.Expires = expirationDate.Value;
}
else
{
saveCookie.Expires = DateTime.Now.AddYears(50);
}
}
if (domain.Trim().Length > 0)
{
saveCookie.Domain = domain;
}
context.Response.Cookies.Add(saveCookie);
saveCookie.Expires = expirationDate.Value;
}
else
{
saveCookie.Expires = DateTime.Now.AddYears(50);
}
}
if (domain.Trim().Length > 0)
{
saveCookie.Domain = domain;
}
context.Response.Cookies.Add(saveCookie);
}
}
catch (Exception ex)
Expand Down