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

Standardize on C# 10, no implicit usings, and file-scope namespaces #519

Merged
merged 1 commit into from
Mar 7, 2024
Merged

Standardize on C# 10, no implicit usings, and file-scope namespaces #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 12 additions & 6 deletions Source/v2/Meadow.Cloud.Client/Devices/AddDeviceRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,38 @@
namespace Meadow.Cloud.Client.Devices;

public class AddDeviceRequest(string id, string orgId, string publicKey)
public class AddDeviceRequest
{
public AddDeviceRequest(string id, string orgId, string publicKey)
{
Id = id;
OrgId = orgId;
PublicKey = publicKey;
}

public AddDeviceRequest(string id, string name, string orgId, string publicKey)
: this(id, orgId, publicKey)
{
Name = name;
}

public AddDeviceRequest(string id, string name, string orgId, string collectionId, string publicKey)
: this(id, orgId, publicKey)
: this(id, name, orgId, publicKey)
{
Name = name;
CollectionId = collectionId;
}

[JsonPropertyName("id")]
public string Id { get; set; } = id;
public string Id { get; set; }

[JsonPropertyName("name")]
public string? Name { get; set; }

[JsonPropertyName("orgId")]
public string OrgId { get; set; } = orgId;
public string OrgId { get; set; }

[JsonPropertyName("collectionId")]
public string? CollectionId { get; set; }

[JsonPropertyName("publicKey")]
public string PublicKey { get; set; } = publicKey;
public string PublicKey { get; set; }
}
18 changes: 13 additions & 5 deletions Source/v2/Meadow.Cloud.Client/Devices/AddDeviceResponse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
namespace Meadow.Cloud.Client.Devices;

public class AddDeviceResponse(string id, string name, string orgId, string collectionId)
public class AddDeviceResponse
{
public AddDeviceResponse(string id, string name, string orgId, string collectionId)
{
Id = id;
Name = name;
OrgId = orgId;
CollectionId = collectionId;
}

[JsonPropertyName("id")]
public string Id { get; set; } = id;
public string Id { get; set; }

[JsonPropertyName("name")]
public string? Name { get; set; } = name;
public string? Name { get; set; }

[JsonPropertyName("orgId")]
public string OrgId { get; set; } = orgId;
public string OrgId { get; set; }

[JsonPropertyName("collectionId")]
public string? CollectionId { get; set; } = collectionId;
public string? CollectionId { get; set; }
}
6 changes: 4 additions & 2 deletions Source/v2/Meadow.Cloud.Client/Firmware/FirmwareClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
namespace Meadow.Cloud.Client.Firmware;
using System.Linq;

namespace Meadow.Cloud.Client.Firmware;

public class FirmwareClient : MeadowCloudClientBase, IFirmwareClient
{
Expand All @@ -19,7 +21,7 @@ public async Task<IEnumerable<GetFirmwareVersionsResponse>> GetVersions(string t

if (response.StatusCode == HttpStatusCode.NotFound)
{
return [];
return Enumerable.Empty<GetFirmwareVersionsResponse>();
}

return await ProcessResponse<IEnumerable<GetFirmwareVersionsResponse>>(response, cancellationToken);
Expand Down
18 changes: 13 additions & 5 deletions Source/v2/Meadow.Cloud.Client/Firmware/GetFirmwareVersionResponse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
namespace Meadow.Cloud.Client.Firmware;

public class GetFirmwareVersionResponse(string version, string minCLIVersion, string downloadUrl, string networkDownloadUrl)
public class GetFirmwareVersionResponse
{
public GetFirmwareVersionResponse(string version, string minCLIVersion, string downloadUrl, string networkDownloadUrl)
{
Version = version;
MinCLIVersion = minCLIVersion;
DownloadUrl = downloadUrl;
NetworkDownloadUrl = networkDownloadUrl;
}

[JsonPropertyName("version")]
public string Version { get; set; } = version;
public string Version { get; set; }

[JsonPropertyName("minCLIVersion")]
public string MinCLIVersion { get; set; } = minCLIVersion;
public string MinCLIVersion { get; set; }

[JsonPropertyName("downloadUrl")]
public string DownloadUrl { get; set; } = downloadUrl;
public string DownloadUrl { get; set; }

[JsonPropertyName("networkDownloadUrl")]
public string NetworkDownloadUrl { get; set; } = networkDownloadUrl;
public string NetworkDownloadUrl { get; set; }
}
12 changes: 9 additions & 3 deletions Source/v2/Meadow.Cloud.Client/Firmware/GetFirmwareVersionsResponse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
namespace Meadow.Cloud.Client.Firmware;

public class GetFirmwareVersionsResponse(string version, DateTimeOffset lastModifiedAt)
public class GetFirmwareVersionsResponse
{
public GetFirmwareVersionsResponse(string version, DateTimeOffset lastModifiedAt)
{
Version = version;
LastModifiedAt = lastModifiedAt;
}

[JsonPropertyName("version")]
public string Version { get; set; } = version;
public string Version { get; set; }

[JsonPropertyName("lastModifiedAt")]
public DateTimeOffset LastModifiedAt { get; set; } = lastModifiedAt;
public DateTimeOffset LastModifiedAt { get; set; }
}
14 changes: 10 additions & 4 deletions Source/v2/Meadow.Cloud.Client/Identity/IdentityManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,12 +313,18 @@ private void OpenBrowser(string url)
}
}

