Skip to content

Commit b65d8f5

Browse files
committed
updated per feedback from team
1 parent f0fbc89 commit b65d8f5

3 files changed

Lines changed: 48 additions & 34 deletions

File tree

msal-dotnet-articles/TOC.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@
2626
- name: Acquiring tokens interactively
2727
href: acquiring-tokens/desktop-mobile/acquiring-tokens-interactively.md
2828
- name: Using MSAL.NET with Web Account Manager (WAM)
29-
href: acquiring-tokens/desktop-mobile/wam.
29+
href: ./acquiring-tokens/desktop-mobile/wam.
30+
- name: Using MSAL.Net with broker on Linux distributions
31+
href: ./acquiring-tokens/desktop-mobile/linux-dotnet-sdk.md
32+
- name: Using MSAL.Net with WSL
33+
href: ./acquiring-tokens/desktop-mobile/linux-dotnet-sdk-wsl.md
3034
- name: Xamarin
3135
href: acquiring-tokens/desktop-mobile/mobile-applications.md
3236
- name: Sign-in users with social identities

msal-dotnet-articles/acquiring-tokens/desktop-mobile/linux-dotnet-sdk-wsl.md

Lines changed: 37 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,48 @@ export DOTNET_ROOT=~/.dotnet
5555
export PATH=$PATH:$DOTNET_ROOT:$DOTNET_ROOT/tools
5656
```
5757

58+
### Package Dependencies
59+
60+
Install the following dependencies on your Linux platform:
61+
62+
- `libsecret-tools` is required to interface with the Linux keychain
63+
- `libx11-dev` package, where the `libx11` library is used to get the console window handle on Linux.
64+
65+
### [Ubuntu](#tab/ubuntudep)
66+
67+
To install on debian/Ubuntu based Linux distribution:
68+
69+
```bash
70+
sudo apt install libx11-6 libc++1 libc++abi1 libsecret-1-0 libwebkit2gtk-4.0-37 -y
71+
72+
#from Powershell, run
73+
wsl.exe --shutdown
74+
```
75+
76+
### [Red Hat Enterprise Linux](#tab/rheldep)
77+
78+
To install on Red Hat/Fedora based Linux distribution:
79+
80+
```bash
81+
sudo dnf install libx11-6 libc++1 libc++abi1 libsecret-1-0 libwebkit2gtk-4.0-37 -y
82+
83+
#from Powershell, run
84+
wsl.exe --shutdown
85+
```
86+
87+
---
88+
89+
> [!IMPORTANT]
90+
> In order for the keychain to work as intended, you should make sure you 1. install the dependencies, 2. Reboot/restart wsl, 3. Configure the keychain. Failure to do the steps in the correct order will result with the keychain missing the option for "Password Keychain".
91+
92+
5893
### Set up Keyring in WSL
5994

6095
MSAL uses `libsecret` on Linux. It's required to communicate with the `keyring` daemon. Users can use [Seahorse](https://wiki.gnome.org/Apps/Seahorse/) (a GNOME application for managing encryption keys and passwords) to manage the `keyring` contents through a Graphical User Interface (GUI).
6196

6297
On Debian-based distributions, you can install the package by running `sudo apt install seahorse` and then following these instructions:
6398

64-
1. Run `seahorse` in the terminal.
99+
1. Run `seahorse` in the terminal as a regular user (not as sudo)
65100

66101
![default keychain dialog](../../media/wam/wsl1.png)
67102

@@ -80,36 +115,12 @@ On Debian-based distributions, you can install the package by running `sudo apt
80115

81116
6. Start a new WSL session and run the sample. You should be asked for the keyring password.
82117

