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

Jump to bottom

Fallback to current hostname #18

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fallback to current hostname #18

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
4f8308e
Fix whitespace
georgehemmings Oct 20, 2015
28bb980
Allow NotificationHostName to be null
georgehemmings Oct 20, 2015
8ab58f9
Refactor: introduce instance field
georgehemmings Oct 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 2 additions & 16 deletions src/SagePayMvc/Configuration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,24 +94,10 @@ public class Configuration {
}
}


/// <summary>
/// Notification host name. This is required.
/// Notification host name.
/// </summary>
public string NotificationHostName {
get {
if (string.IsNullOrEmpty(notificationHostName)) {
throw new ArgumentNullException("notificationHostName", "NotificationHostName must be specified in the configuration.");
}
return notificationHostName;
}
set {
if (string.IsNullOrEmpty(value)) {
throw new ArgumentNullException("value", "NotificationHostName must be specified in the configuration.");
}
notificationHostName = value;
}
}
public string NotificationHostName { get; set; }

/// <summary>
/// Server mode (simulator, test, live)
Expand Down
22 changes: 16 additions & 6 deletions src/SagePayMvc/DefaultUrlResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,31 +30,41 @@ public class DefaultUrlResolver : IUrlResolver {
public const string FailedActionName = "Failed";
public const string SuccessfulActionName = "Success";

readonly Configuration configuration;

/// <summary>
/// Creates a new instance of the DefaultUrlResolver using the configuration specified in the web.conf.
/// </summary>
public DefaultUrlResolver() {
configuration = Configuration.Current;
}

public virtual string BuildFailedTransactionUrl(RequestContext context, string vendorTxCode) {
var configuration = Configuration.Current;
var urlHelper = new UrlHelper(context);
var routeValues = new RouteValueDictionary(new {controller = configuration.FailedController, action = configuration.FailedAction, vendorTxCode});

string url = urlHelper.RouteUrl(null, routeValues, configuration.Protocol, configuration.NotificationHostName);
string url = urlHelper.RouteUrl(null, routeValues, configuration.Protocol, GetNotificationHostName(context));
return url;
}

public virtual string BuildSuccessfulTransactionUrl(RequestContext context, string vendorTxCode) {
var configuration = Configuration.Current;
var urlHelper = new UrlHelper(context);
var routeValues = new RouteValueDictionary(new {controller = configuration.SuccessController, action = configuration.SuccessAction, vendorTxCode});

string url = urlHelper.RouteUrl(null, routeValues, configuration.Protocol, configuration.NotificationHostName);
string url = urlHelper.RouteUrl(null, routeValues, configuration.Protocol, GetNotificationHostName(context));
return url;
}

public virtual string BuildNotificationUrl(RequestContext context) {
var configuration = Configuration.Current;
var urlHelper = new UrlHelper(context);
var routeValues = new RouteValueDictionary(new {controller = configuration.NotificationController, action = configuration.NotificationAction});

string url = urlHelper.RouteUrl(null, routeValues, configuration.Protocol, configuration.NotificationHostName);
string url = urlHelper.RouteUrl(null, routeValues, configuration.Protocol, GetNotificationHostName(context));
return url;
}

public string GetNotificationHostName(RequestContext context) {
return configuration.NotificationHostName ?? context.HttpContext.Request.Url.Host;
}
}
}