Skip to content

Commit

Permalink
Merge pull request #129 from Azure-Samples/dayodeji/second-rebrand
Browse files Browse the repository at this point in the history
second Entra Rebrand attempt
  • Loading branch information
bgavrilMS authored May 30, 2024
2 parents b78060a + 7879207 commit 73e7122
Show file tree
Hide file tree
Showing 21 changed files with 243 additions and 243 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<!-- mark with an `x` -->

```console
- [ ] 1-1) Sign-in with Azure AD
- [ ] 1-2) Sign-in with Azure AD B2C
- [ ] 1-1) Sign-in with Microsoft Entra ID
- [ ] 1-2) Sign-in with Azure Active Directory B2C
- [ ] 2-1) Acquire a Token and call Microsoft Graph
- [ ] 3) Deploy to Azure Storage and App Service
- [ ] 4-1) Use App Roles for Role-based Access Control
Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ ex: verify that the following are valid:
* ...

## Other Information
<!-- Add any other helpful information that may be needed here. -->
<!-- Add any other helpful information that may be needed here. -->
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

### Quick summary

1. Run the script to create your Azure AD application and configure the code of the sample application accordingly.
1. Run the script to create your Microsoft Entra application and configure the code of the sample application accordingly.

```PowerShell
cd .\AppCreationScripts\
Expand All @@ -28,25 +28,25 @@

### Presentation of the scripts

This sample comes with two PowerShell scripts, which automate the creation of the Azure Active Directory applications, and the configuration of the code for this sample. Once you run them, you will only need to build the solution and you are good to test.
This sample comes with two PowerShell scripts, which automate the creation of the Microsoft Entra applications, and the configuration of the code for this sample. Once you run them, you will only need to build the solution and you are good to test.

These scripts are:

