Skip to content

added more command options for --update-project #1580

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

Merged
deepchoudhery merged 1 commit into from
Jun 2, 2021
Merged

added more command options for --update-project #1580

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
120 changes: 72 additions & 48 deletions tools/dotnet-msidentity/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ namespace Microsoft.DotNet.MSIdentity.Tool
{
public static class Program
{
public static async Task<int> Main(string []args)
public static async Task<int> Main(string[] args)
{
var rootCommand = MsIdentityCommand();

//internal commands
var listAadAppsCommand = ListAADAppsCommand();
var listServicePrincipalsCommand = ListServicePrincipalsCommand();
var listTenantsCommand = ListTenantsCommand();
var addClientSecretCommand = AddClientSecretCommand();
var createClientSecretCommand = CreateClientSecretCommand();

//exposed commands
var registerApplicationCommand = RegisterApplicationCommand();
Expand All @@ -33,8 +33,7 @@ public static async Task<int> Main(string []args)
listServicePrincipalsCommand.IsHidden = true;
listTenantsCommand.IsHidden = true;
updateProjectCommand.IsHidden = true;
addClientSecretCommand.IsHidden = true;
createAppRegistration.IsHidden = true;
createClientSecretCommand.IsHidden = true;

listAadAppsCommand.Handler = CommandHandler.Create<ProvisioningToolOptions>(HandleListApps);
listServicePrincipalsCommand.Handler = CommandHandler.Create<ProvisioningToolOptions>(HandleListServicePrincipals);
Expand All @@ -44,7 +43,7 @@ public static async Task<int> Main(string []args)
createAppRegistration.Handler = CommandHandler.Create<ProvisioningToolOptions>(HandleCreateAppRegistration);
updateAppRegistrationCommand.Handler = CommandHandler.Create<ProvisioningToolOptions>(HandleUpdateApplication);
updateProjectCommand.Handler = CommandHandler.Create<ProvisioningToolOptions>(HandleUpdateProject);
addClientSecretCommand.Handler = CommandHandler.Create<ProvisioningToolOptions>(HandleClientSecrets);
createClientSecretCommand.Handler = CommandHandler.Create<ProvisioningToolOptions>(HandleClientSecrets);

//add all commands to root command.
rootCommand.AddCommand(listAadAppsCommand);
Expand All @@ -54,7 +53,7 @@ public static async Task<int> Main(string []args)
rootCommand.AddCommand(unregisterApplicationCommand);
rootCommand.AddCommand(updateAppRegistrationCommand);
rootCommand.AddCommand(updateProjectCommand);
rootCommand.AddCommand(addClientSecretCommand);
rootCommand.AddCommand(createClientSecretCommand);
rootCommand.AddCommand(createAppRegistration);

//if no args are present, show default help.
Expand Down Expand Up @@ -168,63 +167,63 @@ private static async Task<int> HandleClientSecrets(ProvisioningToolOptions provi
}
return -1;
}
private static RootCommand MsIdentityCommand()=>

private static RootCommand MsIdentityCommand() =>
new RootCommand(
description: "Creates or updates an Azure AD / Azure AD B2C application, and updates the project, using your developer credentials (from Visual Studio, Azure CLI, Azure RM PowerShell, VS Code).\n")
{
};

private static Command ListAADAppsCommand()=>
private static Command ListAADAppsCommand() =>
new Command(
name: Commands.LIST_AAD_APPS_COMMAND,
description: "Lists AAD Applications for a given tenant/username.\n")
{
TenantOption(), UsernameOption(), JsonOption()
};

private static Command ListServicePrincipalsCommand()=>
private static Command ListServicePrincipalsCommand() =>
new Command(
name: Commands.LIST_SERVICE_PRINCIPALS_COMMAND,
description: "Lists AAD Service Principals.\n")
{
TenantOption(), UsernameOption(), JsonOption()
};

private static Command ListTenantsCommand()=>
private static Command ListTenantsCommand() =>
new Command(
name: Commands.LIST_TENANTS_COMMAND,
description: "Lists AAD and AAD B2C tenants for a given user.\n")
{
UsernameOption(), JsonOption()
};

private static Command AddClientSecretCommand()=>
private static Command CreateClientSecretCommand() =>
new Command(
name: Commands.ADD_CLIENT_SECRET,
description: "Create client secret for an Azure AD or AD B2C app registration.\n")
{
TenantOption(), UsernameOption(), JsonOption(), ClientIdOption(), ProjectFilePathOption(), UpdateUserSecretsOption()
};

private static Command RegisterApplicationCommand()=>
private static Command RegisterApplicationCommand() =>
new Command(
name: Commands.REGISTER_APPLICATIION_COMMAND,
description: "Register an Azure AD or Azure AD B2C app registration in Azure and update the project." +
description: "Register an Azure AD or Azure AD B2C app registration in Azure and update the project." +
"\n\t- Updates the appsettings.json file.\n")
{
TenantOption(), UsernameOption(), JsonOption(), ClientIdOption(), ClientSecretOption(), AppIdUriOption(), ApiClientIdOption(), SusiPolicyIdOption(), ProjectFilePathOption()
};

private static Command UpdateProjectCommand()=>
private static Command UpdateProjectCommand() =>
new Command(
name: Commands.UPDATE_PROJECT_COMMAND,
description: "Update an Azure AD/AD B2C app registration in Azure and the project." +
"\n\t- Updates the appsettings.json file." +
"\n\t- Updates the Startup.cs file." +
description: "Update an Azure AD/AD B2C app registration in Azure and the project." +
"\n\t- Updates the appsettings.json file." +
"\n\t- Updates the Startup.cs file." +
"\n\t- Updates the user secrets.\n")
{
TenantOption(), UsernameOption(), JsonOption(), ClientIdOption(), CallsGraphOption(), CallsDownstreamApiOption(), UpdateUserSecretsOption(), ProjectFilePathOption(), RedirectUriOption()
TenantOption(), UsernameOption(), ClientIdOption(), JsonOption(), ProjectFilePathOption(), ConfigUpdateOption(), CodeUpdateOption(), PackagesUpdateOption(), CallsGraphOption(), CallsDownstreamApiOption(), UpdateUserSecretsOption(), RedirectUriOption(),
};

private static Command UpdateAppRegistrationCommand() =>
Expand Down Expand Up @@ -253,9 +252,9 @@ private static Command UnregisterApplicationCommand() =>
TenantOption(), UsernameOption(), JsonOption(), AppIdUriOption(), ProjectFilePathOption(), ClientIdOption()
};

private static Option JsonOption()=>
private static Option JsonOption() =>
new Option<bool>(
aliases: new [] {"-j", "--json"},
aliases: new[] { "-j", "--json" },
description: "Format output in JSON instead of text.\n")
{
IsRequired = false
Expand All @@ -277,34 +276,59 @@ private static Option EnableAccessToken() =>
IsRequired = false
};

private static Option CallsGraphOption()=>
private static Option CallsGraphOption() =>
new Option<bool>(
aliases: new [] {"--calls-graph"},
aliases: new[] { "--calls-graph" },
description: "App registration calls microsoft graph.\n")
{
IsRequired = false
};

private static Option CallsDownstreamApiOption()=>
private static Option CallsDownstreamApiOption() =>
new Option<bool>(
aliases: new [] {"--calls-downstream-api"},
aliases: new[] { "--calls-downstream-api" },
description: "App registration calls downstream api.\n")
{
IsRequired = false
};

private static Option UpdateUserSecretsOption()=>
private static Option UpdateUserSecretsOption() =>
new Option<bool>(
aliases: new [] {"--update-user-secrets"},
description: "Add secrets to user secrets.json file." +
aliases: new[] { "--update-user-secrets" },
description: "Add secrets to user secrets.json file." +
"\n\t- Using dotnet-user-secrets to init and set user secrets.\n")
{
IsRequired = false
};

private static Option ClientIdOption()=>
private static Option ConfigUpdateOption() =>
new Option<bool>(
aliases: new[] { "--config-update" },
description: "Allow config changes for dotnet app to work with Azure AD/AD B2C app.")
{
IsRequired = false
};


private static Option CodeUpdateOption() =>
new Option<bool>(
aliases: new[] { "--code-update" },
description: "Allow Startup.cs and other code changes for dotnet app to work with Azure AD/AD B2C app (setup authentication).")
{
IsRequired = false
};

private static Option PackagesUpdateOption() =>
new Option<bool>(
aliases: new[] { "--packages-update" },
description: "Allow package updates for dotnet app to work with Azure AD/AD B2C app (setup authentication).")
{
IsRequired = false
};

private static Option ClientIdOption() =>
new Option<string>(
aliases: new [] {"--client-id"},
aliases: new[] { "--client-id" },
description: "Client ID of an existing app registration to use." +
"\n\tConfigure project to use an existing Azure app registration instead of creating a new one. The app registration will be updated if needed." +
"\n\t- When using this option, you may also need to pass in the client secret with --client-secret.\n")
Expand All @@ -329,9 +353,9 @@ private static Option ProjectType() =>
IsRequired = false
};

