Skip to content

Commit 4b7225b

Browse files
authored
Merge pull request #1355 from WilliamDAssafMSFT/patch-3
Fix images
2 parents 24bc385 + ce81d53 commit 4b7225b

8 files changed

Lines changed: 39 additions & 45 deletions

File tree

Binary file not shown.
Binary file not shown.
Binary file not shown.
Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
## Run this sample
2-
Note: Run this project on a machine joined to a domain that is federated with Azure Active Directory. A contained database user representing your Azure AD principal, or one of the groups, you belong to, must exist in the database and must have the CONNECT permission.
2+
Note: Run this project on a machine joined to a domain that is federated with Microsoft Entra. A contained database user representing your Microsoft Entra ID principal, or one of the groups, you belong to, must exist in the database and must have the CONNECT permission.
33

44
1. Before building and running the Integrated project:
55

66
+ In Program.cs, locate the following lines of code and replace the server/database name with your server/database name.
77
```
8-
builder["Data Source"] = "aad-managed-demo.database.windows.net "; // replace 'aad-managed-demo' with your server name
8+
builder["Data Source"] = "<server name>.database.windows.net "; // replace '<server name>' with your server name
99
builder["Initial Catalog"] = "demo"; // replace with your database name
1010
```
1111

12-
2. The builder["Authentication"] method must be set to SqlAuthenticationMethod.ActiveDirectoryIntegrated;
13-
![screenshot of visual studio showing builder fields to change] (/samples/features/security/azure-active-directory-auth/img/vs-authentication-method-integrated.png)
12+
2. The `builder["Authentication"]` method must be set to `SqlAuthenticationMethod.ActiveDirectoryIntegrated`;
1413

15-
3. Running this project on a machine joined to a domain that is federated with Azure Active Directory will automatically use your Windows credentials and no password is required. The execution window will indicate a successful connection to the database followed by “Please press any key to stop”:
16-
![screenshot of application after successful authentication- "press any key to stop"] (/samples/features/security/azure-active-directory-auth/img/integrated-press-any-key-to-stop.png)
14+
![screenshot of visual studio showing builder fields to change](../img/vs-authentication-method-integrated.png)
15+
16+
3. Running this project on a machine joined to a domain that is federated with Microsoft Entra will automatically use your Windows credentials and no password is required. The execution window will indicate a successful connection to the database followed by “Please press any key to stop”:
17+
![screenshot of application after successful authentication- "press any key to stop"](../img/integrated-press-any-key-to-stop.png)

samples/features/security/azure-active-directory-auth/password/README.md

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,17 @@
33
**Before building and running the Password project**:
44
1. In Program.cs, locate the following lines of code and replace the server/database name with your server/database name.
55
```
6-
builder["Data Source"] = "aad-managed-demo.database.windows.net "; // replace 'aad-managed-demo' with your server name
6+
builder["Data Source"] = "<servername>.database.windows.net "; // replace '<servername>' with your server name
77
builder["Initial Catalog"] = "demo"; // replace with your database name
88
```
9-
2. Locate the following line of code and replace username, with the name of the Azure AD user you want to connect as.
9+
2. Locate the following line of code and replace username, with the name of the Microsoft Entra ID user you want to connect as.
1010
```
11-
string username = "bob@cqclinic.onmicrosoft.com"; // replace with your username
11+
string username = "bob@contoso.com"; // replace with your username
1212
```
13-
Note: A contained user database must exist and a contained database user representing the specified Azure AD user or one of the groups, the specified Azure AD user belongs to, must exist in the database and must have the CONNECT permission (except for AAD server admin or group)
13+
Note: A contained user database must exist and a contained database user representing the specified Microsoft Entra ID user or one of the groups, the specified Microsoft Entra ID user belongs to, must exist in the database and must have the CONNECT permission (except for AAD server admin or group)
1414

