-
Notifications
You must be signed in to change notification settings - Fork 5.7k
Adding incoming call events to swagger #23431
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
25 commits
Select commit
Hold shift + click to select a range
e76a248
adding incoming call
osaghaso 3df06d9
adding incoming call
osaghaso 0890f5d
adding incoming call event to Event grid
osaghaso b061a71
fixing avocado failure
osaghaso 278d374
fixing avocado failure
osaghaso dbd9962
fixing build failures
osaghaso 82b4ab3
fixing build failures
osaghaso b5bfa74
Merge remote-tracking branch 'origin/main' into user/osaghaso/add_inc…
osaghaso df8ee6a
Revert "fixing build failures"
osaghaso 8ad4590
fixing build failures
osaghaso 788e773
merging from master
osaghaso fa3d978
Adding Incoming Call events to eventgrid swagger
osaghaso 88347f2
Addressing comments
osaghaso 07709ea
Adding Incoming Call events to eventgrid swagger
osaghaso 1f56b18
merged from main
osaghaso e036cc6
Adding Incoming Call events to eventgrid swagger
osaghaso a4ad2d1
removing CallingCommunicationIdentifier
osaghaso 3763c65
removing unwanted string
osaghaso 8b769ec
addressing comments
osaghaso 5fefe1d
making custom context its own defination
osaghaso 08bdf12
making custom context its own defination
osaghaso c0e03a1
adding the CommunicationIdentifier to property
osaghaso f2a9266
merging
osaghaso 6d82e70
merging
osaghaso 03ab280
Merge branch 'main' into user/osaghaso/incomingCall_swagger
osaghaso File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,41 @@ | |
| }, | ||
| "paths": {}, | ||
| "definitions": { | ||
| "AcsIncomingCallEventData": { | ||
| "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.IncomingCall event", | ||
| "properties": { | ||
| "to": { | ||
| "description": "The communication identifier of the target user.", | ||
| "$ref": "../../../../../communication/data-plane/Common/stable/2021-03-07/common.json#/definitions/CommunicationIdentifierModel", | ||
| "x-ms-client-name": "toCommunicationIdentifier" | ||
| }, | ||
| "from": { | ||
| "description": "The communication identifier of the user who initiated the call.", | ||
| "$ref": "../../../../../communication/data-plane/Common/stable/2021-03-07/common.json#/definitions/CommunicationIdentifierModel", | ||
| "x-ms-client-name": "fromCommunicationIdentifier" | ||
| }, | ||
| "serverCallId": { | ||
|
osaghaso marked this conversation as resolved.
|
||
| "description": "The Id of the server call", | ||
| "type": "string" | ||
| }, | ||
| "callerDisplayName": { | ||
| "description": "Display name of caller.", | ||
| "type": "string" | ||
| }, | ||
| "customContext": { | ||
| "description": "Custom Context of Incoming Call", | ||
| "$ref": "#/definitions/AcsIncomingCallCustomContext" | ||
| }, | ||
| "incomingCallContext": { | ||
|
osaghaso marked this conversation as resolved.
|
||
| "description": "Signed incoming call context.", | ||
| "type": "string" | ||
| }, | ||
| "correlationId": { | ||
|
osaghaso marked this conversation as resolved.
|
||
| "description": "CorrelationId (CallId).", | ||
| "type": "string" | ||
| } | ||
| } | ||
| }, | ||
| "AcsUserDisconnectedEventData": { | ||
| "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.UserDisconnected event.", | ||
| "properties": { | ||
|
|
@@ -861,6 +896,30 @@ | |
| "type": "string" | ||
| } | ||
| } | ||
| }, | ||
| "AcsIncomingCallCustomContext": { | ||
| "description": "Custom Context of Incoming Call", | ||
| "type": "object", | ||
| "properties": { | ||
| "customHeaders": { | ||
| "type": "string", | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Are we sure this is not meant to be a dictionary like sipHeaders and voipHeaders?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. yes sure |
||
| "description": "Custom Headers for incoming call" | ||
| }, | ||
| "sipHeaders": { | ||
| "type": "object", | ||
| "description": "Sip Headers for incoming call", | ||
| "additionalProperties": { | ||
| "type": "string" | ||
| } | ||
| }, | ||
| "voipHeaders": { | ||
| "type": "object", | ||
| "description": "Voip Headers for incoming call", | ||
| "additionalProperties": { | ||
| "type": "string" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
38 changes: 38 additions & 0 deletions
38
...Microsoft.Communication/stable/2018-01-01/examples/cloud-events-schema/incoming_call.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| { | ||
| "id": "e80026e7-e298-46ba-bc42-dab0eda92581", | ||
| "source": "/subscriptions/{subscription-id}/resourceGroups/{group-name}/providers/Microsoft.Communication/communicationServices/{communication-services-resource-name}", | ||
| "subject": "/caller/{caller-id}/recipient/{recipient-id}", | ||
| "data": { | ||
| "to": { | ||
| "kind": "communicationUser", | ||
| "rawId": "{recipient-id}", | ||
| "communicationUser": { | ||
| "id": "{recipient-id}" | ||
| } | ||
| }, | ||
| "from": { | ||
| "kind": "communicationUser", | ||
| "rawId": "{caller-id}", | ||
| "communicationUser": { | ||
| "id": "{caller-id}" | ||
| } | ||
| }, | ||
| "serverCallId": "{server-call-id}", | ||
| "callerDisplayName": "VOIP Caller", | ||
| "customContext": { | ||
| "sipHeaders": { | ||
| "userToUser": "616d617a6f6e5f6368696;encoding=hex", | ||
| "X-MS-Custom-myheader1": "35567842", | ||
| "X-MS-Custom-myheader2": "customsipheadervalue" | ||
| }, | ||
| "voipHeaders": { | ||
| "customHeader": "customValue" | ||
| } | ||
| }, | ||
| "incomingCallContext": "{incoming-call-contextValue}", | ||
| "correlationId": "correlationId" | ||
| }, | ||
| "type": "Microsoft.Communication.IncomingCall", | ||
| "specversion": "1.0", | ||
| "time": "2023-04-04T17:18:42.5542219Z" | ||
| } |
39 changes: 39 additions & 0 deletions
39
...e/Microsoft.Communication/stable/2018-01-01/examples/event-grid-schema/incoming_call.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| { | ||
| "id": "e80026e7-e298-46ba-bc42-dab0eda92581", | ||
| "topic": "/subscriptions/{subscription-id}/resourceGroups/{group-name}/providers/Microsoft.Communication/communicationServices/{communication-services-resource-name}", | ||
| "subject": "/caller/{caller-id}/recipient/{recipient-id}", | ||
| "data": { | ||
| "to": { | ||
| "kind": "communicationUser", | ||
| "rawId": "{recipient-id}", | ||
| "communicationUser": { | ||
| "id": "{recipient-id}" | ||
| } | ||
| }, | ||
| "from": { | ||
| "kind": "communicationUser", | ||
| "rawId": "{caller-id}", | ||
| "communicationUser": { | ||
| "id": "{caller-id}" | ||
| } | ||
| }, | ||
| "serverCallId": "{server-call-id}", | ||
| "callerDisplayName": "VOIP Caller", | ||
| "customContext": { | ||
| "sipHeaders": { | ||
|
osaghaso marked this conversation as resolved.
|
||
| "userToUser": "616d617a6f6e5f6368696;encoding=hex", | ||
| "X-MS-Custom-myheader1": "35567842", | ||
| "X-MS-Custom-myheader2": "customsipheadervalue" | ||
| }, | ||
| "voipHeaders": { | ||
| "customHeader": "customValue" | ||
| } | ||
| }, | ||
| "incomingCallContext": "{incoming-call-contextValue}", | ||
| "correlationId": "correlationId" | ||
| }, | ||
| "eventType": "Microsoft.Communication.IncomingCall", | ||
| "dataVersion": "1.0", | ||
| "metadataVersion": "1", | ||
| "eventTime": "2023-04-04T17:18:42.5542219Z" | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.