private static Option ClientSecretOption()=>
private static Option ClientSecretOption() =>
new Option<string>(
aliases: new [] {"--client-secret"},
aliases: new[] { "--client-secret" },
description: "Value for the client secret, which also can be referred to as application password.\n")
{
IsRequired = false
Expand All @@ -345,53 +369,53 @@ private static Option RedirectUriOption() =>
IsRequired = false
};

private static Option ProjectFilePathOption()=>
private static Option ProjectFilePathOption() =>
new Option<string>(
aliases: new [] {"-p", "--project-file-path"},
aliases: new[] { "-p", "--project-file-path" },
description: "Path to the project file (.csproj file) to be used. If not provided, the project file in the current working directory will be used.\n")
{
IsRequired = false
};
private static Option AppIdUriOption()=>

private static Option AppIdUriOption() =>
new Option<string>(
aliases: new [] {"--app-id-uri"},
aliases: new[] { "--app-id-uri" },
description: "The App ID Uri for the Blazor WebAssembly hosted API. This parameter will only be used for Blazor WebAssembly hosted applications.\n")
{
IsRequired = false
};

private static Option ApiClientIdOption()=>
private static Option ApiClientIdOption() =>
new Option<string>(
aliases: new [] {"--api-client-id"},
aliases: new[] { "--api-client-id" },
description: "Client ID of the Blazor WebAssembly hosted web API." +
"\nThis parameter is only used for Blazor WebAssembly hosted applications, where you only want to configure the project.\n")
{
IsRequired = false
};
private static Option SusiPolicyIdOption()=>
private static Option SusiPolicyIdOption() =>
new Option<string>(
aliases: new [] {"--susi-policy-id"},
aliases: new[] { "--susi-policy-id" },
description: "Sign-up/Sign-in policy required for configurating a B2C application from code that was created for Azure AD.\n")
{
IsRequired = false
};
private static Option TenantOption()=>
private static Option TenantOption() =>
new Option<string>(
aliases: new[] {"-t", "--tenant-id"},
aliases: new[] { "-t", "--tenant-id" },
description: "Azure AD or Azure AD B2C tenant in which to create or update the app registration.\n - If specified, the app registration will be created in given tenant.\n - If not provided, the app registration will be created in yuor home tenant.\n")
{
IsRequired = false
};

private static Option UsernameOption()=>
private static Option UsernameOption() =>
new Option<string>(
aliases: new[] {"-u", "--username"},
description:"Username to use to connect to the Azure AD or Azure AD B2C tenant." +
"\n- It's only needed if you are signed-in to Visual Studio, or Azure CLI with several identities." +
aliases: new[] { "-u", "--username" },
description: "Username to use to connect to the Azure AD or Azure AD B2C tenant." +
"\n- It's only needed if you are signed-in to Visual Studio, or Azure CLI with several identities." +
"\n- In that case, the username parameter is used to determine which identity to use to create the app registration in the tenant.\n")
{
IsRequired = false
IsRequired = false
};
}
}