15-
Please note that
16-
builder["Authentication"] method is set to SqlAuthenticationMethod.ActiveDirectoryPassword.
15+
Please note that the `builder["Authentication"]` method is set to `SqlAuthenticationMethod.ActiveDirectoryPassword`.
1716

18-
![screenshot of visual studio showing builder fields to change] (/samples/features/security/azure-active-directory-auth/img/vs-authentication-method-password.png)
17+
When running this program an execution window a prompt for the Microsoft Entra ID password request for user bob@cqclinic.onmicrosoft.com will appear. Once the password is entered the message should indicate a successful connection to the database followed by “Please press any key to stop”:
1918

20-
When running this program an execution window a prompt for the Azure AD password request for user bob@cqclinic.onmicrosoft.com will appear. Once the password is entered the message should indicate a successful connection to the database followed by “Please press any key to stop”:
21-
22-
![screenshot of application after successful authentication- "press any key to stop"] (/samples/features/security/azure-active-directory-auth/img/pwd-press-any-key-to-stop.png)
19+
![screenshot of application after successful authentication- "press any key to stop"](../img/pwd-press-any-key-to-stop.png)

samples/features/security/azure-active-directory-auth/readme.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,15 @@ To run this sample, you need the following prerequisites:
3535
+ ADALSQL.DLL enables applications to authenticate to Microsoft Azure SQL Database using Azure Active Directory. The ADALSQL.DLL is not installed with Visual Studio so download the DLL at http://www.microsoft.com/en-us/download/details.aspx?id=48742
3636
+ ADALSQL.DLL is automatically downloaded with Visual Studio 2015 Update 2, SQL Server Management Studio, and the newest version of SQL Server Data tools
3737

38-
1. Create Azure Active Directory (AD), or federate your domain with existing Azure AD
39-
This allows either to use managed or federated accounts associated with a specific Azure AD
40-
2. Create Azure AD administrator for Azure SQL DB using Azure portal, PowerShell command or Rest API
41-
3. With help from T-SQL query interface (i.e. SSMS query editor), using Azure AD admin credentials for SQL DB & SQL DW, create an Azure AD user in a designated database. The database user represents your Azure AD principal (or one of the groups you belong to) and must exist in the database having CONNECT permission prior to executing a connection attempt
38+
1. Create Microsoft Entra tenant (formerly known as Azure Active Directory), or federate your domain with existing Microsoft Entra ID. This allows either to use managed or federated accounts associated with a specific Microsoft Entra ID.
39+
2. Create Microsoft Entra ID administrator for Azure SQL Database using the Azure portal, PowerShell command, or Rest API.
40+
3. With help from T-SQL query interface (i.e. SSMS query editor), using Microsoft Entra ID admin credentials for Azure SQL Database and dedicated SQL pools in Azure Synapse, create an Microsoft Entra ID user in a designated database. The database user represents your Microsoft Entra ID principal (or one of the groups you belong to) and must exist in the database having CONNECT permission prior to executing a connection attempt.
4241

4342

4443
**Other Prerequisites**
4544

46-
1. For Azure AD integrated authentication a computer joined to a domain that is federated with Azure Active Directory is required
47-
2. An existing database created before a connection attempt is required. The database can be created using credentials for SQL administrator, or Azure AD SQL administrator
45+
1. For Microsoft Entra ID integrated authentication a computer joined to a domain that is federated with Azure Active Directory is required.
46+
2. An existing database created before a connection attempt is required. The database can be created using credentials for SQL administrator, or Microsoft Entra SQL administrator.
4847

4948
<a name=run-this-sample></a>
5049

@@ -62,7 +61,7 @@ To run this sample, you need the following prerequisites:
6261

6362
## Sample details
6463

65-
This demo provides a simple tool for exploring Azure Active Directory authentication to Azure SQL DB or Azure SQL DW.
64+
This demo provides a simple tool for exploring Azure Active Directory authentication to Azure SQL Database and dedicated SQL pools in Azure Synapse.
6665

