Skip to content

Support for relative capability URLs #10

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

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

Support for relative capability URLs #10

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
1fcc010
Added BaseUri property to SessionResource, supporting relative url wh…
bradyk-trianglemls Apr 26, 2024
40bba7c
fixed misspelling
bradyk-trianglemls May 7, 2024
c38926f
Merge pull request #1 from Triangle-MLS/relative-capability-url-support
bradyk-trianglemls Jul 9, 2024
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
2 changes: 1 addition & 1 deletion RetsSdk/Models/ConnectionOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public class ConnectionOptions
public string Password { get; set; }
public AuthenticationType Type { get; set; }
public string UserAgent { get; set; }
public string UserAgentPassward { get; set; }
public string UserAgentPassword { get; set; }
public SupportedRetsVersion RetsServerVersion { get; set; } = SupportedRetsVersion.Version_1_7_2;
public string LoginUrl { get; set; }
public TimeSpan Timeout { get; set; }
Expand Down
10 changes: 8 additions & 2 deletions RetsSdk/Models/SessionResource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace CrestApps.RetsSdk.Models
{
public class SessionResource
{
public string BaseUri { get; set; }
public string SessionId { get; set; }
public string Cookie { get; set; }

Expand All @@ -19,19 +20,24 @@ public SessionResource()

public void AddCapability(Capability name, string url)
{
if (url.StartsWith("/"))
{
url = BaseUri + url;
}

var uri = new Uri(url);

if (Capabilities.ContainsKey(name) || !uri.IsWellFormedOriginalString())
{
return;
}

Capabilities.TryAdd(name, uri);
}

public Uri GetCapability(Capability name)
{
if(!Capabilities.ContainsKey(name))
if (!Capabilities.ContainsKey(name))
{
throw new MissingCapabilityException();
}
Expand Down
5 changes: 3 additions & 2 deletions RetsSdk/Services/RetsSession.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ protected SessionResource GetRetsResource(string[] parts, string cookie)
{
var resource = new SessionResource()
{
BaseUri = LoginUri.AbsoluteUri.Substring(0, LoginUri.AbsoluteUri.Length - LoginUri.PathAndQuery.Length),
SessionId = MakeRetsSessionId(cookie),
Cookie = cookie,
};
Expand All @@ -102,12 +103,12 @@ private string MakeRetsSessionId(string cookie)
{
string sessionId = ExtractSessionId(cookie);

if(string.IsNullOrWhiteSpace(sessionId))
if (string.IsNullOrWhiteSpace(sessionId))
{
return null;
}

string agentData = Str.Md5(Options.UserAgent + ":" + Options.UserAgentPassward);
string agentData = Str.Md5(Options.UserAgent + ":" + Options.UserAgentPassword);

return $"{agentData}::{sessionId}:{Options.Version.AsHeader()}";
}
Expand Down