Skip to content

Commit ac4c7b8

Browse files
authored
Merge pull request #211027 from MicrosoftDocs/main
9/13 AM Publish
2 parents 8ca4b66 + 8bc39c7 commit ac4c7b8

File tree

58 files changed

+1403
-632
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1403
-632
lines changed

README.md

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,13 @@ Contributing to open source is more than just providing updates, it's also about
1010

1111
You've decided to contribute, that's great! To contribute to the documentation, you need a few tools.
1212

13-
Contributing to the documentation requires a GitHub account. If you don't have an account, follow the instructions for the [GitHub account setup](/contribute/get-started-setup-github) from our contributor guide.
13+
#### Github
1414

15-
#### Download
15+
Contributing to the documentation requires a GitHub account. If you don't have an account, follow the instructions for [GitHub account setup](https://docs.microsoft.com/contribute/get-started-setup-github) from our contributor guide.
1616

17-
Install the following tools:
17+
#### Tools
1818

19-
* [Git](https://git-scm.com/download)
20-
* [Visual Studio Code](https://code.visualstudio.com/Download)
21-
* [Docs Authoring Pack](https://marketplace.visualstudio.com/items?itemName=docsmsft.docs-authoring-pack) extension for Visual Studio Code
22-
23-
#### Install
24-
25-
Follow the instructions provided in the [Install content authoring tools](/contribute/get-started-setup-tools) from our contributor guide.
19+
To install necessary tools, follow the instructions for [Install content authoring tools](https://docs.microsoft.com/contribute/get-started-setup-tools) from our contributor guide.
2620

2721
## License
2822

@@ -31,4 +25,4 @@ Please refer to [LICENSE](LICENSE), [LICENSE-CODE](LICENSE-CODE) and [ThirdParty
3125
## Code of Conduct
3226

3327
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
34-
For more information, see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
28+
For more information, see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.

articles/active-directory/conditional-access/service-dependencies.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ The below table lists some more service dependencies, where the client apps must
6161
| | Windows Azure Active Directory | Early-bound |
6262
| | SharePoint | Early-bound |
6363
| | Exchange | Early-bound |
64+
| Power Automate | Power Apps | Early-bound |
6465
| Project | Dynamics CRM | Early-bound |
6566
| Skype for Business | Exchange | Early-bound |
6667
| Visual Studio | Microsoft Azure Management (portal and API) | Early-bound |

articles/active-directory/develop/test-automate-integration-testing.md

Lines changed: 47 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -175,56 +175,56 @@ using System;
175175

176176
public class ClientFixture : IAsyncLifetime
177177
{
178-
public HttpClient httpClient;
178+
public HttpClient httpClient;
179179

180-
public async Task InitializeAsync()
181-
{
182-
var builder = new ConfigurationBuilder().AddJsonFile("<path-to-json-file>");
180+
public async Task InitializeAsync()
181+
{
182+
var builder = new ConfigurationBuilder().AddJsonFile("<path-to-json-file>");
183183

184-
IConfigurationRoot Configuration = builder.Build();
184+
IConfigurationRoot Configuration = builder.Build();
185185

186-
var PublicClientApplicationOptions = new PublicClientApplicationOptions();
187-
Configuration.Bind("Authentication", PublicClientApplicationOptions);
188-
var app = PublicClientApplicationBuilder.CreateWithApplicationOptions(PublicClientApplicationOptions)
189-
.Build();
186+
var PublicClientApplicationOptions = new PublicClientApplicationOptions();
187+
Configuration.Bind("Authentication", PublicClientApplicationOptions);
188+
var app = PublicClientApplicationBuilder.CreateWithApplicationOptions(PublicClientApplicationOptions)
189+
.Build();
190190

191-
SecretClientOptions options = new SecretClientOptions()
192-
{
193-
Retry =
191+
SecretClientOptions options = new SecretClientOptions()
192+
{
193+
Retry =
194194
{
195195
Delay= TimeSpan.FromSeconds(2),
196196
MaxDelay = TimeSpan.FromSeconds(16),
197197
MaxRetries = 5,
198198
Mode = RetryMode.Exponential
199199
}
200-
};
200+
};
201201

202-
string keyVaultUri = Configuration.GetValue<string>("KeyVault:KeyVaultUri");
203-
var client = new SecretClient(new Uri(keyVaultUri), new DefaultAzureCredential(), options);
202+
string keyVaultUri = Configuration.GetValue<string>("KeyVault:KeyVaultUri");
203+
var client = new SecretClient(new Uri(keyVaultUri), new DefaultAzureCredential(), options);
204204

205-
KeyVaultSecret userNameSecret = client.GetSecret("TestUserName");
206-
KeyVaultSecret passwordSecret = client.GetSecret("TestPassword");
205+
KeyVaultSecret userNameSecret = client.GetSecret("TestUserName");
206+
KeyVaultSecret passwordSecret = client.GetSecret("TestPassword");
207207

208-
string password = passwordSecret.Value;
209-
string username = userNameSecret.Value;
210-
string[] scopes = Configuration.GetSection( "WebAPI:Scopes").Get<string[]>();
211-
SecureString securePassword = new NetworkCredential("", password).SecurePassword;
208+
string password = passwordSecret.Value;
209+
string username = userNameSecret.Value;
210+
string[] scopes = Configuration.GetSection("WebAPI:Scopes").Get<string[]>();
211+
SecureString securePassword = new NetworkCredential("", password).SecurePassword;
212212

213-
AuthenticationResult result = null;
214-
httpClient = new HttpClient();
213+
AuthenticationResult result = null;
214+
httpClient = new HttpClient();
215215

216-
try
217-
{
218-
result = await app.AcquireTokenByUsernamePassword(scopes, username, securePassword)
219-
.ExecuteAsync();
220-
}
221-
catch (MsalException) { }
216+
try
217+
{
218+
result = await app.AcquireTokenByUsernamePassword(scopes, username, securePassword)
219+
.ExecuteAsync();
220+
}
221+
catch (MsalException) { }
222222

223-
string accessToken = result.AccessToken;
224-
httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("bearer", accessToken);
225-
}
223+
string accessToken = result.AccessToken;
224+
httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("bearer", accessToken);
225+
}
226226

227-
public Task DisposeAsync() => Task.CompletedTask;
227+
public Task DisposeAsync() => Task.CompletedTask;
228228
}
229229
```
230230

@@ -235,21 +235,20 @@ The following example is a test that calls Microsoft Graph. Replace this test w
235235
```csharp
236236
public class ApiTests : IClassFixture<ClientFixture>
237237
{
238-
ClientFixture clientFixture;
239-
240-
public ApiTests(ClientFixture clientFixture)
241-
{
242-
this.clientFixture = clientFixture;
243-
}
238+
ClientFixture clientFixture;
244239

240+
public ApiTests(ClientFixture clientFixture)
241+
{
242+
this.clientFixture = clientFixture;
243+
}
245244

246-
[Fact]
247-
public async Task GetRequestTest()
248-
{
249-
var testClient = clientFixture.httpClient;
250-
HttpResponseMessage response = await testClient.GetAsync("https://graph.microsoft.com/v1.0/me");
251-
var responseCode = response.StatusCode.ToString();
252-
Assert.Equal("OK", responseCode);
253-
}
245+
[Fact]
246+
public async Task GetRequestTest()
247+
{
248+
var testClient = clientFixture.httpClient;
249+
HttpResponseMessage response = await testClient.GetAsync("https://graph.microsoft.com/v1.0/me");
250+
var responseCode = response.StatusCode.ToString();
251+
Assert.Equal("OK", responseCode);
252+
}
254253
}
255-
```
254+
```

articles/active-directory/external-identities/one-time-passcode.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,10 @@ The guest user is now authenticated, and they can see the shared resource or con
5959

6060
When a guest user redeems an invitation or uses a link to a resource that has been shared with them, they’ll receive a one-time passcode if:
6161

62-
- They don't have an Azure AD account
63-
- They don't have a Microsoft account
62+
- They don't have an Azure AD account.
63+
- They don't have a Microsoft account.
6464
- The inviting tenant didn't set up federation with social (like [Google](google-federation.md)) or other identity providers.
65+
- They don't have any other authentication method or any password-backed accounts.
6566
- Email one-time passcode is enabled.
6667

6768
At the time of invitation, there's no indication that the user you're inviting will use one-time passcode authentication. But when the guest user signs in, one-time passcode authentication will be the fallback method if no other authentication methods can be used.

0 commit comments

Comments
 (0)