Skip to content

Commit

Permalink
Fix for Zoom adapter throwing on no channel ID (#245)
Browse files Browse the repository at this point in the history
* Adding RingCentral adapter (#215)

* Adding RingCentral adapter

* Updating documentation #wip

* Adding packaging details

* Addressing warnings

Co-authored-by: Gary Pretty <gary@garypretty.co.uk>

* Adding sample RingCentral Adapter bot (#221)

* Adding RingCentral adapter

* Updating documentation #wip

* Adding packaging details

* Addressing warnings

* Adding RingCentral Adapter sample and updating documentation

* Fix up unit tests

* Adding RingCentral reference to main doc

* Fix up git ignore

Co-authored-by: Gary Pretty <gary@garypretty.co.uk>

* Update README.md

* Update README.md

* Add GitHub link to profile (#223)

* Updated sample package references. Added ring central sample. (#224)

* Updated sample package references. Added ring central sample.

* Update dotnet pack yaml config

* Further update to dotnet pack yaml to fix no matching projects build pipeline error.

* Bump Microsoft.AspNetCore.All in /samples/Form Flow Sample (#225)

Bumps [Microsoft.AspNetCore.All](https://github.com/aspnet/Universe) from 2.1.1 to 2.1.4.
- [Release notes](https://github.com/aspnet/Universe/releases)
- [Changelog](https://github.com/aspnet/Universe/blob/master/docs/CrossRepoBreakingChanges.md)
- [Commits](aspnet/Universe@2.1.1...2.1.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump Microsoft.AspNetCore.All in /samples/Google Adapter Sample (#228)

Bumps [Microsoft.AspNetCore.All](https://github.com/aspnet/Universe) from 2.1.1 to 2.1.4.
- [Release notes](https://github.com/aspnet/Universe/releases)
- [Changelog](https://github.com/aspnet/Universe/blob/master/docs/CrossRepoBreakingChanges.md)
- [Commits](aspnet/Universe@2.1.1...2.1.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump Microsoft.AspNetCore.All in /samples/BestMatch Middleware Sample (#226)

Bumps [Microsoft.AspNetCore.All](https://github.com/aspnet/Universe) from 2.1.1 to 2.1.4.
- [Release notes](https://github.com/aspnet/Universe/releases)
- [Changelog](https://github.com/aspnet/Universe/blob/master/docs/CrossRepoBreakingChanges.md)
- [Commits](aspnet/Universe@2.1.1...2.1.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump Microsoft.AspNetCore.All in /samples/Alexa Adapter Sample (#227)

Bumps [Microsoft.AspNetCore.All](https://github.com/aspnet/Universe) from 2.1.1 to 2.1.4.
- [Release notes](https://github.com/aspnet/Universe/releases)
- [Changelog](https://github.com/aspnet/Universe/blob/master/docs/CrossRepoBreakingChanges.md)
- [Commits](aspnet/Universe@2.1.1...2.1.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Gary Pretty <gary@garypretty.co.uk>

* Update adaptor to use current elastic 7.x (#233)

* Update adaptor to use current elastic 7.x

* Update ElasticsearchStorage.cs

* Ported the BestMatch Middleware Sample to MVC. (#200)

Co-authored-by: Gary Pretty <gary@garypretty.co.uk>

* Refactor of Alexa adapter (#179)

* - Initial Alexa adapter refactor to adopt Alexa.Net
- Moved towards deprecating the AlexaHttpAdapter (kept for backwards compat)

* - Updated Directory Build Props to include StyleCop package
- Enable warnings as errors for Alexa project

* - Added attachment types for directives / cards etc.
- Updated content extension methods to use Alexa.NET and attachments model
- Updated some core adapter logic

* - Added support for Directives
- Updated logic to use attachments as opposed to TurnState
- Further adapter logic updates

* Update GitVersion tag for feature branches

* - Moved method for stylecop

* Update GitVersion to attempt to ensure package names are incremented correctly on each build.

* Updated package dependencies for Alexa adapter

* Updated Alexa Sample

* Update readme for preview package

* Amended middleware and adaper for skills support

* Updates following PR feedback

* Removed ContinueConversationAsync overload  not available until SDK 4.7. Will be re-added later for skills support.

* Add LaunchRequest -> ConversationUpdate logic to middleware as per @pavolum's idea.

* Added message activity concat and suggested actions conversion to google adapter

* Adding configurable flag which will inform the adapter if it should concat multiple text activities in one turn

* minor clean up

* removing google adapter changes, renaming functions, removing suggested action conversion

* Remove unused option

* - Some naming tweaks
- Added policy for handling multiple outgoing activities.
- Added ContinueConversationAsync method

* Move multiple activity policy enum out of options class

* Naming tweak for outgoing activity policy

* Update docs and add automatic end of session when no outgoing activities are sent

* Readme update

* Change default concat policy. Update readme.

* Changes following code review (#195)

* Move the activities list to within the turn context

* Update adapter to make activity processing method virtual and remove multiple activity policy. Improved concat logic.

* Fix speak concat bug

* Add first Alexa tests

* Update README.md

* Update Bot Builder NuGet references

* Updates to Alexa Adapter to pull out core package with request / activity transform logic, attachment types and context extension methods.

* Fix failing test

* Updates to move middleware into adapter. Rename helper to AlexaRequestMapper

* Further refinements of mapper

* Update AlexaRequestMapperOptions.cs

* Updates to mapper / options

* Add Alexa Auth Handler. (#204)

* Rename some methods on Alexa Mapper. Update NuGet packages to 4.8.

* Rename auth handler class name

* Removing old Alexa auth handler

* Fix test project dependencies

* Update Alexa Core project file

* Amend pipeline to try and resolve dotnet pack issue

* Remvoed and re-added Alexa projects to SLN

* Attempt to address issue with GitVersion env vars no longer shared across pipeline tasks

* Update pipeline

* Update Auth Handler (#205)

* Add Alexa Auth Handler.

* Fix crazyness in merge.

* again.

* Add Alexa Skill Id validation check.

* Tabs to spaces

* Add a couple tests.

* Separate skill id check.

* Set ExpectReplies and add more tests.

* Dont NRE when activities is null.

* Release/4.8.0 (#206)

* Google Adapter: Google Content Type not set to UTF-8
* Alexa Adapter: Add person to alexasystem to support Alexa voiceprint to know the ID of the speaker (#198) - Thanks @jamesemann 
* TwitterAdapter: Added unit tests (#197) - Thanks @matiasroldan6 @santgr11 
* DevOps: Azure DevOps Pipelines GitVersion issue
* Dependencies: Update to Bot Framework SDK 4.8

* Fix bug with not handling built in StopIntent

* Add virtual to auth methods (#209)

* Add Alexa Auth Handler.

* Fix crazyness in merge.

* again.

* Add Alexa Skill Id validation check.

* Tabs to spaces

* Add a couple tests.

* Separate skill id check.

* Set ExpectReplies and add more tests.

* Dont NRE when activities is null.

* Make methods virutal for mocking

* Add check for Request being null so we don't throw NRE on bad requests from Alexa.

Co-authored-by: Gary Pretty <gary@garypretty.co.uk>

* Add fallback support for Alexa request types => EventActivity

* Add a simple markdown to plain text converter (#210)

* Add Alexa Auth Handler.

* Fix crazyness in merge.

* again.

* Add Alexa Skill Id validation check.

* Tabs to spaces

* Add a couple tests.

* Separate skill id check.

* Set ExpectReplies and add more tests.

* Dont NRE when activities is null.

* Make methods virutal for mocking

* Add check for Request being null so we don't throw NRE on bad requests from Alexa.

* Add simple markdown formatter

Co-authored-by: Gary Pretty <gary@garypretty.co.uk>

* Update attachment implementation (#213)

* Update attachment implementation to align with BF SDK and work correctly with ABS.

* Added tests for new attachment implementation

* Moved text normalization logic earlier and amended markdown handling (#212)

* Moved logic for text normalization earlier in the pipeline into the MergeActivities method.

* Modified markdown renderer to use period instead of new line. Amended list rendering. Added tests. Changed default to markdown.

* Convert Alexa attachment types to their strong type if needed. (#214)

* Update utility naming to helpers (aligns with SDK / other adapters). (#216)

* Merge attachments in activities so they are available in the last message (#217)

* Merge attachments in activities so they are available in the last message.

* Fix attachments.

* Fix for attachment null property handling

* Update attachment tests

* Remove test for missing attachment properties. Attachments / directives have optional properties, so not all properties will always be present.

* Fix tests failing with equality of ref types

* Project file with additional NuGet dependency

Co-authored-by: Gary Pretty <gary@garypretty.co.uk>

* Update Alexa sample to use latest preview package. Fix assembly name causing Azure deployment issue. Updated sample attachment config.

* Added the Alexa Adapter Sample to the Solution (#220)

The project was missing from the solution so I have now added it as a part of solution.

* Remove conversation type per Activity docs (#229)

* Update Alexa Sample

* Update README.md

* Update readme

* Attempt to resolve NuGet dependency between Alexa packages

* Update project file ref for local NuGet package

* Force alexa project to generate local package

* More...

* Update for nupack

* Fix pipelines pack command

Co-authored-by: Patrick Volum <pavolum@microsoft.com>
Co-authored-by: Nick Ericson <nick.ericson@hotmail.com>
Co-authored-by: Arafat Tehsin <arafattehsin@hotmail.com>

* Feature/adopt alexadotnet (#235)

* - Initial Alexa adapter refactor to adopt Alexa.Net
- Moved towards deprecating the AlexaHttpAdapter (kept for backwards compat)

* - Updated Directory Build Props to include StyleCop package
- Enable warnings as errors for Alexa project

* - Added attachment types for directives / cards etc.
- Updated content extension methods to use Alexa.NET and attachments model
- Updated some core adapter logic

* - Added support for Directives
- Updated logic to use attachments as opposed to TurnState
- Further adapter logic updates

* Update GitVersion tag for feature branches

* - Moved method for stylecop

* Update GitVersion to attempt to ensure package names are incremented correctly on each build.

* Updated package dependencies for Alexa adapter

* Updated Alexa Sample

* Update readme for preview package

* Amended middleware and adaper for skills support

* Updates following PR feedback

* Removed ContinueConversationAsync overload  not available until SDK 4.7. Will be re-added later for skills support.

* Add LaunchRequest -> ConversationUpdate logic to middleware as per @pavolum's idea.

* Added message activity concat and suggested actions conversion to google adapter

* Adding configurable flag which will inform the adapter if it should concat multiple text activities in one turn

* minor clean up

* removing google adapter changes, renaming functions, removing suggested action conversion

* Remove unused option

* - Some naming tweaks
- Added policy for handling multiple outgoing activities.
- Added ContinueConversationAsync method

* Move multiple activity policy enum out of options class

* Naming tweak for outgoing activity policy

* Update docs and add automatic end of session when no outgoing activities are sent

* Readme update

* Change default concat policy. Update readme.

* Changes following code review (#195)

* Move the activities list to within the turn context

* Update adapter to make activity processing method virtual and remove multiple activity policy. Improved concat logic.

* Fix speak concat bug

* Add first Alexa tests

* Update README.md

* Update Bot Builder NuGet references

* Updates to Alexa Adapter to pull out core package with request / activity transform logic, attachment types and context extension methods.

* Fix failing test

* Updates to move middleware into adapter. Rename helper to AlexaRequestMapper

* Further refinements of mapper

* Update AlexaRequestMapperOptions.cs

* Updates to mapper / options

* Add Alexa Auth Handler. (#204)

* Rename some methods on Alexa Mapper. Update NuGet packages to 4.8.

* Rename auth handler class name

* Removing old Alexa auth handler

* Fix test project dependencies

* Update Alexa Core project file

* Amend pipeline to try and resolve dotnet pack issue

* Remvoed and re-added Alexa projects to SLN

* Attempt to address issue with GitVersion env vars no longer shared across pipeline tasks

* Update pipeline

* Update Auth Handler (#205)

* Add Alexa Auth Handler.

* Fix crazyness in merge.

* again.

* Add Alexa Skill Id validation check.

* Tabs to spaces

* Add a couple tests.

* Separate skill id check.

* Set ExpectReplies and add more tests.

* Dont NRE when activities is null.

* Release/4.8.0 (#206)

* Google Adapter: Google Content Type not set to UTF-8
* Alexa Adapter: Add person to alexasystem to support Alexa voiceprint to know the ID of the speaker (#198) - Thanks @jamesemann 
* TwitterAdapter: Added unit tests (#197) - Thanks @matiasroldan6 @santgr11 
* DevOps: Azure DevOps Pipelines GitVersion issue
* Dependencies: Update to Bot Framework SDK 4.8

* Fix bug with not handling built in StopIntent

* Add virtual to auth methods (#209)

* Add Alexa Auth Handler.

* Fix crazyness in merge.

* again.

* Add Alexa Skill Id validation check.

* Tabs to spaces

* Add a couple tests.

* Separate skill id check.

* Set ExpectReplies and add more tests.

* Dont NRE when activities is null.

* Make methods virutal for mocking

* Add check for Request being null so we don't throw NRE on bad requests from Alexa.

Co-authored-by: Gary Pretty <gary@garypretty.co.uk>

* Add fallback support for Alexa request types => EventActivity

* Add a simple markdown to plain text converter (#210)

* Add Alexa Auth Handler.

* Fix crazyness in merge.

* again.

* Add Alexa Skill Id validation check.

* Tabs to spaces

* Add a couple tests.

* Separate skill id check.

* Set ExpectReplies and add more tests.

* Dont NRE when activities is null.

* Make methods virutal for mocking

* Add check for Request being null so we don't throw NRE on bad requests from Alexa.

* Add simple markdown formatter

Co-authored-by: Gary Pretty <gary@garypretty.co.uk>

* Update attachment implementation (#213)

* Update attachment implementation to align with BF SDK and work correctly with ABS.

* Added tests for new attachment implementation

* Moved text normalization logic earlier and amended markdown handling (#212)

* Moved logic for text normalization earlier in the pipeline into the MergeActivities method.

* Modified markdown renderer to use period instead of new line. Amended list rendering. Added tests. Changed default to markdown.

* Convert Alexa attachment types to their strong type if needed. (#214)

* Update utility naming to helpers (aligns with SDK / other adapters). (#216)

* Merge attachments in activities so they are available in the last message (#217)

* Merge attachments in activities so they are available in the last message.

* Fix attachments.

* Fix for attachment null property handling

* Update attachment tests

* Remove test for missing attachment properties. Attachments / directives have optional properties, so not all properties will always be present.

* Fix tests failing with equality of ref types

* Project file with additional NuGet dependency

Co-authored-by: Gary Pretty <gary@garypretty.co.uk>

* Update Alexa sample to use latest preview package. Fix assembly name causing Azure deployment issue. Updated sample attachment config.

* Added the Alexa Adapter Sample to the Solution (#220)

The project was missing from the solution so I have now added it as a part of solution.

* Remove conversation type per Activity docs (#229)

* Update Alexa Sample

* Update README.md

* Update readme

* Attempt to resolve NuGet dependency between Alexa packages

* Update project file ref for local NuGet package

* Force alexa project to generate local package

* More...

* Update for nupack

* Fix pipelines pack command

* Convert other attachments to their strong type (#234)

Co-authored-by: Patrick Volum <pavolum@microsoft.com>
Co-authored-by: Nick Ericson <nick.ericson@hotmail.com>
Co-authored-by: Arafat Tehsin <arafattehsin@hotmail.com>
Co-authored-by: Nick Ericson <nericson@microsoft.com>

* Update README.md

* Update README.md

* Update README.md

* Update README.md

Remove preview label for Alexa adapter

* Change Alexa md renderer to remove trailing periods. Added more tests. (#237)

* Change Alexa md renderer to remove trailing periods. Added more tests.

* Fix link and quote md rendering

Co-authored-by: Gary Pretty <gary@garypretty.co.uk>

* Zoom Adapter (#240)

* Add Zoom adapter project

* Working Zoom adapter including message templates.

* Updated Zoom Readme and made some refactorings to solution

* Update README.md

* Update README.md

* Update README.md

* Zoom adapter request verification (#241)

* Add Zoom adapter project

* Working Zoom adapter including message templates.

* Updated Zoom Readme and made some refactorings to solution

* Fixed Zoom request verification

* Don't escape Text (#238)

* Update project URLs for packages

* Added the class attribute (#242)

..to remain consistent with other adapters.

* Update readmes for Alexa / Zoom to update NuGet instructions

* Update repo readme

* Update README.md

* Update README.md

* Added channel ID to outgoing Zoom activity mapping

Co-authored-by: Jamie D <daltskin@hotmail.com>
Co-authored-by: martinoss <ossmartin@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alex ln <logalex96@gmail.com>
Co-authored-by: Arafat Tehsin <arafattehsin@hotmail.com>
Co-authored-by: Patrick Volum <pavolum@microsoft.com>
Co-authored-by: Nick Ericson <nick.ericson@hotmail.com>
Co-authored-by: Nick Ericson <nericson@microsoft.com>
  • Loading branch information
9 people authored May 4, 2020
1 parent aa4df5e commit fc69ea8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion libraries/Bot.Builder.Community.Adapters.Zoom/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Zoom Adapter for Bot Builder v4 .NET SDK - ***PREVIEW***
# Zoom Adapter for Bot Builder v4 .NET SDK

## Build status
| Branch | Status | Recommended NuGet package version |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ private Activity SetGeneralActivityProperties(Activity activity, ZoomRequest req
activity.From = new ChannelAccount(botNotificationPayload.UserJid, botNotificationPayload.UserName);
activity.ChannelData = request;
activity.Recipient = new ChannelAccount(botNotificationPayload.ToJid);
activity.ChannelId = "zoom";
activity.Conversation = new ConversationAccount(id: $"{botNotificationPayload.AccountId}:{botNotificationPayload.ChannelName}");
return activity;
}
Expand Down

0 comments on commit fc69ea8

Please sign in to comment.