83-
### Package Dependencies
84-
85-
Install the following dependencies on your Linux platform:
86-
87-
- `libsecret-tools` is required to interface with the Linux keychain
88-
- `libx11-dev` package, where the `libx11` library is used to get the console window handle on Linux.
89-
90-
### [Ubuntu](#tab/ubuntudep)
91-
92-
To install on debian/Ubuntu based Linux distribution:
93-
94-
```bash
95-
sudo apt install libx11-dev libc++-dev libc++abi-dev libsecret-tools libwebkit2gtk-4.0 -y
96-
```
97-
98-
### [Red Hat Enterprise Linux](#tab/rheldep)
99-
100-
To install on Red Hat/Fedora based Linux distribution:
101-
102-
```bash
103-
sudo dnf install libx11-dev libc++-dev libc++abi-dev libsecret-tools libwebkit2gtk-4.0 -y
104-
```
105-
106-
---
107118

108119
## Run a Sample App
109120

110121
To use a broker on the Linux platform, make sure you set the `BrokerOptions` to `OperatingSystems.Linux` as shown in the below code snippet:
111122

112-
Reference the [Enable SSO in native Linux apps using MSAL.NET](./linux-dotnet-sdk.md) for information of how to configure the project.
123+
Reference the [Enable SSO in native Linux apps using MSAL.NET](./linux-dotnet-sdk.md) for information of how to configure the project.
113124

114125
To set up a test app, you use the sample app provided in [microsoft-authentication-library-for-dotnet](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet) under the path [/tests/devapps/WAM/NetWSLWam/Class1.cs](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/blob/main/tests/devapps/WAM/NetWSLWam/Class1.cs)
115126

msal-dotnet-articles/acquiring-tokens/desktop-mobile/linux-dotnet-sdk.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ An authentication broker is an application that runs on a user’s machine that
3232
## Prerequisites
3333

3434
### .NET Installation
35+
3536
Identity integration dependent on having dotnet 8 installed on the Linux distribution, and recommend installing via the [installation script](/dotnet/core/install/linux-scripted-manual#scripted-install).
3637

3738
```bash
@@ -41,24 +42,26 @@ chmod +x ./dotnet-install.sh
4142
```
4243

4344
### Package Dependencies
45+
4446
Install the following dependencies on your Linux platform:
47+
4548
- `libsecret-tools` is required to interface with the Linux keychain
46-
- `libx11-dev` package, where the `libx11` library is used to get the console window handle on Linux.
49+
- `libx11-6` package, where the `libx11` library is used to get the console window handle on Linux.
4750

4851
### [Ubuntu](#tab/ubuntudep)
4952

5053
To install on debian/Ubuntu based Linux distribution:
5154

5255
```bash
53-
sudo apt install libx11-dev libc++-dev libc++abi-dev libsecret-tools libwebkit2gtk-4.0 -y
56+
sudo apt install libx11-6 libc++1 libc++abi1 libsecret-1-0 libwebkit2gtk-4.0-37 -y
5457
```
5558

5659
### [Red Hat Enterprise Linux](#tab/rheldep)
5760

5861
To install on Red Hat/Fedora based Linux distribution:
5962

6063
```bash
61-
sudo dnf install libx11-dev libc++-dev libc++abi-dev libsecret-tools libwebkit2gtk-4.0 -y
64+
sudo dnf install libx11-6 libc++1 libc++abi1 libsecret-1-0 libwebkit2gtk-4.0-37 -y
6265
```
6366

6467
---
@@ -254,10 +257,6 @@ To run the sample app:
254257
dotnet run --project tests/devapps/WAM/NetWSLWam/test.csproj
255258
```
256259

257-
## Proof-of-Possession access tokens
258-
259-
The Microsoft Single Sign-on for Linux broker allows acquiring PoP tokens for public client flows. For more information about Proof of Possession, see [Proof-of-Possession tokens](../../advanced/proof-of-possession-tokens.md).
260-
261260
## Redirect URI
262261

263262
Redirect URIs don't need to be configured in MSAL, but they must be configured in the app registration. They should follow the pattern below:

0 commit comments

Comments
 (0)