private class AccessToken(string token, DateTimeOffset expiresAt, string emailAddress)
private class AccessToken
{
public AccessToken(string token, DateTimeOffset expiresAt, string emailAddress)
{
Token = token;
ExpiresAtUtc = expiresAt;
EmailAddress = emailAddress;
}

public string Token { get; } = token;
public DateTimeOffset ExpiresAtUtc { get; } = expiresAt;
public string EmailAddress { get; } = emailAddress;
public string Token { get; }
public DateTimeOffset ExpiresAtUtc { get; }
public string EmailAddress { get; }

public bool IsValid => !string.IsNullOrWhiteSpace(Token) && ExpiresAtUtc > DateTimeOffset.UtcNow.AddMinutes(30);
}
Expand Down
31 changes: 16 additions & 15 deletions Source/v2/Meadow.Cloud.Client/Meadow.Cloud.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<LangVersion>12</LangVersion>
</PropertyGroup>

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<LangVersion>10</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CredentialManagement.Standard" Version="1.0.4" />
<PackageReference Include="IdentityModel.OidcClient" Version="3.1.2" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="System.IO.Hashing" Version="7.0.0" />
<PackageReference Include="System.Net.Http.Json" Version="7.0.1" />
<PackageReference Include="System.Text.Json" Version="7.0.3" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CredentialManagement.Standard" Version="1.0.4" />
<PackageReference Include="IdentityModel.OidcClient" Version="3.1.2" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="System.IO.Hashing" Version="7.0.0" />
<PackageReference Include="System.Net.Http.Json" Version="7.0.1" />
<PackageReference Include="System.Text.Json" Version="7.0.3" />
</ItemGroup>

</Project>
23 changes: 17 additions & 6 deletions Source/v2/Meadow.Cloud.Client/MeadowCloudResponse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,28 @@
namespace Meadow.Cloud.Client;

public class MeadowCloudResponse(HttpStatusCode statusCode, IReadOnlyDictionary<string, IEnumerable<string>> headers)
public class MeadowCloudResponse
{
public MeadowCloudResponse(HttpStatusCode statusCode, IReadOnlyDictionary<string, IEnumerable<string>> headers)
{
StatusCode = statusCode;
Headers = headers;
}

public MeadowCloudResponse(HttpStatusCode statusCode) : this(statusCode, new Dictionary<string, IEnumerable<string>>()) { }

public HttpStatusCode StatusCode { get; } = statusCode;
public IReadOnlyDictionary<string, IEnumerable<string>> Headers { get; } = headers;
public HttpStatusCode StatusCode { get; }
public IReadOnlyDictionary<string, IEnumerable<string>> Headers { get; }
}

public class MeadowCloudResponse<TResult>(HttpStatusCode statusCode, IReadOnlyDictionary<string, IEnumerable<string>> headers, TResult result)
: MeadowCloudResponse(statusCode, headers)
public class MeadowCloudResponse<TResult> : MeadowCloudResponse
{
public MeadowCloudResponse(HttpStatusCode statusCode, IReadOnlyDictionary<string, IEnumerable<string>> headers, TResult result)
: base(statusCode, headers)
{
Result = result;
}

public MeadowCloudResponse(HttpStatusCode statusCode, TResult result) : this(statusCode, new Dictionary<string, IEnumerable<string>>(), result) { }

public TResult Result { get; } = result;
public TResult Result { get; }
}
84 changes: 61 additions & 23 deletions Source/v2/Meadow.Cloud.Client/Services/ApiTokenService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,40 +68,78 @@ public async Task DeleteApiToken(string id, string host, CancellationToken? canc
}
}

