Skip to content

Commit

Permalink
merge master into 4.future (#1850)
Browse files Browse the repository at this point in the history
* Remove library specific implementation of websocket handling

* revert changing protecteds to privates

* Further cleanup websocket connection

* Update tests

* Remove no longer used import

* Use const GET instead of string GET

* fix removed internal export

* Final fixes to websocket connection for DLS compatibility.

* merge scenarios

* WIP, part way through dialogContext.ts

* Fix malformatted user agent JSON

* Add recording support for Roster API

* Fix proxy to support Roster calls

* Fix manifest domains

* updated bot with more scenarios

* Update integrationBot.ts

removed bad lines

* Finish updating DialogContext

* added BF cards + conversationupdate

* Add all settings for VSCode debugger

* added messagereactionbot

* added office365card

* Update activityHandler.ts

WIP

* added roster

* added searchbasedmessagingextension scenario

* [Streaming] create NodeWebSocketFactory, refactor code, new tests (#1331)

* create NodeWebSocketFactory, refactor code, new tests

* Set connected to true after connecting.

* Fix missing ActivityLog

* Update README for script, add initial recordings, cleanup nock helper

* Fix validation for post.

* Add channel add and delete events.  Add more comments to nock-helper

* Add member add-remove from groupchat, more cleanup for nock-helper

* More updates

* [Streaming] Add working ws websocket implementation for Node environment (#1334)

* add working ws websocket impl

* remove unused constants

* More scenarios

* Update typeDoc comments for ActivityHandler and ActivityHandlerBase

* More updates

* minor refactoring fileupload bot and added file handler for integration bot

* removed console.log

* Update README.md

* updated readme/manifest

* Update manifest.json

* Updating all libraries to output es6

* copy edits

* QnaMaker: Rename Prompt -> QnAMakerPrompt

* added task module invocation, updated readme

* added promptCultureModels - parity w/ dotnet

* fixed tests

* added tests for custom defaultChoices

* removed unnecessary overrides

* update root package.json, streaming package.json

* [Streaming] Auth and browser compatibility fixes, linting, refactoring (#1338)

* patch auth in streaming to send token to channel

* apply PR feedback for BotFrameworkAdapter

* move ws server construction to wsNodeWebSocket constructor for browser compat

* cleanup and cache serviceUrl in authenticateConnection

* drop teams specific send

* Finish updating typeDoc comments for dialogContext.ts

* expand ChannelAccount to TeamsChannelAccount

* [Streaming] Pull out streaming bits from botbuilder and move to botframework-streaming (#1348)

* cleanup bf-streaming package.json

* move streaming code and tests to botframework-streaming

* remove @azure/ms-rest-js dependency from botbuilder

* Update cardFactory.ts

Update hero card helper to add optional tap parameter

* cr fk

* updated searchbased scenario to match c# (with tap/select handler)

* final update

updated integrationbot with searchbasedmessaging extension handlers and updated manifest for file upload bot (works only in personal chat)

* Update README.md

* set bot id to empty guid per andrew's request

* helper to send a trace activity (#1355)

* added local teamsCreateConversation helper (#1357)

* [QnAMaker] Active learning low score variation multiplier value (#1359)

Active learning low score variation multiplier value
- PreviousLowScoreVariationMultiplier to 0.7
- MaxLowScoreVariationMultiplier to 1.0

* Fixed passing of CosmosClientOptions

* add random to transcript generated ids and set sent activity.id (#1344)

* add random to transcript generated ids and set sent activity.id

* cleanup and add test

* always set activity.id to resourceResponse.id in logger when present

* added test for CosmosClientOptions

* updated test recordings

* remove .js and .ts from .gitignore, change *.map to *.js.map (#1365)

* Fix integrationBot to match C# (#1379)

* remove typescript devDependency and engine from bf-streaming (#1392)

* [Teams] Call defaultNextEvent after .invoke activity is processed (#1390)

* call defaultNextEvent after .invoke activity is processed

* call the method returned from defaultNextEvent, and add unit test

* Add LG/Expression library (#1381)

* init lg library

* refine code

* fix deploy error

* fix test coverage

* remove xPath and xml functions (#1385)

* [expression] add capability of handling null in string related built-in functions (#1395)

* handling null in string related builtin functions

* remove redundent character

* remove tslint

* fix errors and warnings with eslint

* fix ChoicePrompt none style when set via options (#1373)

* Add Botbuilder-lg to version update command

* Update package.json

* Update package.json

* Update package.json

* Parity ChoicePrompt fix with dotnet (#1400)

* parity ChoicePrompt fix with dotnet

* added confirmPrompt test for null locale

* Stevenic/4.6 dialog parity (#1384)

* Added new DialogStateManager

* Added defaultValue to getValue

* Added state manager tests

* Latest changes

* Ported DialogStateManager from C3

* More robust path parsing...

* Added event emitting support

Also implemented logic to cascade cancel to parent dialogs

* Updated dialog set to support auto id's and dependencies

also replaced "null" with "undefined" htroughout code

* Updated unit tests

* Added unit test for scopes and path resolvers

Fixed issues as detected.

* Added a bunch of dialog state tests

* Added additional unit tests

- Increased code coverage for DialogStateManager
- Fixed issue detected from unit tests.

* Tweaked settings test

* Made DialogContainer.dialogs public

* Fixed code review comment.

* update package.json (#1402)

* [Functional-test] Add chrome browser functional tests (#1389)

* Add browser-functional-tests
- Add browser echo-bot sample
- Setup Nightwatch to run with Chrome
- Add script to run the tests

* Add copyright headers

* Add missing async

* add Activityfactory (#1401)

* add activityfactory

* retrigger CI

* fix comments

* remove unused code

* modify text

* add some comments

* fix param type

* fix template additional newline bug (#1419)

* Add BotFramework-schema license (#1407)

* Fixed several typos (#1422)

* Fixed the wrong function name (#1420)

* [R7, Cherry-pick] Cherry-pick TypeScript 3.5.3 pin from 4.6 branch (#1442)

* [4.6.x] Pin TypeScript devDependency in each library. (Fixes #1436) (#1437)

* move pinned [email protected] devDependency into each package

* pin transcripts/ botbuilder dependencies, fix import in Skype Middleware

* bump to [email protected]

* [4.6.x] Fix set-dependency-versions script (#1438)

* change set-dependency-versions script to use ~ not ^, update changed libs

* use pinned versions for intra-dependencies per @cleemullins feedback

* add [email protected] as devDependency to bb-lg & bf-expressions packages

* Fixed a small issue in var name (#1421)

* [R7] Authentication: Use ADAL to acquire tokens + support certificate auth (#1337)

* Authentication: Use ADAL to acquire tokens + support certificate auth

* Auth: missing piece for cert credentials

* Certificate auth: default to password if no settings are provided

* Cert auth: PR details, remove unused internal interface and shorten if statement

* Cert auth: remove properties after merge

* address PR feedback, add tests for AppCredentials

* refactor in auth stack, pin [email protected], add tests

* BotFrameworkAdapter updates:
* remove useCertificateAuthentication flag in BFAdapter
* cleanup credentialsProvider instantiation
* add & refactor BFAdapter tests
* skip already-silently-failing getTokenStatus() test

* refactor: remove direct cldr-data dep (#1444)

* refactor: remove direct cldr-data dep

* fix: missing path

* LG/Expression parity with C# (till Nov 25) (#1453)

* init

* finisn expression sync

* init lg

* forward

* fix test errors

* forward

* rename test file

* fix comments

* refine

* allows Inspection to attach anywhere within a Teams Team (#1434)

* allows Inspection to attach anywhere within a Teams Team

* additional unit test for inspection of a Teams Team

* fix typo re-introduced with rebase

* [Skills] Add BFHttpClient, ChannelServiceHandler & necessary Auth pieces for Skills (#1448)

* initial commit on BFHttpClient, add @azure/ms-rest-js to botbuilder

* add ChannelServiceHandler

* clean up comments & property in ChannelServiceHandler

* update NotImplemented Errors in ChannelServiceHandler

* add AuthenticationConfiguration

* fix truthy check in JwtTokenValidation

* fix bugs in JwtTokenValidation.getAppIdFromClaims

* slgiht refactor, add initial tests for ChannelServiceHandler

* fix streaming test, cleanup in ChannelServiceHandler.test.js

* Update README.MD (#1463)

* [Skills] Add SkillValidation class (#1461)

* add SkillValidation class

* add SkillValidation.isSkillToken() tests

* add more tests for SkillValidation

* cleanup bf-connector, duplicate necessary auth code in bb-dialogs

* add oAuthScope param to MicrosoftAppCredentials ctor & test

* SkillValidation changes & tests
  * export validateIdentity for testing
  * validateIdentity is not documented as to be "internal"
  * change signature on isSkillClaim to take Claim[]
  * isSkillClaim returns false if audience value is GovernmentConstants.ToBotFromChannelTokenIssuer
  * JwtTokenValidation.getAppIdFromClaims() now takes Claim[]

* [Streaming] Merge streaming branch into master (#1464)

* streaming cleanup, remove *.ts from .gitignore

* move streamingAdapter into folder in botbuilder (#1374)

* cleanup, refactor & merge StreamingAdapter into BotFrameworkAdapter (#1376)

* Don't await for the duration of websocket sessions. (#1412)

* Revert "Don't await for the duration of websocket sessions. (#1412)" (#1417)

This reverts commit 3aea9c0.

* [Streaming, Preview] Update 4.6-preview-streaming branch with 4.6.1 release (#1424)

* [QnAMaker] Active learning low score variation multiplier value (#1359) (#1361)

Active learning low score variation multiplier value
- PreviousLowScoreVariationMultiplier to 0.7
- MaxLowScoreVariationMultiplier to 1.0

* [4.6] cherry-pick #1363 CosmosClientOptions fix (#1367)

* cherry-pick #1363 CosmosClientOptions fix

* Fixed passing of CosmosClientOptions

* added test for CosmosClientOptions

* remove .js and .ts from .gitignore, change *.map to *.js.map (#1364)

* [4.6.1] Manually Cherry-pick #1392 & #1390 to 4.6 branch (#1397)

* manually cherry-pick #1390 to 4.6 branch

* manually cherry-pick #1392 to 4.6

* [Fix #1404, Transcripts] Fix for TranscriptLoggerMiddleware not checking responses type (#1409)

* add test to reproduce issue #1404

* add test or Transcripts where SendActivitiesHandler is not properly implemented

* add bug fix for #1404, more tests

* apply PR feedback and refactor code

* Choice prompt null locale fix [Cherry-pick against 4.6] (#1411)

* parity ChoicePrompt fix with dotnet

(cherry picked from commit 3985a06)

* added confirmPrompt test for null locale

(cherry picked from commit ea2652a)

* typo fix

* [Streaming, Preview] Remove `watershed`, use `ws` in NodeWebSocket (#1425)

* remove watershed socket impl, work on tests

* clean-up bf-streaming package.json, add eslint config

* cleanup BFAdapter streaming tests

* clean up casing on relative imports

* apply PR feedback to NodeWebSocket class

* [Streaming, Preview] rewrite useWebSocket for low-level usage, remove from processActivity (#1433)

* rewrite useWebSocket for low-level usage, remove from processActivity

* [4.6.x] Fix set-dependency-versions script (#1438)

* change set-dependency-versions script to use ~ not ^, update changed libs

* use pinned versions for intra-dependencies per @cleemullins feedback

* [4.6.x] Pin TypeScript devDependency in each library. (Fixes #1436) (#1437)

* move pinned [email protected] devDependency into each package
* pin transcripts/ botbuilder dependencies, fix import in Skype Middleware
* bump to [email protected]

* remove unnecessary enableWebSockets flag, cleanup useWebSocket()

* create Node Interfaces for PR feedback

* revert changes in TranscriptLoggerMiddleware, fix test

* address PR feedback

* [Browser-Functional-Tests] Add browser test build YAML file (#1469)

* Add build yaml file to run browser tests

* Add step by step guide to configure pipeline

* Update yaml file name to browser-tests-build-ci

* Update browser functional test readme local steps

* Johtaylo/skills protocol (#1472)

* init commit

* controller equivalent in typescript

* plumb through authConfig in bf-connector/auth (#1470)

* [Skills] add skill support in BotFrameworkAdapter (#1473)

* add skill support in BotFrameworkAdapter

* address PR feedback

* better exception handling and typing (#1474)

* [QnA Maker] Support for IsTest and RankerType in GetAnswerAsync call in QnAMaker (#1478)

* Add KeySuffix and CompatibilityMode to CosmosDbPartitionedStorage (#1468)

* add compatibility mode and backward compat

* remove semaphore and use promises, fix tests

* Update libraries/botbuilder-azure/src/cosmosDbPartitionedStorage.ts

Co-Authored-By: Michael Richardson <[email protected]>

* Fix attemptCount (#1459)

* Create failing tests

* Fix OAuthPrompt test

* Increment attempt count correctly in all prompts

* Fix Cosmos test data to account for new attemptCount implementation

* refactor BFAdapter for Skills with Auth (#1481)

* Update README.md with the Browser Functional Tests (#1471)

* Remove dead links to unexisting AppInsights sample (#1487)

* Deprecate Payments (#1462)

* change isConnected() to a getter (#1488)

* [Skills] add SkillHandler & SkillConversationIdFactoryBase classes (#1482)

* add SkillHandler & SkillConversationIdFactoryBase classes

* add OAuthPrompt tests for current implementation

* fix bug in SkillHandler, add tests

* more tests

* cache connectorClient in SkillHandler.processActivity(), more tests

* add Skills support to OAuthPrompt, refactor skillHelpers, add tests

* add SkillHttpClient

* update botbuilder HttpClients, add tests

* add BotFrameworkSkill interface

* apply PR Feedback, turn SkillConversationReferenceKey into Symbol

* LuisRecognizer refactor and addition of V3 endpoint (#1479)

* LuisRecognizer refactor and addition of V3 endpoint

* Fixing PR feedback

* Adding missing file header

* Adding tests to V3 scenarios

* Bump version to 4.8

* build: add preview package support (#1490)

* build: add preview package support

* build: tweak logging

* build: get preview version from argv

* build: handle previewVersion not being set

* build: streaming is GA now

* Cherry-pick commits from 4.7 branch to master (#1502)

* add vendor/ to botbuilder-dialogs incl. files (#1493)

* fix casing on relative import references for NamedPipeTransport (#1494)

* fix casing in WebSocketServer (#1495)

* fix more casing issues (#1496)

* fix auth bug, streaming dependencies, add tests (#1498)

* add more js functions (#1505)

* Make IMemory interface follow the convention instead of returning tup… (#1526)

* Make IMemory interface follow the convention instead of returning tuple (#1525)

* retrigger ci

* Fix the value of typings (#1547)

* move @types/lru-cache from devdependency to dependency (#1576)

* remove "dom" from bf-streaming tsconfig and refactor code (#1575) (#1579)

* remove "dom" from bf-streaming tsconfig and refactor code

* remove isBrowser, look for global members instead

* [Cherry-pick] TrustServiceUrl from original conversationReference in SkillHandler (#1590)

* add declarationMap to tsconfig.json in libraries (#1613)

* Cleanup in botbuilder (#1508)

* move InvokeResponse, WebRequest, WebResponse interfaces into separate files

* move streaming constants into streaming/

* Declare return types in waterfallDialog.ts (#1578)

* Declare return types in waterfallDialog.ts

* Fix waterfall-cancel-telemetry-step-name bug

* Roll back bug fix

* Fix Browser Functional Test Build Pipeline (#1600)

* Update chrome driver

* Add caret to chrome driver dependency

* init (#1573)

Co-authored-by: johnataylor <[email protected]>

* Fix browser bot functional tests (#1648)

* Put Chrome tests last

* Add continueOnError: true

* TWeak message-handling-tests.js

* Typo fix.

* Tweak message-handling-tests.js some more

* Restore chrome test order to first.

* Kyled/waterfall cancel telemetry (#1639)

* Create failing test for #1619

* Fix #1619

* Improve #1619 test

Co-authored-by: Steven Ickman <[email protected]>

* Fix Expression mishandles day formats and extends the ability of datetime formating (#1593)

* fix datetime converter

* add test cases

* fix issues

* add a new test

* fix formatDateTime test cases

* add convert for standard datetime format

* fix comments and add more tests

* add a test

* Parity of split function with C# in Expression (#1661)

* parity of split function

* retrigger

* retrigger

* retrigger

* fix a test case

* expand max/min functions (#1674)

* Update sample in Connector readme from v3 to v4 (#1657)

Fixes #1653

* Port  nested foreach\where\select in Expression from C# (#1688)

* port  nested foreach\where\select in Expression

* undo comments

* fix stackedMemory

* fix export and update unit test import (#1693)

* fix export and update unit test import

* further refine import in test code

* add EndOfConversation and Typing activities (#1706)

* Port refactor Structure LG and Analyzer (#1713)

* port refactor Structure LG and Analyzer

* fix lexer and parser

* fix bugs

* fix extractor

* remove comments

* parity test cases and fix bugs

* undo comments in ActivityFactoryTest

* retrigger

* retrigger

* ${} instead of @{} as bounding syntax. (#1717)

* port refactor Structure LG and Analyzer

* fix lexer and parser

* fix bugs

* fix extractor

* remove comments

* parity test cases and fix bugs

* init

* undo comments in ActivityFactoryTest

* retrigger

* retrigger

Co-authored-by: Shuai Wang <[email protected]>

* add deprecate comment to CosmosDbStorage (#1715)

* [Streaming] add generic socket closure handling (#1627) (#1664)

* add generic socket closure handling
* add isConnected to WebSocketServer
* expose new property via BotFrameworkAdapter
* add check to verify socket connection is open in sendActivities

* add optional isConnected to IStreamingTransportServer

* add server.isConnected check to StreamingHttpClient

* apply @christopheranderson PR feedback

Co-authored-by: Christopher Anderson <[email protected]>

Co-authored-by: Christopher Anderson <[email protected]>
Co-authored-by: johnataylor <[email protected]>

* [Docs] Add Bot Functional Test Guide (#1587)

* Add bot functional test blog post
- Add media content of the blog post

* Add Bot deployment task from marketplace
- Update images

Co-authored-by: Billy Delgado <[email protected]>

* rename botframework-expressions to adaptive-expressions (#1718)

* Update typeDoc comments in dialog.ts (#1356)

* WIP

* Update typeDoc comments

Co-authored-by: Steven Ickman <[email protected]>

* Update activityHandler.ts (#1620)

Per changes to best practices. re: Samples [PR 1964](microsoft/BotBuilder-Samples#1964).

Co-authored-by: johnataylor <[email protected]>
Co-authored-by: Chris Mullins <[email protected]>

* ReferenceError: status is not defined (#1456)

Looks like it's copied from the `processActivity` method and the `status` mistakenly left  there

Co-authored-by: Steven Ickman <[email protected]>

* Create new TurnContext using function so that derived classes can override the default TurnContext (#1513)

Like happens in the regular adapter, use helper function to create new instance of the TurnContext so  so that derived classes can override the default TurnContext

Co-authored-by: Chris Mullins <[email protected]>
Co-authored-by: Steven Ickman <[email protected]>

* parity indicesAndValues builtIn function (#1731)

* parity extend foreach and where work with object (#1733)

* support constant [] and {} expression (#1734)

* add isTemplate function (#1735)

* treat everything after first '=' as value for the property (#1737)

* Hash conversationId for App Insights sessionID to keep within max length (#1642)

Co-authored-by: Chris Mullins <[email protected]>
Co-authored-by: Steven Ickman <[email protected]>

* Port: Refactor LG Api (#1740)

* init

* parity

* fix some bugs

* fix test cases

* fix test cases

* fix test cases

* fix comments and conflicts

* remove redundent import

* fix comments

* Enhance the functionality of the + operator (#1749)

* init

* modify + operator

* remove test.ts

* init

* retrigger

* Port: Optimize LG performace (#1752)

* init

* fix test cases

* add doc for function

* fix comments

* fix

* add comments (#1751)

* return http state (#1755)

* [Expression]add string interpolation feature (#1759)

* [Port] Add tests around memory access path (#1760)

* Updated ShowTypingMiddleware to re throw errors (#1761)

* Updated ShowTypingMiddleware to re throw errors

* use finally

Co-authored-by: johnataylor <[email protected]>

* Add Italian Support for Confirm/Choice Prompts (#1500)

* - added Italian support
- Added PromptCultureModels tests

* remove carat from recognizers

Co-authored-by: johnataylor <[email protected]>

* [Port] Forced re-execution expression within template (#1762)

* Forced re-execution expression within template

* retrigger ci

* create browser (es5) output in botframework-streaming (#1764)

* create browser (es5) output in botframework-streaming

* include new browser folder in packed files

* apply PR feedback around exports

* Plumb custom functions throughout. (#1784)

* Added Channels enum in botbuilder-schema for ChannelIds constants (#1757)

* Added Channels enum in botbuilder-schema for ChannelIds constants

* removed commented out code

* add botframework-schema as a bb-dialogs dependency, but hardcoded path, since new bits aren't published

* Removed relative path; added reference to botframework-schema module directly in imports

* changed path in package.json

* Reduce import to only point to only botbuilder-core, as core rquires and exports schema

* OAuthPrompt & OAuthPrompt tests now only reference bb-core, not schema directly

* Added error messages to abortWebSocketUpgrade() (#1741)

* Added error messages to abortWebSocketUpgrade()

* changed unit tests to use trycatch blocks

* changed to error message thrown

Co-authored-by: johnataylor <[email protected]>
Co-authored-by: Chris Mullins <[email protected]>

* Port: LG error related changes (#1785)

* port LG error centralization

* merge changes

* parity code

* fix lg test bugs

* fix bugs

* fix

* fix test cases

* fix assert throw to verify error message

* modify staticChecker

* fix bugs

* fix import

* remove comments

* add signature

* remove unused file

* retrigger

Co-authored-by: Hongyang Du (hond) <[email protected]>

* Treat '@{' an error instead of text in LG (#1768)

* Hond/indexof (#1797)

* Treat '@{' an error instead of text in LG

* modify indexOf and lastIndexOf function

* Storage base tests (#1371)

* - converted CosmosPartitioned tests
- Cleaned up mockHelper

* added CosmosClientOptions test

* - converted cosmosDbStorage tests

* converted BlobStorage tests

* converted MemoryStorage

* - fixed cosmosPartitioned test
- re-recorded tests

* uncommented test

* moved newItem.eTag check to outer if

* moved empty keys/changes checks under the Promise

* *actually* moved throw under the promise. whoops

* minor typo fix

* fixed tests

* fixed tests failing due to doOnce
re-recorded tests

* restore expectedCalls

Co-authored-by: Steven Ickman <[email protected]>

* Port QnAMakerDialog from C# (#1769)

* Added initial work on QnAMakerDialog

* Ported most of the dialog logic.  Needs card factories.

* Add QnACardBuilder

* Complete dialog and card builder

* Updates following code review

* Added unit tests

Co-authored-by: Steven Ickman <[email protected]>

* Updating Teams Types (#1789)

* fixes #1398

* adding type

* updating documentation

* updating typing references

Co-authored-by: Steven Ickman <[email protected]>

* Add gitpod config (#1786)

this commit adds support for Gitpod.io, a free automated
dev environment that makes contributing and generally working on GitHub
projects much easier. It allows anyone to start a ready-to-code dev
environment for any branch, issue and pull request with a single click.

Co-authored-by: Steven Ickman <[email protected]>

* [Expression] Fix result when the second arg is null in lastIndexOf function (#1805)

* fix lastIndexOf behavior parity with c#

* add a test case

* refactor

* [Webpack][ISSUE#818][BotBuilder-AI][BF-Connector] Fix webpack dependency warning (#1540)

* Add getFetch function and tests to botbuilder-ai

* Add setGlobals function and tests to bf-connector

* Update getFetch function

* Update set globals apis from bf-connector

* Add Copyright header to BF-Connector index file

* Update global functions to set fetch and formData

* Remove dom from botbuilder-ai tsconfig

* Add Copyright header

Co-authored-by: Steven Ickman <[email protected]>
Co-authored-by: Steven Gum <[email protected]>

* Initial check-in of flatten, unique and (#1813)

indicesAndValues working over objects.

* migrate c# change in for adding oauth app credentials as a parameter (#1697)

* migrate .net change in for adding oauth app credentials as a parameter

* rename variable

* change turn state key name

* fix use ternary operator

* use CredentialTokenProvider interface that extends UserTokenProvider interface

* remove unused comments

* correct the credentialTokenProvider interface path

* fix import

* fix the dependency chain

* fix parameter name

* fix comments

* fix tests

* fix token resolve test

* fix test

* make webResource interface

* cleanup new interface names

* rename AppCredentialsProvider to AppCredentials

* add back newline

Co-authored-by: Steven Ickman <[email protected]>
Co-authored-by: Steven Gum <[email protected]>

* Marked config classes as deprecated (#1819)

* Add null check for from (#1807)

Co-authored-by: Steven Ickman <[email protected]>

* ci: add auto tagging (#1823)

Co-authored-by: Tom Laird-McConnell <[email protected]>

* Updated the QnAMakerOptions doc on scoreThreshold option to be more explicit on what is a valid number range (#1822)

* added getSignInLink overload (#1803)

* migrate .net change in for adding oauth app credentials as a parameter

* rename variable

* change turn state key name

* fix use ternary operator

* use CredentialTokenProvider interface that extends UserTokenProvider interface

* remove unused comments

* correct the credentialTokenProvider interface path

* fix import

* fix the dependency chain

* fix parameter name

* fix comments

* fix tests

* fix token resolve test

* fix test

* added getSignInLink overload

* - Merge branch 'master' into oauthOverloads
- dropped unnecessary overloads
- added param docstrings

* remove accidental merge file

Co-authored-by: Ted <[email protected]>

* Added buffered delivery mode support. (#1783)

* Added buffered delivery mode support.

* Renamed buffered to bufferedReplies

* Fixed some test issues

* Disabled date tests that don't work in the Pacific Time Zone

* tested end to end plus some fixes

Co-authored-by: johnataylor <[email protected]>

* Fix expression built-in function errors and test errors (#1824)

* fix test error

* replace flat function

* fix typo

* change calling LG api in adaptive

* Ensure that ABS OAuth cards are not sent by the Bot when (#1812)

a community adapters is in use.

Co-authored-by: ckkMicrosoft <[email protected]>
Co-authored-by: Steven Ickman <[email protected]>

* add overridable method to allow injection of cert (#1830)

* add multi lang LG import tests

* Move BotIdentityKey to BotAdapter from BotFrameworkAdapter (#1763)

* Move BotIdentityKey to BotAdapter from BotFrameworkAdapter, makign it available to derived adapters
This is part of skills support
Related to #1523

* Add overload on ContinueConversation to support skills

* allow 3 or more params to continueconversation

* manually revert continueConversation changes

Co-authored-by: johnataylor <[email protected]>
Co-authored-by: Steven Ickman <[email protected]>
Co-authored-by: Steven Gum <[email protected]>

* Added null check for activity.text in ConfirmPrompt (#1826)

Co-authored-by: Eric Dahlvang <[email protected]>

* Support Skills in Azure Government (#1835)

* fix import in testbot

* fix lint errors

* * refactor AppCredentials
* fix more lint errors
* remove ".default" for dotnet parity

* fix gov auth, update govConstants

* refactor to enable gov skills

* Added flags to disable recognizing choices by number or ordinal. (#1820)

Co-authored-by: Eric Dahlvang <[email protected]>

* add getMember and getPagedMember to teamsInfo (#1833)

* add getMember and getPagedMember to teamsInfo

* abstract options object

* examples

* fix test

* add missing awaits

Co-authored-by: Steven Ickman <[email protected]>

* updated NYC dev dependency (#1828)

Co-authored-by: Steven Ickman <[email protected]>

* Port some LG and Expression from BotBuilder-Dotnet (#1834)

* init

* port some changes in LG and Expression

* change filePath to lowercase

* revert substring change

* fix

* fix extra tabs

* retrigger

* retrigger

Co-authored-by: Steven Ickman <[email protected]>

* Remove @types node dev dependency from botframework-streaming (#1795)

* replaced new Server with createNodeServer(); created test INodeSocket2 for type hint

* removed new Func unit test

* consolidated server-creation into 1 utils module; added unit tests

* removed await from Promise.all, as it was originally

* Update libraries/botframework-streaming/tests/NamedPipe.test.js

Co-Authored-By: Christopher Anderson <[email protected]>

* replaced references to @types/node classes with bf-streaming interfaces, minus for the static methods on Buffer and nodeWebSocket.create()

* added more signatures to INodeSocket to remove Socket type dependency from WebSocketTransport

* cleaned up comment

* changed INodeSocket.connect() to return any, as the nested types on signature made it unsuitable to be a Socket (we are not creating interfaces for the multiple layers of node types

* changed Buffer to INodeBuffer type hint

* added type guards to ensure we're getting an INodeServer back from createNodeServer

* added unit test

* added duck typing checks for server methods

* Added methods to INodeSocket to remove dependency on node stream.Duplex type

* put server-creation in trycatch block, as we don't know if node 'net' module might change their Server ctor overloads

* removed space from top of imports in tests

* added false path to checks (whoops, forgot them)

* moved imort below comment

Co-authored-by: Christopher Anderson <[email protected]>
Co-authored-by: Steven Ickman <[email protected]>

* add skillDialog and associated classes (#1771)

* add skillDialog and associated classes

* move non-impl Skill code to core for use in dialogs

* scaffold dialogRootBot and dialogSkillBot

* apply SkillDialog updates from microsoft/botbuilder-dotnet#3474

* rename SkillDialogArgs to BeginSkillDialogOptions

Co-authored-by: Steven Ickman <[email protected]>

* add BFAdapter tests for bufferedReplies and invokeResponses (#1842)

Co-authored-by: johnataylor <[email protected]>

* Fix bug where custom functions were not passed to (#1845)

included .lg files.

* fixed build issues

* resolved lint issues in botbuilder-dialogs-declarative

* fixed tests in botbuilder-dialogs-declarative

* Update LG template content range (#1849)

* adjust template range

* update

Co-authored-by: Daniel Evans <[email protected]>
Co-authored-by: Steven Gum <[email protected]>
Co-authored-by: daveta <[email protected]>
Co-authored-by: Carlos Castro <[email protected]>
Co-authored-by: Tien Suwandy <[email protected]>
Co-authored-by: Jonathan Fingold <[email protected]>
Co-authored-by: JSpru <[email protected]>
Co-authored-by: Steven Ickman <[email protected]>
Co-authored-by: Michael Richardson <[email protected]>
Co-authored-by: johnataylor <[email protected]>
Co-authored-by: Gurvinder Singh <[email protected]>
Co-authored-by: Eric Dahlvang <[email protected]>
Co-authored-by: Hongyang Du (hond) <[email protected]>
Co-authored-by: Chris Mullins <[email protected]>
Co-authored-by: Billy Delgado <[email protected]>
Co-authored-by: Tony Xia <[email protected]>
Co-authored-by: Christopher Anderson <[email protected]>
Co-authored-by: Ali <[email protected]>
Co-authored-by: Emilio Munoz <[email protected]>
Co-authored-by: qinezh <[email protected]>
Co-authored-by: Kyle Delaney <[email protected]>
Co-authored-by: BruceHaley <[email protected]>
Co-authored-by: Shuai Wang <[email protected]>
Co-authored-by: Denise Scollo <[email protected]>
Co-authored-by: shmuelgutman <[email protected]>
Co-authored-by: Gary Pretty <[email protected]>
Co-authored-by: Chris McConnell <[email protected]>
Co-authored-by: Ashley Finafrock <[email protected]>
Co-authored-by: Josh <[email protected]>
Co-authored-by: Diogo Barros <[email protected]>
Co-authored-by: Ted <[email protected]>
Co-authored-by: Tom Laird-McConnell <[email protected]>
Co-authored-by: Kashyap <[email protected]>
Co-authored-by: ckkMicrosoft <[email protected]>
Co-authored-by: Ben Brown <[email protected]>
Co-authored-by: Andrew Clear <[email protected]>
  • Loading branch information
1 parent 732237c commit 370d366
Show file tree
Hide file tree
Showing 640 changed files with 47,510 additions and 18,376 deletions.
13 changes: 13 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@

on: [issues]

jobs:
hello_world_job:
runs-on: ubuntu-latest
name: Tag issues
steps:
- name: Issue tagging
id: issue-autotagger
uses: christopheranderson/issue-autotagger@v1
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
*.zip
*.vscode

# Functional Tests
libraries/functional-tests/**/lib
libraries/functional-tests/**/*.vscode/launch.json

# User-specific files
*.suo
*.user
Expand Down
10 changes: 10 additions & 0 deletions .gitpod.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
FROM gitpod/workspace-full

USER gitpod

# Install custom tools, runtime, etc. using apt-get
# For example, the command below would install "bastet" - a command line tetris clone:
#
# RUN sudo apt-get -q update && # sudo apt-get install -yq bastet && # sudo rm -rf /var/lib/apt/lists/*
#
# More information: https://www.gitpod.io/docs/config-docker/
4 changes: 4 additions & 0 deletions .gitpod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
tasks:
- init: npm install && npm run build
image:
file: .gitpod.Dockerfile
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ This repository contains code for the JavaScript version of the Microsoft Bot Fr

This repo is part the [Microsoft Bot Framework](https://github.com/microsoft/botframework) - a comprehensive framework for building enterprise-grade conversational AI experiences.

| Branch | Description | Build Status | Coverage Status | Windows Bot Test Status | Linux Bot Test Status |
|----|---------------|--------------|-----------------|--|--|
|Master | 4.6.* Preview Builds |[![Build status](https://fuselabs.visualstudio.com/SDK_v4/_apis/build/status/JS/BotBuilder-JS-master-daily)](https://fuselabs.visualstudio.com/SDK_v4/_build/latest?definitionId=460)|[![Coverage Status](https://coveralls.io/repos/github/microsoft/botbuilder-js/badge.svg?branch=master)](https://coveralls.io/github/microsoft/botbuilder-js?branch=master)|[![Build Status](https://fuselabs.visualstudio.com/SDK_v4/_apis/build/status/JS/Run-JS-Functional-Tests-Windows?branchName=master)](https://fuselabs.visualstudio.com/SDK_v4/_build/latest?definitionId=548&branchName=master)|[![Build Status](https://fuselabs.visualstudio.com/SDK_v4/_apis/build/status/JS/Run-JS-Functional-Tests-Linux?branchName=master)](https://fuselabs.visualstudio.com/SDK_v4/_build/latest?definitionId=549&branchName=master)
| Branch | Description | Build Status | Coverage Status | Windows Bot Test Status | Linux Bot Test Status |Browser Functional Tests
|----|---------------|--------------|-----------------|--|--|--|
|Master | 4.8.* Preview Builds |[![Build status](https://fuselabs.visualstudio.com/SDK_v4/_apis/build/status/JS/BotBuilder-JS-master-daily)](https://fuselabs.visualstudio.com/SDK_v4/_build/latest?definitionId=460)|[![Coverage Status](https://coveralls.io/repos/github/microsoft/botbuilder-js/badge.svg?branch=master)](https://coveralls.io/github/microsoft/botbuilder-js?branch=master)|[![Build Status](https://fuselabs.visualstudio.com/SDK_v4/_apis/build/status/JS/Run-JS-Functional-Tests-Windows?branchName=master)](https://fuselabs.visualstudio.com/SDK_v4/_build/latest?definitionId=548&branchName=master)|[![Build Status](https://fuselabs.visualstudio.com/SDK_v4/_apis/build/status/JS/Run-JS-Functional-Tests-Linux?branchName=master)](https://fuselabs.visualstudio.com/SDK_v4/_build/latest?definitionId=549&branchName=master)|[![Build Status](https://fuselabs.visualstudio.com/SDK_v4/_apis/build/status/SDK_v4-CI?branchName=master)](https://fuselabs.visualstudio.com/SDK_v4/_build/latest?definitionId=731&branchName=master)

[![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/Microsoft/botbuilder-js/blob/master/LICENSE)
[![Gitter](https://img.shields.io/gitter/room/Microsoft/BotBuilder.svg)](https://gitter.im/Microsoft/BotBuilder)
Expand Down
Loading

0 comments on commit 370d366

Please sign in to comment.