Skip to content

Commit 8e6a903

Browse files
committed
Merge branch 'main' into doc-improvement-create-chat
2 parents b062437 + db385da commit 8e6a903

21 files changed

+180
-39
lines changed

api-reference/beta/api/application-post-calls.md

Lines changed: 79 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1430,6 +1430,42 @@ Content-Type: application/json
14301430
"removedState": {
14311431
"reason": "Removed from roster"
14321432
}
1433+
},
1434+
{
1435+
"@odata.type": "#microsoft.graph.participant",
1436+
"info": {
1437+
"@odata.type": "#microsoft.graph.participantInfo",
1438+
"identity": {
1439+
"@odata.type": "#microsoft.graph.identitySet",
1440+
"acsUser": {
1441+
"@odata.type": "#microsoft.graph.identity",
1442+
"id": "f56e36db-9bb3-4fca-b794-a3efd7361f09_00000022-175f-5180-3397-b23a0d0047e8",
1443+
"identityProvider": "None",
1444+
"acsResourceId": "f56e36db-9bb3-4fca-b794-a3efd7361f09"
1445+
}
1446+
},
1447+
"endpointType": "default",
1448+
"endpointId": "99b83373-efe6-405f-ba33-32043e9de267",
1449+
"clientVersion": "Microsoft.Skype.Calling.Test.Ccts/1.19.4966.0",
1450+
"participantId": "62de48e1-a72c-40db-9193-a3bd8cf167c9"
1451+
},
1452+
"mediaStreams": [
1453+
{
1454+
"@odata.type": "#microsoft.graph.mediaStream",
1455+
"mediaType": "audio",
1456+
"label": "main-audio",
1457+
"sourceId": "402",
1458+
"direction": "sendReceive",
1459+
"serverMuted": false
1460+
}
1461+
],
1462+
"isMuted": false,
1463+
"isOnHold": false,
1464+
"isInLobby": false,
1465+
"publishedStates": [],
1466+
"meetingRole": "none",
1467+
"isIdentityAnonymized": false,
1468+
"id": "62de48e1-a72c-40db-9193-a3bd8cf167c9"
14331469
}
14341470
],
14351471
"sequenceNumber": 1
@@ -1440,7 +1476,9 @@ Content-Type: application/json
14401476
}
14411477
```
14421478

1443-
>**Note:** For join meeting scenarios apart from call state notifications, we receive roster notifications.
1479+
> **Notes:**
1480+
> * For join meeting scenarios apart from call state notifications, we receive roster notifications.
1481+
> * During the roster notification, ACS identities are also provided and recognized as **acsUser** entries.
14441482
14451483
### Example 6: Join a scheduled meeting with joinMeetingId and passcode
14461484
The following example requires a **joinMeetingId** and a **passcode** to join an existing meeting. You can retrieve these properties from the [Get onlineMeeting](../api/onlinemeeting-get.md) API.
@@ -2349,6 +2387,42 @@ Content-Type: application/json
23492387
"isMuted": false,
23502388
"isInLobby": true,
23512389
"id": "05491616-385f-44a8-9974-18cc5f9933c1"
2390+
},
2391+
{
2392+
"@odata.type": "#microsoft.graph.participant",
2393+
"info": {
2394+
"@odata.type": "#microsoft.graph.participantInfo",
2395+
"identity": {
2396+
"@odata.type": "#microsoft.graph.identitySet",
2397+
"acsUser": {
2398+
"@odata.type": "#microsoft.graph.identity",
2399+
"id": "f56e36db-9bb3-4fca-b794-a3efd7361f09_00000022-175f-5180-3397-b23a0d0047e8",
2400+
"identityProvider": "None",
2401+
"acsResourceId": "f56e36db-9bb3-4fca-b794-a3efd7361f09"
2402+
}
2403+
},
2404+
"endpointType": "default",
2405+
"endpointId": "99b83373-efe6-405f-ba33-32043e9de267",
2406+
"clientVersion": "Microsoft.Skype.Calling.Test.Ccts/1.19.4966.0",
2407+
"participantId": "62de48e1-a72c-40db-9193-a3bd8cf167c9"
2408+
},
2409+
"mediaStreams": [
2410+
{
2411+
"@odata.type": "#microsoft.graph.mediaStream",
2412+
"mediaType": "audio",
2413+
"label": "main-audio",
2414+
"sourceId": "402",
2415+
"direction": "sendReceive",
2416+
"serverMuted": false
2417+
}
2418+
],
2419+
"isMuted": false,
2420+
"isOnHold": false,
2421+
"isInLobby": false,
2422+
"publishedStates": [],
2423+
"meetingRole": "none",
2424+
"isIdentityAnonymized": false,
2425+
"id": "62de48e1-a72c-40db-9193-a3bd8cf167c9"
23522426
}
23532427
]
23542428
}
@@ -2411,11 +2485,13 @@ Content-Type: application/json
24112485
}
24122486
```
24132487