public class GetApiTokenResponse(string id, string name, DateTimeOffset expiresAt, string[] scopes)
public class GetApiTokenResponse
{
public string Id { get; set; } = id;
public string Name { get; set; } = name;
public DateTimeOffset ExpiresAt { get; set; } = expiresAt;
public string[] Scopes { get; set; } = scopes;
public GetApiTokenResponse(string id, string name, DateTimeOffset expiresAt, string[] scopes)
{
Id = id;
Name = name;
ExpiresAt = expiresAt;
Scopes = scopes;
}

public string Id { get; set; }
public string Name { get; set; }
public DateTimeOffset ExpiresAt { get; set; }
public string[] Scopes { get; set; }
}

public class CreateApiTokenRequest(string name, int duration, string[] scopes)
public class CreateApiTokenRequest
{
public string Name { get; set; } = name;
public int Duration { get; set; } = duration;
public string[] Scopes { get; set; } = scopes;
public CreateApiTokenRequest(string name, int duration, string[] scopes)
{
Name = name;
Duration = duration;
Scopes = scopes;
}

public string Name { get; set; }
public int Duration { get; set; }
public string[] Scopes { get; set; }
}

public class CreateApiTokenResponse(string id, string name, DateTimeOffset expiresAt, string[] scopes, string token)
public class CreateApiTokenResponse
{
public string Id { get; set; } = id;
public string Name { get; set; } = name;
public DateTimeOffset ExpiresAt { get; set; } = expiresAt;
public string[] Scopes { get; set; } = scopes;
public string Token { get; set; } = token;
public CreateApiTokenResponse(string id, string name, DateTimeOffset expiresAt, string[] scopes, string token)
{
Id = id;
Name = name;
ExpiresAt = expiresAt;
Scopes = scopes;
Token = token;
}

public string Id { get; set; }
public string Name { get; set; }
public DateTimeOffset ExpiresAt { get; set; }
public string[] Scopes { get; set; }
public string Token { get; set; }
}

public class UpdateApiTokenRequest(string name, string[] scopes)
public class UpdateApiTokenRequest
{
public string Name { get; set; } = name;
public string[] Scopes { get; set; } = scopes;
public UpdateApiTokenRequest(string name, string[] scopes)
{
Name = name;
Scopes = scopes;
}

public string Name { get; set; }
public string[] Scopes { get; set; }
}

public class UpdateApiTokenResponse(string id, string name, DateTimeOffset expiresAt, string[] scopes)
public class UpdateApiTokenResponse
{
public string Id { get; set; } = id;
public string Name { get; set; } = name;
public DateTimeOffset ExpiresAt { get; set; } = expiresAt;
public string[] Scopes { get; set; } = scopes;
public UpdateApiTokenResponse(string id, string name, DateTimeOffset expiresAt, string[] scopes)
{
Id = id;
Name = name;
ExpiresAt = expiresAt;
Scopes = scopes;
}

public string Id { get; set; }
public string Name { get; set; }
public DateTimeOffset ExpiresAt { get; set; }
public string[] Scopes { get; set; }
}
15 changes: 11 additions & 4 deletions Source/v2/Meadow.Cloud.Client/Users/GetOrganizationResponse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
namespace Meadow.Cloud.Client.Users;

public class GetOrganizationResponse(string id, string name, string defaultCollectionId)
public class GetOrganizationResponse
{
public GetOrganizationResponse(string id, string name, string defaultCollectionId)
{
Id = id;
Name = name;
DefaultCollectionId = defaultCollectionId;
}

[JsonPropertyName("id")]
public string Id { get; set; } = id;
public string Id { get; set; }

[JsonPropertyName("name")]
public string Name { get; set; } = name;
public string Name { get; set; }

[JsonPropertyName("defaultCollectionId")]
public string DefaultCollectionId { get; set; } = defaultCollectionId;
public string DefaultCollectionId { get; set; }
}
21 changes: 15 additions & 6 deletions Source/v2/Meadow.Cloud.Client/Users/GetUserResponse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,28 @@
namespace Meadow.Cloud.Client.Users;

public class GetUserResponse(string id, string email, string firstName, string lastName, string fullName)
public class GetUserResponse
{
public GetUserResponse(string id, string email, string firstName, string lastName, string fullName)
{
Id = id;
Email = email;
FirstName = firstName;
LastName = lastName;
FullName = fullName;
}

[JsonPropertyName("id")]
public string Id { get; set; } = id;
public string Id { get; set; }

[JsonPropertyName("email")]
public string Email { get; set; } = email;
public string Email { get; set; }

[JsonPropertyName("firstName")]
public string FirstName { get; set; } = firstName;
public string FirstName { get; set; }

[JsonPropertyName("lastName")]
public string LastName { get; set; } = lastName;
public string LastName { get; set; }

[JsonPropertyName("fullName")]
public string FullName { get; set; } = fullName;
public string FullName { get; set; }
}
Loading
Loading