Skip to content

Commit 04365b2

Browse files
authored
Merge branch 'main' into smoke-test
2 parents c7f0e4f + 1cb0d81 commit 04365b2

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

dotnet/xml/Microsoft.Identity.Abstractions/CredentialDescription.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,8 @@
227227
</summary>
228228
<value>To be added.</value>
229229
<remarks>To be added.</remarks>
230-
<altmember cref="P:Microsoft.Identity.Abstractions.CredentialDescription.CertificateStorePath" />
231230
<altmember cref="P:Microsoft.Identity.Abstractions.CredentialDescription.CertificateThumbprint" />
231+
<altmember cref="P:Microsoft.Identity.Abstractions.CredentialDescription.SourceType" />
232232
<example>
233233
<format type="text/markdown"><![CDATA[
234234
The JSON fragment below describes a user certificate stored in the personal certificates folder (<b>CurrentUser/My</b>) and specified by its distinguised name, used as a client credential in a confidential client application:
@@ -238,7 +238,7 @@
238238
:::code language="csharp" source="~/../abstractions-samples/test/Microsoft.Identity.Abstractions.Tests/CredentialDescriptionTest.cs" id="distinguishedname_csharp":::
239239
]]></format>
240240
</example>
241-
<altmember cref="P:Microsoft.Identity.Abstractions.CredentialDescription.SourceType" />
241+
<altmember cref="P:Microsoft.Identity.Abstractions.CredentialDescription.CertificateStorePath" />
242242
</Docs>
243243
</Member>
244244
<Member MemberName="CertificatePassword">
@@ -298,10 +298,10 @@
298298
</summary>
299299
<value>To be added.</value>
300300
<remarks>Use this property in conjunction with <see cref="P:Microsoft.Identity.Abstractions.CredentialDescription.CertificateDistinguishedName" /> or <see cref="P:Microsoft.Identity.Abstractions.CredentialDescription.CertificateThumbprint" />.</remarks>
301-
<altmember cref="P:Microsoft.Identity.Abstractions.CredentialDescription.SourceType" />
302-
<altmember cref="P:Microsoft.Identity.Abstractions.CredentialDescription.CertificateStorePath" />
303301
<altmember cref="P:Microsoft.Identity.Abstractions.CredentialDescription.CertificateDistinguishedName" />
304302
<altmember cref="P:Microsoft.Identity.Abstractions.CredentialDescription.CertificateThumbprint" />
303+
<altmember cref="P:Microsoft.Identity.Abstractions.CredentialDescription.SourceType" />
304+
<altmember cref="P:Microsoft.Identity.Abstractions.CredentialDescription.CertificateStorePath" />
305305
</Docs>
306306
</Member>
307307
<Member MemberName="CertificateThumbprint">
@@ -325,8 +325,8 @@
325325
</summary>
326326
<value>To be added.</value>
327327
<remarks>Use this property in conjunction with <see cref="P:Microsoft.Identity.Abstractions.CredentialDescription.CertificateStorePath" />.</remarks>
328-
<altmember cref="P:Microsoft.Identity.Abstractions.CredentialDescription.CertificateDistinguishedName" />
329328
<altmember cref="P:Microsoft.Identity.Abstractions.CredentialDescription.CertificateStorePath" />
329+
<altmember cref="P:Microsoft.Identity.Abstractions.CredentialDescription.SourceType" />
330330
<example>
331331
<format type="text/markdown"><![CDATA[
332332
The JSON fragment below describes a user certificate stored in the personal certificates folder (<b>CurrentUser/My</b>) and specified by its thumbprint, used as a client credential in a confidential client application:
@@ -336,7 +336,7 @@
336336
:::code language="csharp" source="~/../abstractions-samples/test/Microsoft.Identity.Abstractions.Tests/CredentialDescriptionTest.cs" id="thumbprint_csharp":::
337337
]]></format>
338338
</example>
339-
<altmember cref="P:Microsoft.Identity.Abstractions.CredentialDescription.SourceType" />
339+
<altmember cref="P:Microsoft.Identity.Abstractions.CredentialDescription.CertificateDistinguishedName" />
340340
</Docs>
341341
</Member>
342342
<Member MemberName="ClientSecret">

msal-dotnet-articles/acquiring-tokens/desktop-mobile/wam.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,9 @@ To use the broker, developers will need to call <xref:Microsoft.Identity.Client.
187187

188188
## Integration best practices
189189

190+
> [!IMPORTANT]
191+
> When using WAM, your application MUST be running in the context of an active, interactive Windows user session and be able to display UI. Attempting to acquire tokens using WAM while running as a Windows service, using task scheduler (unless *specifically* running as a logged in user) or while using `runas` to impersonate another account will result in errors by design.
192+
190193
To make sure that your customers have a great experience with WAM, we strongly advise you adhere to the following principles:
191194

192195
1. **Give the user context prior to authentication**. Draw a UI or window that will inform the user that they need to authenticate, along with reasons for authentication. Explain the benefits of your application if it is a background service.

0 commit comments

Comments
 (0)