Skip to content

Commit ccf99ca

Browse files
Merge pull request #151 from MicrosoftDocs/main
Sync live w/main
2 parents 525f59f + d1571e5 commit ccf99ca

6 files changed

Lines changed: 30 additions & 3 deletions

File tree

.github/workflows/linkvalidator.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@v3
1818

19+
- name: Resolve root-relative links for checking
20+
run: |
21+
# Convert root-relative markdown links like [text](/path) to [text](https://learn.microsoft.com/path)
22+
# so lychee can validate them. This only modifies the CI checkout copy.
23+
find . -name '*.md' -exec sed -i -E 's|\]\(/|\](https://learn.microsoft.com/|g' {} +
24+
1925
- name: Link Checker
2026
id: lychee
2127
uses: lycheeverse/lychee-action@master

msal-python-conceptual/advanced/migrate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ and then when a new RT comes back, MSAL will store it in the usual way.
2525
As this method is intended for scenarios that are not typical, it is NOT readily accessible with the official API surface.
2626
You will have to call it via an internal helper `app.client`,
2727
and its naming convention is also slightly different than those other
28-
[official APIs]().
28+
[official APIs](../getting-started/acquiring-tokens.md).
2929

3030
```python
3131
from msal import PublicClientApplication

python/docs-ref-autogen/msal/msal.application.ConfidentialClientApplication.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,8 @@ methods:
358358
Since MSAL Python 1.23, it will automatically look for token from cache,
359359
360360
and only send request to Identity Provider when cache misses.'
361-
signature: acquire_token_for_client(scopes, claims_challenge=None, **kwargs)
361+
signature: acquire_token_for_client(scopes, claims_challenge=None, fmi_path=None,
362+
**kwargs)
362363
parameters:
363364
- name: scopes
364365
description: '(Required)
@@ -379,6 +380,19 @@ methods:
379380
It is a string of a JSON object which contains lists of claims being requested
380381
from these locations.'
381382
defaultValue: None
383+
- name: fmi_path
384+
description: "Optional. The Federated Managed Identity (FMI) credential path.\n\
385+
When provided, it is sent as the `fmi_path` parameter in the\ntoken request\
386+
\ body, and the resulting token is cached separately\nso that different FMI\
387+
\ paths do not share cached tokens.\nExample usage:\n\n<!-- literal_block {\"\
388+
ids\": [], \"classes\": [], \"names\": [], \"dupnames\": [], \"backrefs\": [],\
389+
\ \"xml:space\": \"preserve\", \"language\": \"default\", \"force\": false,\
390+
\ \"linenos\": false} -->\n\n````default\n\n result = cca.acquire_token_for_client(\n\
391+
\ scopes=[\"api://resource/.default\"],\n fmi_path=\"SomeFmiPath/FmiCredentialPath\"\
392+
,\n )\n ````"
393+
defaultValue: None
394+
types:
395+
- <xref:str>
382396
return:
383397
description: "A dict representing the json response from Microsoft Entra:\n\n\
384398
* A successful response would contain \"access_token\" key, \n\n* an error response\

python/docs-ref-autogen/msal/msal.sku.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
uid: msal.sku
33
name: sku
44
fullName: msal.sku
5-
summary: This module is from where we recieve the client sku name and version.
5+
summary: This module is from where we receive the client sku name and version.

python/docs-ref-autogen/msal/msal.token_cache.TokenCache.CredentialType.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ attributes:
99
- uid: msal.token_cache.TokenCache.CredentialType.ACCESS_TOKEN
1010
name: ACCESS_TOKEN
1111
signature: ACCESS_TOKEN = 'AccessToken'
12+
- uid: msal.token_cache.TokenCache.CredentialType.ACCESS_TOKEN_EXTENDED
13+
name: ACCESS_TOKEN_EXTENDED
14+
signature: ACCESS_TOKEN_EXTENDED = 'atext'
1215
- uid: msal.token_cache.TokenCache.CredentialType.ACCOUNT
1316
name: ACCOUNT
1417
signature: ACCOUNT = 'Account'

xrefmap.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2171,6 +2171,10 @@ references:
21712171
href: https://docs.python.org/3/library/ctypes.html#ctypes._Pointer.contents
21722172
name: contents
21732173
uid: ctypes._Pointer.contents
2174+
- fullName: ctypes._SimpleCData._type_
2175+
href: https://docs.python.org/3/library/ctypes.html#ctypes._SimpleCData._type_
2176+
name: _type_
2177+
uid: ctypes._SimpleCData._type_
21742178
- fullName: ctypes._SimpleCData.value
21752179
href: https://docs.python.org/3/library/ctypes.html#ctypes._SimpleCData.value
21762180
name: value

0 commit comments

Comments
 (0)