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

Rename Azure AD #188

Merged
merged 3 commits into from
Nov 23, 2023
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
16 changes: 8 additions & 8 deletions azure-spring-apps-enterprise/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ The following diagram shows the architecture of the ACME Fitness Store that will
This application is composed of several services:

* 4 Java Spring Boot applications:
* A catalog service for fetching available products. This application will use Azure AD authentication to connect to PostgreSQL
* A catalog service for fetching available products. This application will use Microsoft Entra ID (formerly Azure Active Directory) authentication to connect to PostgreSQL
* A payment service for processing and approving payments for users' orders
* An identity service for referencing the authenticated user
* An assist service for infusing AI into fitness store
Expand Down Expand Up @@ -561,9 +561,9 @@ Prerequisites:
> This Unit is optional. The application will continue to function without completing this unit. Certain features will remain unavailable including: log in, adding items to the cart, or completing an order.
> Continue on to [Unit 3 - Integrate with Azure Database for PostgreSQL and Azure Cache For Redis](#unit-3---integrate-with-azure-database-for-postgresql-and-azure-cache-for-redis) to continue this guide without configuring SSO.

### Register Application with Azure AD
### Register Application with Microsoft Entra ID

The following section steps through creating a Single Sign On Provider using Azure AD.
The following section steps through creating a Single Sign On Provider using Microsoft Entra ID.
To use an existing provider, skip ahead to [Using an Existing Identity Provider](#using-an-existing-sso-identity-provider)

Choose a unique display name for your Application Registration.
Expand All @@ -572,7 +572,7 @@ Choose a unique display name for your Application Registration.
export AD_DISPLAY_NAME=change-me # unique application display name
```

#### Create an Application registration with Azure AD and save the output.
#### Create an Application registration with Microsoft Entra ID and save the output.

```shell
az ad app create --display-name ${AD_DISPLAY_NAME} > ../resources/json/ad.json
Expand Down Expand Up @@ -620,7 +620,7 @@ echo ${PORTAL_URL}
The `ISSUER_URI` should take the form `https://login.microsoftonline.com/${TENANT_ID}/v2.0`
The `JWK_SET_URI` should take the form `https://login.microsoftonline.com/${TENANT_ID}/discovery/v2.0/keys`

#### Add the necessary web redirect URIs to the Azure AD Application Registration:
#### Add the necessary web redirect URIs to App Registration in Microsoft Entra ID:

```shell
az ad app update --id ${APPLICATION_ID} \
Expand All @@ -632,7 +632,7 @@ Detailed information about redirect URIs can be found [here](https://docs.micros
### Using an Existing SSO Identity Provider

> Note: Continue on to [Configure Spring Cloud Gateway with SSO](#configure-spring-cloud-gateway-with-sso) if you
> just created an Azure AD Application Registration
> just created an app registration in Microsoft Entra ID

To use an existing SSO Identity Provider, copy the existing template

Expand Down Expand Up @@ -970,7 +970,7 @@ az spring connection create postgres-flexible \
--client-type dotnet
```

Catalog service uses Azure AD authentication to connect to Postgres, so it is not required to include the password
Catalog service uses Microsoft Entra authentication to connect to Postgres, so it is not required to include the password

#### Bind catalog service to Postgres

Expand Down Expand Up @@ -1571,7 +1571,7 @@ To navigate to the Threads page, select the Threads option from the Information

To get started with deploying this sample app from GitHub Actions, please:

1. Complete an Azure AD App registration outlined [here](#register-application-with-azure-ad) or have SSO Credentials prepared as described [here](#using-an-existing-sso-identity-provider)
1. Complete an App registration in Microsoft Entra ID outlined [here](#register-application-with-microsoft-entra-id) or have SSO Credentials prepared as described [here](#using-an-existing-sso-identity-provider)
2. Fork this repository and turn on GitHub Actions in your fork

### Create a Storage Account
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ In this Unit, you will configure Single Sign-On for Spring Cloud Gateway using A
Once this section is complete, the architecture looks as below:
![architecture](images/scg-sso-services.png)

## 1. Register Application with Azure AD
## 1. Register Application with Microsoft Entra ID

Choose a unique display name for your Application Registration.

```shell
export AD_DISPLAY_NAME=acme-ad-YOUR-UNIQUE_USERNAME # unique application display name
```

Create an Application registration with Azure AD and save the output.
Create an Application registration with Microsoft Entra ID and save the output.

```shell
az ad app create --display-name ${AD_DISPLAY_NAME} > ad.json
Expand All @@ -25,7 +25,7 @@ export APPLICATION_ID=$(cat ad.json | jq -r '.appId')
az ad app credential reset --id ${APPLICATION_ID} --append > sso.json
```

Add the necessary web redirect URIs to the Azure AD Application Registration:
Add the necessary web redirect URIs to App Registration in Microsoft Entra ID :

```shell
az ad app update --id ${APPLICATION_ID} \
Expand Down