6766
Azure Active Directory authentication with Azure SQL Database V12 supports the following authentication methods:
6867
- User/password authentication

samples/features/security/azure-active-directory-auth/token/README.md

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,38 @@
88

99
## About this sample
1010

11-
The Token project contains a simple console application that connects to Azure SQL database using a self-signed certificate.
11+
The Token project contains a simple console application that connects to Azure SQL Database using a self-signed certificate.
1212

1313
**Software prerequisites:**
1414

1515
1. The `makecert.exe` utility, which is included in the Windows SDK
1616
+ It is sometimes included in Visual Studio installations (depending on the selections made during installation). A search of your machine for `makecert.exe` would provide verification that the Windows SDK was installed.
17-
+ If the Windows SDK was not installed, you may [download it here](http://msdn.microsoft.com/en-US/windows/desktop/aa904949)
17+
+ If the Windows SDK was not installed, you may [download it here](https://learn.microsoft.com/windows/apps/windows-app-sdk/downloads)
1818
+ You can learn more about the `makecert.exe` [utility here](https://msdn.microsoft.com/library/windows/desktop/aa386968.aspx)
1919
2. PowerShell with Azure Active Directory Module
20-
+ To download the latest PowerShell version [see this page](https://azure.microsoft.com/en-us/documentation/articles/powershell-install-configure/#Install)
21-
+ [Install the Azure AD PowerShell Module](https://msdn.microsoft.com/en-us/library/azure/jj151815.aspx), if it is not already installed in your client machine.
20+
+ To download the latest PowerShell version [see this page](https://learn.microsoft.com/powershell/azure/install-azure-powershell)
21+
+ [Install the Microsoft Entra ID PowerShell Module](https://learn.microsoft.com/powershell/entra-powershell/installation), if it is not already installed in your client machine.
2222

2323
<a name=run-this-sample></a>
2424
## Run this sample
2525

26-
1. Create an application account in Azure AD for your service.
26+
1. Create an application account in Microsoft Entra ID for your service.
2727
- Sign in to the Azure management portal.
2828
- Click on Azure Active Directory in the left hand navigation
2929
- Click the directory tenant where you wish to register the sample application. This must be the same directory that is associated with your database (the server hosting your database).
3030
- Click the Applications tab
3131
- In the drawer, click Add.
3232
- Click "Add an application my organization is developing".
3333
- Enter mytokentest as a friendly name for the application, select "Web Application and/or Web API", and click next.
34-
- Assuming this application is a daemon/service and not a web application, it doesn't have a sign-in URL or app ID URI. For these two fields, enter http://mytokentest
35-
- While still in the Azure portal, click the Configure tab of your application.
36-
- Find the Client ID value and copy it into a text editor, you will need this later when configuring your application ( i.e. a4bbfe26-dbaa-4fec-8ef5-223d229f647d /see the snapshot below/)
37-
![active directory portal Client ID image](/samples/features/security/azure-active-directory-auth/img/azure-active-directory-application-portal.png)
34+
- Assuming this application is a daemon/service and not a web application, it doesn't have a sign-in URL or app ID URI. For these two fields, enter `http://mytokentest`
35+
- While still in the Azure portal, select Configure in your application.
36+
- Find the Client ID value and copy it into a text editor, you will need this later when configuring your application
3837

39-
2. Logon to your Azure SQL Server’s user database as an Azure AD admin and using a T-SQL command provision a contained database user for your application principal:
38+
2. Logon to your Azure SQL Server’s user database as an Microsoft Entra ID admin and using a T-SQL command provision a contained database user for your application principal:
4039
```sql
4140
CREATE USER [mytokentest] FROM EXTERNAL PROVIDER
4241
```
43-
- [See this link](https://azure.microsoft.com/en-us/documentation/articles/sql-database-aad-authentication/) for more details on how to create an Azure Ad admin and a contained database user.
42+
- [See this link](https://azure.microsoft.com/documentation/articles/sql-database-aad-authentication/) for more details on how to create an Microsoft Entra ID admin and a contained database user.
4443

4544
3. On the machine you are going to run the project on, generate and install a self-signed certificate.
4645
- To complete this step, you will need to use `Makecert.exe`
@@ -53,10 +52,10 @@ The Token project contains a simple console application that connects to Azure S
5352
```
5453
c:/"Program Files (x86)/Windows Kits/8.1/bin/x64"/makecert -r -pe -n "CN=mytokentestCert" -ss My -len 2048 mytokentestCert.cer
5554
```
56-
4. Add the certificate as a key for the application you created in Azure AD.
57-
- Click the Microsoft Azure Active Directory Module for Windows PowerShell shortcut on desktop to open a Windows PowerShell workspace that has the Azure AD cmdlets.
55+
4. Add the certificate as a key for the application you created in Microsoft Entra ID.
56+
- Click the Microsoft Azure Active Directory Module for Windows PowerShell shortcut on desktop to open a Windows PowerShell workspace that has the Microsoft Entra ID cmdlets.
5857
- Copy the following code snippet to a text editor.
59-
- `connect-msolservice` will ask for you Azure AD credentials. Please be sure to use credentials that are part of Azure AD global admin to connect and to proceed with the scripts below.
58+
- `connect-msolservice` will ask for you Microsoft Entra ID credentials. Please be sure to use credentials that are part of Microsoft Entra ID global admin to connect and to proceed with the scripts below.
6059
```
6160
connect-msolservice
6261

@@ -74,23 +73,21 @@ The Token project contains a simple console application that connects to Azure S
7473

7574
5. Configure the certificate and your application account in the *app.config* file in the project.
7675
+ In Visual Studio, open *app.config* in the Solution Explorer
77-
![App.config file highlights](/samples/features/security/azure-active-directory-auth/img/app-config-key-value-example.png)
7876
- Find the app key `ida:Tenant` and replace the value with your AAD tenant name (your AAD domain)
7977
- Find the app key `ida:ClientID` and replace the value with the Client ID for the application registration from the Azure Portal (the value from step 1).
8078
- Find the app key `ida:Cert_Name` and replace the value with the subject name (CN) of the self-signed certificate you created
8179
- For example:
8280
```csharp
83-
<add key="ida:Tenant" value="cqclinic.onmicrosoft.com" /> //this is the AAD domain
84-
<add key="ida:ClientId" value="a4bbfe26-dbaa-4fec-8ef5-223d229f647d"/> //this is the Client ID
81+
<add key="ida:Tenant" value="<tenant name>" /> //this is the domain
82+
<add key="ida:ClientId" value="<client id>"/> //this is the Client ID
8583
<add key="ida:CertName" value="CN=mytokentestCert"/> //this is the Cert_name use by makecert.exe
8684
```
8785
+ In Visual Studio, open *Program.cs* in the Solution Explorer
88-
![Program.cs field highlights](/samples/features/security/azure-active-directory-auth/img/program-cs-builder-highlight.png)
86+
![Program.cs field highlights](../img/program-cs-builder-highlight.png)
8987
- Make the following changes:
9088
```csharp
91-
builder["Data Source"] = "aad-managed-demo.database.windows.net"; // replace with your server name
89+
builder["Data Source"] = "<server name>.database.windows.net"; // replace <server name> with your server name
9290
builder["Initial Catalog"] = "demo"; // replace with your database name
9391
```
94-
6. Run the demo. (Click *Run* or press *F5*)
95-
+ A successful authorization should result in a message that states "Connected to the database" similar to the following:
96-
![succesful auth](/samples/features/security/azure-active-directory-auth/img/token-press-any-key-to-stop.png)
92+
6. Run the demo. (Select *Run* or press *F5*)
93+
+ A successful authorization should result in a message that includes "The access token obtained" and states "Connected to the database" and "Please press any key to stop".

0 commit comments

Comments
 (0)