- `Configure.ps1` which:
- creates Azure AD applications and their related objects (permissions, dependencies, secrets, app roles),
- creates Microsoft Entra applications and their related objects (permissions, dependencies, secrets, app roles),
- changes the configuration files in the sample projects.
- creates a summary file named `createdApps.html` in the folder from which you ran the script, and containing, for each Azure AD application it created:
- creates a summary file named `createdApps.html` in the folder from which you ran the script, and containing, for each Microsoft Entra application it created:
- the identifier of the application
- the AppId of the application
- the url of its registration in the [Azure portal](https://portal.azure.com).
- the url of its registration in the [Microsoft Entra admin center](https://entra.microsoft.com).

- `Cleanup.ps1` which cleans-up the Azure AD objects created by `Configure.ps1`. Note that this script does not revert the changes done in the configuration files, though. You will need to undo the change from source control (from Visual Studio, or from the command line using, for instance, `git reset`).
- `Cleanup.ps1` which cleans-up the Microsoft Entra objects created by `Configure.ps1`. Note that this script does not revert the changes done in the configuration files, though. You will need to undo the change from source control (from Visual Studio, or from the command line using, for instance, `git reset`).

> :information_source: If the sample supports using certificates instead of client secrets, this folder will contain an additional set of scripts: `Configure-WithCertificates.ps1` and `Cleanup-WithCertificates.ps1`. You can use them in the same way to register app(s) that use certificates instead of client secrets.
### Usage pattern for tests and DevOps scenarios

The `Configure.ps1` will stop if it tries to create an Azure AD application which already exists in the tenant. For this, if you are using the script to try/test the sample, or in DevOps scenarios, you might want to run `Cleanup.ps1` just before `Configure.ps1`. This is what is shown in the steps below.
The `Configure.ps1` will stop if it tries to create a Microsoft Entra application which already exists in the tenant. For this, if you are using the script to try/test the sample, or in DevOps scenarios, you might want to run `Cleanup.ps1` just before `Configure.ps1`. This is what is shown in the steps below.

## How to use the app creation scripts?

Expand Down Expand Up @@ -108,8 +108,8 @@ Note that the script will choose the tenant in which to create the applications,
if you want to create the apps in a particular tenant, you can use the following option:
- Open the [Azure portal](https://portal.azure.com)
- Select the Azure Active directory you are interested in (in the combo-box below your name on the top right of the browser window)
- Open the [Microsoft Entra admin center](https://entra.microsoft.com)
- Select the Microsoft Entra ID you are interested in (in the combo-box below your name on the top right of the browser window)
- Find the "Active Directory" object in this tenant
- Go to **Properties** and copy the content of the **Directory Id** property
- Then use the full syntax to run the scripts:
Expand Down
18 changes: 9 additions & 9 deletions 1-Authentication/1-sign-in/README-use-certificate.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Alternatively, download and build **OpenSSL** for your **OS** following the guid
- **Step 1: [Create a self-signed certificate](#create-a-self-signed-certificate)**
- Option 1: [create self-signed certificate on local machine](#create-self-signed-certificate-on-local-machine)
- Option 2: [create self-signed certificate on Key Vault](#create-self-signed-certificate-on-key-vault)
- **Step 2: [Configure an Azure AD app registration to use a certificate](#configure-an-azure-ad-app-registration-to-use-a-certificate)**
- **Step 2: [Configure a Microsoft Entra app registration to use a certificate](#configure-an-azure-ad-app-registration-to-use-a-certificate)**
- **Step 3: [Configure your app(s) to use a certificate](#configure-your-apps-to-use-a-certificate)**
- Option 1: [using an existing certificate from local machine](#using-an-existing-certificate-from-local-machine)
- Option 2: [using an existing certificate from Key Vault](#using-an-existing-certificate-from-key-vault)
Expand Down Expand Up @@ -96,9 +96,9 @@ You can use Azure Key Vault to generate a self-signed certificate for you. Doing
> ```
<details>
<summary>Click here to use Azure Portal</summary>
<summary>Click here to use Microsoft Entra admin center</summary>
Follow the guide: [Set and retrieve a certificate from Azure Key Vault using the Azure portal](https://learn.microsoft.com/azure/key-vault/certificates/quick-create-portal)
Follow the guide: [Set and retrieve a certificate from Azure Key Vault using the Microsoft Entra admin center](https://learn.microsoft.com/azure/key-vault/certificates/quick-create-portal)
Afterwards, proceed to [Step 2](#configure-an-azure-ad-app-registration-to-use-a-certificate).
Expand All @@ -113,13 +113,13 @@ Afterwards, proceed to [Step 2](#configure-an-azure-ad-app-registration-to-use-a
</details>
### Configure an Azure AD app registration to use a certificate
### Configure a Microsoft Entra app registration to use a certificate
Now you must associate your Azure AD app registration with the certificate you will use in your application.
Now you must associate your Microsoft Entra app registration with the certificate you will use in your application.
> :information_source: If you have the certificate locally available, you can follow the steps below. If your certificate(s) is on Azure Key Vault, you must first export and download them to your computer, and delete the local copy after following the steps below. See: [Export certificates from Azure Key Vault](https://learn.microsoft.com/azure/key-vault/certificates/how-to-export-certificate)
1. Navigate to [Azure portal](https://portal.azure.com) and select your Azure AD app registration.
1. Navigate to [Microsoft Entra admin center](https://entra.microsoft.com) and select your Microsoft Entra app registration.
1. Select **Certificates & secrets** blade on the left.
1. Click on **Upload** certificate and select the certificate file to upload (e.g. *msal-node-webapp*).
1. Click **Add**. Once the certificate is uploaded, the *thumbprint*, *start date*, and *expiration* values are displayed. Record the *thumbprint* value as you will make use of it later in your app's configuration file.
Expand Down Expand Up @@ -255,7 +255,7 @@ Once you deploy your app(s) to Azure App Service, you can assign a managed ident

### Create a system-assigned identity

1. Navigate to [Azure portal](https://portal.azure.com) and select the **Azure App Service**.
1. Navigate to [Microsoft Entra admin center](https://entra.microsoft.com) and select the **Azure App Service**.
1. Find and select the App Service instance you've created previously.
1. On App Service portal, select **Identity**.
1. Within the **System assigned** tab, switch **Status** to **On**. Click **Save**.
Expand All @@ -266,7 +266,7 @@ For more information, see [Add a system-assigned identity](https://docs.microsof

Now that your app deployed to App Service has a managed identity, in this step you grant it access to your key vault.

1. Go to the [Azure portal](https://portal.azure.com) and search for your Key Vault.
1. Go to the [Microsoft Entra admin center](https://entra.microsoft.com) and search for your Key Vault.
1. Select **Overview** > **Access policies** blade on the left.
1. Click on **Add Access Policy** > **Certificate permissions** > **Get**
1. Click on **Add Access Policy** > **Secret permissions** > **Get**
Expand All @@ -281,7 +281,7 @@ Finally, you need to add environment variables to the App Service where you depl

> :warning: Make sure your application is able to read environment variables. Alternatively, you can hardcode the key vault URL and certificate name in your applications configuration file.
1. In the [Azure portal](https://portal.azure.com), search for and select **App Service**, and then select your app.
1. In the [Microsoft Entra admin center](https://entra.microsoft.com), search for and select **App Service**, and then select your app.
1. Select **Configuration** blade on the left, then select **New Application Settings**.
1. Add the following variables (key-value pairs):
1. **KEY_VAULT_URL**: the URL of the key vault you've created, e.g. `https://example.vault.azure.net`
Expand Down
Loading

0 comments on commit 73e7122

Please sign in to comment.