patrick/puregym-unofficial-dotnet
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Bump WoofWare.Myriad #7

Merged
patrick merged 3 commits from bump-packaging into main 2023-12-30 11:59:42 +00:00
Conversation 0 Commits 3 Files Changed 4 +67 -10
4 changed files with 67 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PureGym/Api.fs
View File

@@ -16,7 +16,7 @@ module Api =
| Auth.User cred -> AuthToken.get cred | Auth.User cred -> AuthToken.get cred
let client = new HttpClient () let client = new HttpClient ()
client.BaseAddress <- Uri "https://capi.puregym.com/api" client.BaseAddress <- Uri "https://capi.puregym.com/api/"
client.DefaultRequestHeaders.Authorization <- client.DefaultRequestHeaders.Authorization <-
Headers.AuthenticationHeaderValue ("Bearer", token.AccessToken) Headers.AuthenticationHeaderValue ("Bearer", token.AccessToken)

69
PureGym/GeneratedClient.fs
View File

@@ -24,7 +24,18 @@ module PureGymApi =
let! ct = Async.CancellationToken let! ct = Async.CancellationToken
let uri = let uri =
System.Uri (client.BaseAddress, System.Uri ("v1/gyms/", System.UriKind.Relative)) System.Uri (
(match client.BaseAddress with
| null ->
raise (
System.ArgumentNullException (
nameof (client.BaseAddress),
"No base address was supplied on the type, and no BaseAddress was on the HttpClient."
)
)
| v -> v),
System.Uri ("v1/gyms/", System.UriKind.Relative)
)
let httpMessage = let httpMessage =
new System.Net.Http.HttpRequestMessage ( new System.Net.Http.HttpRequestMessage (
@@ -49,7 +60,18 @@ module PureGymApi =
let! ct = Async.CancellationToken let! ct = Async.CancellationToken
let uri = let uri =
System.Uri (client.BaseAddress, System.Uri ("v1/member", System.UriKind.Relative)) System.Uri (
(match client.BaseAddress with
| null ->
raise (
System.ArgumentNullException (
nameof (client.BaseAddress),
"No base address was supplied on the type, and no BaseAddress was on the HttpClient."
)
)
| v -> v),
System.Uri ("v1/member", System.UriKind.Relative)
)
let httpMessage = let httpMessage =
new System.Net.Http.HttpRequestMessage ( new System.Net.Http.HttpRequestMessage (
@@ -75,7 +97,15 @@ module PureGymApi =
let uri = let uri =
System.Uri ( System.Uri (
client.BaseAddress, (match client.BaseAddress with
| null ->
raise (
System.ArgumentNullException (
nameof (client.BaseAddress),
"No base address was supplied on the type, and no BaseAddress was on the HttpClient."
)
)
| v -> v),
System.Uri ( System.Uri (
"v1/gyms/{gym_id}/attendance" "v1/gyms/{gym_id}/attendance"
.Replace ("{gym_id}", gymId.ToString () |> System.Web.HttpUtility.UrlEncode), .Replace ("{gym_id}", gymId.ToString () |> System.Web.HttpUtility.UrlEncode),
@@ -107,7 +137,15 @@ module PureGymApi =
let uri = let uri =
System.Uri ( System.Uri (
client.BaseAddress, (match client.BaseAddress with
| null ->
raise (
System.ArgumentNullException (
nameof (client.BaseAddress),
"No base address was supplied on the type, and no BaseAddress was on the HttpClient."
)
)
| v -> v),
System.Uri ( System.Uri (
"v1/gyms/{gym_id}" "v1/gyms/{gym_id}"
.Replace ("{gym_id}", gymId.ToString () |> System.Web.HttpUtility.UrlEncode), .Replace ("{gym_id}", gymId.ToString () |> System.Web.HttpUtility.UrlEncode),
@@ -138,7 +176,18 @@ module PureGymApi =
let! ct = Async.CancellationToken let! ct = Async.CancellationToken
let uri = let uri =
System.Uri (client.BaseAddress, System.Uri ("v1/member/activity", System.UriKind.Relative)) System.Uri (
(match client.BaseAddress with
| null ->
raise (
System.ArgumentNullException (
nameof (client.BaseAddress),
"No base address was supplied on the type, and no BaseAddress was on the HttpClient."
)
)
| v -> v),
System.Uri ("v1/member/activity", System.UriKind.Relative)
)
let httpMessage = let httpMessage =
new System.Net.Http.HttpRequestMessage ( new System.Net.Http.HttpRequestMessage (
@@ -164,7 +213,15 @@ module PureGymApi =
let uri = let uri =
System.Uri ( System.Uri (
client.BaseAddress, (match client.BaseAddress with
| null ->
raise (
System.ArgumentNullException (
nameof (client.BaseAddress),
"No base address was supplied on the type, and no BaseAddress was on the HttpClient."
)
)
| v -> v),
System.Uri ( System.Uri (
("v2/gymSessions/member" ("v2/gymSessions/member"
+ "?fromDate=" + "?fromDate="

2
PureGym/PureGym.fsproj
View File

@@ -6,7 +6,7 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors> <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarnOn>FS3559</WarnOn> <WarnOn>FS3559</WarnOn>
<WoofWareMyriadPluginVersion>1.1.10</WoofWareMyriadPluginVersion> <WoofWareMyriadPluginVersion>1.1.13</WoofWareMyriadPluginVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

4
nix/deps.nix
View File

@@ -438,7 +438,7 @@
}) })
(fetchNuGet { (fetchNuGet {
pname = "WoofWare.Myriad.Plugins"; pname = "WoofWare.Myriad.Plugins";
version = "1.1.10"; version = "1.1.13";
sha256 = "sha256-Z4dBuIhbFlbXgm+jucL4txSccTdpkRLiEg8kNyRPhxI="; sha256 = "sha256-TjR+3spu9vXb2kOoXM9p6yzjpt2rja1Tu7cAOmIMhog= ";
}) })
] ]