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.

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

Update login verbiage to use Wilderness Labs account #489

Merged
merged 1 commit into from
Feb 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions Source/v2/Meadow.Cli/Commands/Current/BaseCloudCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,7 @@ public BaseCloudCommand(
}
catch (MeadowCloudAuthException)
{
Logger?.LogError($"You must be signed in to execute this command.");
Logger?.LogError($"Please run \"meadow cloud login\" to sign in to Meadow.Cloud.");
Logger?.LogError($"You must be signed into your Wilderness Labs account to execute this command. Run 'meadow cloud login' to do so.");
}

return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ protected async override ValueTask ExecuteCommand()
var token = await IdentityManager.GetAccessToken(CancellationToken);
if (string.IsNullOrWhiteSpace(token))
{
throw new CommandException("You must be signed into Meadow.Cloud to execute this command. Run 'meadow cloud login' to do so.");
throw new CommandException("You must be signed into your Wilderness Labs account to execute this command. Run 'meadow cloud login' to do so.");
}

try
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ protected async override ValueTask ExecuteCommand()
var token = await IdentityManager.GetAccessToken(CancellationToken);
if (string.IsNullOrWhiteSpace(token))
{
throw new CommandException("You must be signed into Meadow.Cloud to execute this command. Run 'meadow cloud login' to do so.");
throw new CommandException("You must be signed into your Wilderness Labs account to execute this command. Run 'meadow cloud login' to do so.");
}

try
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ protected override async ValueTask ExecuteCommand()
var token = await IdentityManager.GetAccessToken(CancellationToken);
if (string.IsNullOrWhiteSpace(token))
{
throw new CommandException("You must be signed into Meadow.Cloud to execute this command. Run 'meadow cloud login' to do so.");
throw new CommandException("You must be signed your Wilderness Labs account to execute this command. Run 'meadow cloud login' to do so.");
}

try
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ protected async override ValueTask ExecuteCommand()
var token = await IdentityManager.GetAccessToken(CancellationToken);
if (string.IsNullOrWhiteSpace(token))
{
throw new CommandException("You must be signed into Meadow.Cloud to execute this command. Run 'meadow cloud login' to do so.");
throw new CommandException("You must be signed your Wilderness Labs account to execute this command. Run 'meadow cloud login' to do so.");
}

try
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace Meadow.CLI.Commands.DeviceManagement;

[Command("cloud login", Description = "Log in to Meadow.Cloud")]
[Command("cloud login", Description = "Log in to your Wilderness Labs account")]
public class CloudLoginCommand : BaseCloudCommand<CloudLoginCommand>
{
[CommandOption("host", Description = $"Optionally set a host (default is {DefaultHost})", IsRequired = false)]
Expand All @@ -24,7 +24,7 @@ protected override async ValueTask ExecuteCommand()
{
Host ??= DefaultHost;

Logger?.LogInformation($"Logging into {Host}...");
Logger?.LogInformation($"Logging into you Wilderness Labs account...");

var loginResult = await IdentityManager.Login(Host, CancellationToken);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace Meadow.CLI.Commands.DeviceManagement;

[Command("cloud logout", Description = "Log out of Meadow.Cloud")]
[Command("cloud logout", Description = "Log out of your Wilderness Labs account")]
public class CloudLogoutCommand : BaseCloudCommand<CloudLogoutCommand>
{
public CloudLogoutCommand(
Expand All @@ -19,7 +19,7 @@ public CloudLogoutCommand(

protected override ValueTask ExecuteCommand()
{
Logger?.LogInformation($"Logging out of Meadow.Cloud...");
Logger?.LogInformation($"Logging out of your Wilderness Labs account...");

IdentityManager.Logout();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ protected override async ValueTask ExecuteCommand()
var token = await IdentityManager.GetAccessToken(CancellationToken);
if (string.IsNullOrWhiteSpace(token))
{
throw new CommandException("You must be signed into Meadow.Cloud to execute this command. Run 'meadow cloud login' to do so.");
throw new CommandException("You must be signed into your Wilderness Labs account to execute this command. Run 'meadow cloud login' to do so.");
}

try
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ protected override async ValueTask ExecuteCommand()
var isAuthenticated = await _meadowCloudClient.Authenticate(Host, CancellationToken);
if (!isAuthenticated)
{
Logger?.LogError($"You must be signed into Meadow.Cloud to execute this command. Run 'meadow cloud login' to do so.");
Logger?.LogError($"You must be signed into your Wilderness Labs account to execute this command. Run 'meadow cloud login' to do so.");
return;
}

Expand Down
2 changes: 1 addition & 1 deletion Source/v2/Meadow.Cli/Strings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public static class Strings
public const string MemberOfMoreThanOneOrg = "You are a member of more than 1 organization. Please specify the desired orgId for this device provisioning.";
public const string UnableToFindMatchingOrg = "Unable to find an organization with a Name or ID matching '{0}'";
public const string MustBeSignedInRunMeadowLogin = $"You must be signed in to execute this command.\n"
+ "Please run \"meadow login\" to sign in to your Wilderness Labs account.";
+ "Please run \"meadow cloud login\" to sign in to your Wilderness Labs account.";
public const string RequestingDevicePublicKey = "Requesting device public key (this will take a minute)...";
public const string CouldNotRetrievePublicKey = "Could not retrieve device's public key";
public const string DeviceReturnedInvalidPublicKey = "Device returned an invalid public key";
Expand Down
Loading