2414-
> **Note:** The application doesn't receive the roster for participants in the meeting until its admitted from lobby.
2488+
> **Notes:**
2489+
> * The application doesn't receive the roster for participants in the meeting until its admitted from lobby.
2490+
> * During the roster notification, ACS identities are also provided and recognized as **acsUser** entries.
24152491
24162492
### Example 11: Create peer-to-peer PSTN call with service hosted media
24172493

2418-
> **Note:** This call requires the Calls.Initiate.All permission.
2494+
> **Note:** This call requires the `Calls.Initiate.All` permission.
24192495
24202496
This call requires an application instance with a PSTN number assigned. For details, see [Assign a phone number to your bot](/graph/cloud-communications-phone-number#assign-a-phone-number-to-your-bot).
24212497

api-reference/beta/api/onauthenticationmethodloadstartexternalusersselfservicesignup-post-identityproviders.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ POST /identity/authenticationEventsFlows/{authenticationEventsFlow-id}/microsoft
4141
|Content-Type|application/json. Required.|
4242

4343
## Request body
44-
In the request body, provide a JSON representation of the ID of the [identityProvider](../resources/identityproviderbase.md) you want to add. For self-service sign up user flows, the values can be `EmailPassword-OAUTH`, `EmailOtpSignup-OAUTH`, `Google-OAUTH` or `Facebook-OAUTH`.
44+
In the request body, provide a JSON representation of the ID of the [identityProvider](../resources/identityproviderbase.md) you want to add.
4545

4646
## Response
4747

api-reference/beta/api/presence-setpresence.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ A user can have multiple presence sessions because the user can be on multiple T
2323

2424
Similarly, an application can have its own presence session for a user and be able to update the state.
2525

26-
The following is the precedence for how session states are aggregated, with "A > B" representing A having precedence over B:
26+
The following precedence is used for how session states are aggregated, with "A > B" representing that A has precedence over B:
2727
* User-preferred state > session-level states (user-preferred state overrides session-level states)
2828
* Among session-level states: DoNotDisturb > Busy > Available > Away
2929

@@ -34,7 +34,7 @@ A presence session may **time out** and **expire**, so the application needs to
3434

3535
A presence session can time out if the availability is `Available` and the timeout is 5 minutes. When it times out, the presence state fades in stages. For example, if an application sets the presence session as `Available/Available`, the state would change to `Available/AvailableInactive` in 5 minutes with the first timeout, then `Away/Away` in another 5 minutes with the second timeout.
3636

37-
The expiration of a presence session is configurable with the `expirationDuration` parameter. When a session expires it becomes `Offline`.
37+
Use `expirationDuration` to configure the expiration of a presence session; otherwise, the default expiration is 5 minutes. Valid values range from 5 minutes to 4 hours, after which the session becomes `Offline`.
3838

3939
## Permissions
4040
Choose the permission or permissions marked as least privileged for this API. Use a higher privileged permission or permissions [only if your app requires it](/graph/permissions-overview#best-practices-for-using-microsoft-graph-permissions). For details about delegated and application permissions, see [Permission types](/graph/permissions-overview#permission-types). To learn more about these permissions, see the [permissions reference](/graph/permissions-reference).
@@ -62,7 +62,7 @@ In the request body, provide a JSON object with the following parameters.
6262
| sessionId | string | The ID of the application's presence session. |
6363
| availability | string | The base presence information. |
6464
| activity | string | The supplemental information to availability. |
65-
| expirationDuration | duration | The expiration of the app presence session. The value is represented in [ISO 8601 format for durations](http://en.wikipedia.org/wiki/ISO_8601#Durations).</p>If not provided, a default expiration of 5 minutes will be applied. |
65+
| expirationDuration | duration | The expiration of the app presence session. The value is represented in [ISO 8601 format for durations](http://en.wikipedia.org/wiki/ISO_8601#Durations).</p> If not provided, a default expiration of 5 minutes is applied. The valid duration range is from 5 to 240 minutes (PT5M to PT4H). |
6666

6767
> [!IMPORTANT]
6868
>

api-reference/beta/resources/cloudpcreports.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ Use a method in the [Methods](#methods) section to get the corresponding report
2727
|[Get frontline report](../api/cloudpcreports-getfrontlinereport.md)|Stream| Get Frontline Cloud PC license usage reports, such as **servicePlanId**, **licenseCount**, and **claimedLicenseCount**, for real-time, 7 days, or 28 days trend.|
2828
|[Get inaccessible Cloud PC reports](../api/cloudpcreports-getinaccessiblecloudpcreports.md)|Stream|Get inaccessible Cloud PCs with details, including the latest health state, failed connection count, failed health check count, and system status.|
2929
|[Get raw remote connection reports](../api/cloudpcreports-getrawremoteconnectionreports.md)|Stream|Get the raw real-time remote connection report for a Cloud PC without any calculation or aggregation.|
30-
|[Get real time remote connection agency reports](../api/cloudpcreports-getrealtimeremoteconnectionlatency.md)|Stream|Get the real-time remote connection latency reports like current round trip time and available bandwidth of a Cloud PC.|
30+
|[Get real-time remote connection latency reports](../api/cloudpcreports-getrealtimeremoteconnectionlatency.md)|Stream|Get the real-time remote connection latency reports like current round trip time and available bandwidth of a Cloud PC.|
3131
|[Get real-time remote connection status reports](../api/cloudpcreports-getrealtimeremoteconnectionstatus.md)|Stream|Get the real-time remote connection status reports like sign-in status or days since the last use of a Cloud PC.|
32-
|[Get remove connection hitorical reports](../api/cloudpcreports-getremoteconnectionhistoricalreports.md)|Stream|Get a Cloud PC's remote connection historical reports, such as **signInDateTime**, **signOutDateTime**, or **usageInHour**, in a given period.|
32+
|[Get remote connection historical reports](../api/cloudpcreports-getremoteconnectionhistoricalreports.md)|Stream|Get a Cloud PC's remote connection historical reports, such as **signInDateTime**, **signOutDateTime**, or **usageInHour**, in a given period.|
3333
|[Get total aggregated remote connection reports](../api/cloudpcreports-gettotalaggregatedremoteconnectionreports.md)|Stream|Get the total aggregated remote connection reports, like usage and **daysSinceLastUse**, in a given period.|
3434
|[Retrieve Cloud PC tenant metrics report](../api/cloudpcreports-retrievecloudpctenantmetricsreport.md)|Stream|Get a report related to the performance of Cloud PCs.|
3535
|[Retrieve cross-region disaster recovery report](../api/cloudpcreports-retrievecrossregiondisasterrecoveryreport.md)|Stream| Retrieve the Windows 365 cross-region disaster recovery report with configuration health check results, disaster recovery status, latest cross-region restore points, and user settings.|
@@ -40,6 +40,7 @@ Use a method in the [Methods](#methods) section to get the corresponding report
4040
|[Get shared use license usage report (deprecated)](../api/cloudpcreports-getshareduselicenseusagereport.md) |Stream| Get the shared use license usage reports, such as **servicePlanId**, **licenseCount**, and **claimedLicenseCount**, for real-time, 7 days, or 28 days trend.|
4141

4242
## Properties
43+
4344
|Property|Type|Description|
4445
|:---|:---|:---|
4546
|id|String|The unique identifier for the reports. Read-only. |
@@ -53,11 +54,13 @@ Use a method in the [Methods](#methods) section to get the corresponding report
5354
| cloudPcInsightReport | Indicates Cloud PC-level configuration data with insights. |
5455

5556
## Relationships
57+
5658
|Relationship|Type|Description|
5759
|:---|:---|:---|
5860
|exportJobs|[cloudPcExportJob](../resources/cloudpcexportjob.md) collection|The export jobs created for downloading reports.|
5961

6062
## JSON representation
63+
6164
The following JSON representation shows the resource type.
6265
<!-- {
6366
"blockType": "resource",

api-reference/beta/toc/device-and-app-management/toc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,11 +286,11 @@ items:
286286
href: ../../api/cloudpcreports-getinaccessiblecloudpcreports.md
287287
- name: Get raw remote connection reports
288288
href: ../../api/cloudpcreports-getrawremoteconnectionreports.md
289-
- name: Get real time remote connection agency reports
289+
- name: Get real-time remote connection latency reports
290290
href: ../../api/cloudpcreports-getrealtimeremoteconnectionlatency.md
291291
- name: Get real-time remote connection status reports
292292
href: ../../api/cloudpcreports-getrealtimeremoteconnectionstatus.md
293-
- name: Get remove connection hitorical reports
293+
- name: Get remote connection historical reports
294294
href: ../../api/cloudpcreports-getremoteconnectionhistoricalreports.md
295295
- name: Get total aggregated remote connection reports
296296
href: ../../api/cloudpcreports-gettotalaggregatedremoteconnectionreports.md

api-reference/v1.0/api/onauthenticationmethodloadstartexternalusersselfservicesignup-post-identityproviders.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ POST /identity/authenticationEventsFlows/{authenticationEventsFlow-id}/microsoft
3939
|Content-Type|application/json. Required.|
4040

4141
## Request body
42-
In the request body, provide a JSON representation of the ID of the [identityProvider](../resources/identityproviderbase.md) you want to add. For self-service user flows, the values can be `EmailPassword-OAUTH`, `EmailOtpSignup-OAUTH`, `Google-OAUTH`, or `Facebook-OAUTH`.
42+
In the request body, provide a JSON representation of the ID of the [identityProvider](../resources/identityproviderbase.md) you want to add. For self-service sign up user flows, the values can be `EmailPassword-OAUTH`, `EmailOtpSignup-OAUTH`, `Google-OAUTH` or `Facebook-OAUTH`.
4343

4444
## Response
4545

api-reference/v1.0/api/presence-setpresence.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ A user can have multiple presence sessions because the user can be on multiple T
2121

2222
Similarly, an application can have its own presence session for a user and be able to update the state.
2323

24-
The following is the precedence for how session states are aggregated:
24+
The following precedence is used for how session states are aggregated:
2525
* User-configured > app-configured (user-configured state overrides others)
2626
* Among app-configured: DoNotDisturb > Busy > Available > Away
2727

@@ -32,7 +32,7 @@ A presence session may **time out** and **expire**, so the application needs to
3232

3333
A presence session can time out if the availability is `Available` and the timeout is 5 minutes. When it times out, the presence state fades in stages. For example, if an application sets the presence session as `Available/Available`, the state would change to `Available/AvailableInactive` in 5 minutes with the first timeout, then `Away/Away` in another 5 minutes with the second timeout.
3434

35-
The expiration of a presence session is configurable with the `expirationDuration` parameter. When a session expires it becomes `Offline`.
35+
Use `expirationDuration` to configure the expiration of a presence session; otherwise, the default expiration is 5 minutes. Valid values range from 5 minutes to 4 hours, after which the session becomes `Offline`.
3636

3737
## Permissions
3838
Choose the permission or permissions marked as least privileged for this API. Use a higher privileged permission or permissions [only if your app requires it](/graph/permissions-overview#best-practices-for-using-microsoft-graph-permissions). For details about delegated and application permissions, see [Permission types](/graph/permissions-overview#permission-types). To learn more about these permissions, see the [permissions reference](/graph/permissions-reference).
@@ -60,7 +60,7 @@ In the request body, provide a JSON object with the following parameters.
6060
| sessionId | string | The ID of the application's presence session. |
6161
| availability | string | The base presence information. |
6262
| activity | string | The supplemental information to availability. |
63-
| expirationDuration | duration | The expiration of the app presence session. The value is represented in [ISO 8601 format for durations](http://en.wikipedia.org/wiki/ISO_8601#Durations).</p>If not provided, a default expiration of 5 minutes will be applied. The valid duration range is 5-240 minutes (PT5M to PT4H)|
63+
| expirationDuration | duration | The expiration of the app presence session. The value is represented in [ISO 8601 format for durations](http://en.wikipedia.org/wiki/ISO_8601#Durations).</p>If not provided, a default expiration of 5 minutes is applied. The valid duration range is from 5 to 240 minutes (PT5M to PT4H).|
6464

6565
> [!IMPORTANT]
6666
>

0 commit comments

Comments
 (0)