Skip to content
This repository has been archived by the owner on Jun 30, 2022. It is now read-only.

Commit

Permalink
[Botskills] Add tests for the unrecognized scopes warning (#2706)
Browse files Browse the repository at this point in the history
* Using country and region in code and comment (#2385)

* [calendar] Add support for utterance like "my manager" or "his boss" (#2197)

* add support for utterance like "my manager" or "his boss"

* fix GooglePeopleService

* fix error with "Possessive"

* fix the problems

* fix problem

* fix some problem

* added nuget source to props file

* fix parse number exception (#2381)

* [Calendar] return both tel number and meeting link when join meeting (#2338)

* add join meeting link

* add test

* add onlinemeetingurl check

* rename EventJoinLink to OpenDefaultApp

* [Maintenance] Realign production & experimental skill directories (#2420)

* Move phone and automotive skills under experimental directory
Rename restaurantbooking to restaurantbookingskill
Move bingsearchskill up one directory to follow same format as other experimental skills

* Fix restaurantbookingskill namespace errors

* Fix additional usings in restaurantbookingskill

* [Skills] convert location to timezone (#2301)

* convert location to timezone

* remove useless field

* update function name

* [Android] UI refactoring and bug fix (#2383)

* [Android] #2232 refactored navigation drawer and settings view

* [Android] fixed #2235 default assistant app

* [Android] #2238 keep screen on config

* [Android] fixed #2235 start listening without showing app UI

* [Android] fixed null pointer exception in speech service

* [Android] #2233 default configuration provided by a configuration file

* Refactor Samples directories (#2437)

* Move analytics to /docs/assets and update the Power BI doc with a download button

* Move Android apps to /android/clients
Deprecate the csharp simple speech app (replacing with kona client)
Deprecrate the typescript webchat

* Refactors assistants to
/samples/csharp/assistants/EnterpriseAssistant.sln
/samples/charp/assistants/HospitalityAssistant.sln

Added build.props and .ruleset files to both

* Move all csharp clients to a single solution.
Rename assistant-ConsoleDirectLineSample to DirectLine.Web
Rename assistant-WebTest to WebChatWithLinkedAccounts.Web
Add. build.props and .ruleset

* Update README.md

* Refactor Skill directories (#2435)

* Skills:
Remove src directory
Move all tests to /skills/csharp/tests
Rename all test projects as {SkillName}Tests
Move Phone & Automotive Skill projects at same level as other experimentals

* Update test namespaces to {Skill}.Tests
Update TestBases to {Skill}TestBase

* Fix ruleset reference

* Reorder usings

* Fix tabe spacings

* Rename tests directories to match project names

* Refactor Libraries directories to SDK format (#2436)

* Rename /libs to /libraries to match SDK
Rename libraries solution to Microsoft.Bot.Builder.Solutions
Extract test projects to /tests directories

* Fix .snk file references

* Update to:
\sdk
    \csharp
        \build
        \libraries
            \microsoft.bot.builder.skills
            \microsoft.bot.builder.solutions
        \tests
            \microsoft.bot.builder.skills.tests
            \microsoft.bot.builder.solutions.tests
        Microsoft.Bot.Builder.Solutions.sln

* Rename microsoft.bot.builder.skills to microsoft.bot.builder.solutions.skills
Refactor typescript libraries to follow
\sdk
    \typescript
        \libraries
            \botbuilder-skills
            \botbuilder-solutions

Move .ps1 files to \build and update references within
Update yaml files with new references (csharp and typescript)
Remove VirtualAssistant.ruleset at root

* Updated npm pack references from \build\outputpackages directory

* Fix reference to Skills project in solution
Rename Skills test folder to Microsoft.Bot.Builder.Solutions.Skills.Tests

* Match botbuilder.solutions.skills.yml to new directory

* Remove .snk file from /build directory as it is duplicated in /sdk/csharp/build

* Move \yaml as subdirectory under \build

* Fix ref to microsoft.bot.builder.solutions.skills directory

* skill fixes (#2449)

* POI: align tests to code, update lu
* Bing search: add locale to GetSearchResult, update lu

* [Lib] Skill Middleware update to clear conv state when skill is cancelled (#2441)

* Added fix to clear conversatoin state when skill is cancelled.

* Refactor Samples directories (#2437)

* Move analytics to /docs/assets and update the Power BI doc with a download button

* Move Android apps to /android/clients
Deprecate the csharp simple speech app (replacing with kona client)
Deprecrate the typescript webchat

* Refactors assistants to
/samples/csharp/assistants/EnterpriseAssistant.sln
/samples/charp/assistants/HospitalityAssistant.sln

Added build.props and .ruleset files to both

* Move all csharp clients to a single solution.
Rename assistant-ConsoleDirectLineSample to DirectLine.Web
Rename assistant-WebTest to WebChatWithLinkedAccounts.Web
Add. build.props and .ruleset

* Update README.md

* Refactor Skill directories (#2435)

* Skills:
Remove src directory
Move all tests to /skills/csharp/tests
Rename all test projects as {SkillName}Tests
Move Phone & Automotive Skill projects at same level as other experimentals

* Update test namespaces to {Skill}.Tests
Update TestBases to {Skill}TestBase

* Fix ruleset reference

* Reorder usings

* Fix tabe spacings

* Rename tests directories to match project names

* Refactor Libraries directories to SDK format (#2436)

* Rename /libs to /libraries to match SDK
Rename libraries solution to Microsoft.Bot.Builder.Solutions
Extract test projects to /tests directories

* Fix .snk file references

* Update to:
\sdk
    \csharp
        \build
        \libraries
            \microsoft.bot.builder.skills
            \microsoft.bot.builder.solutions
        \tests
            \microsoft.bot.builder.skills.tests
            \microsoft.bot.builder.solutions.tests
        Microsoft.Bot.Builder.Solutions.sln

* Rename microsoft.bot.builder.skills to microsoft.bot.builder.solutions.skills
Refactor typescript libraries to follow
\sdk
    \typescript
        \libraries
            \botbuilder-skills
            \botbuilder-solutions

Move .ps1 files to \build and update references within
Update yaml files with new references (csharp and typescript)
Remove VirtualAssistant.ruleset at root

* Updated npm pack references from \build\outputpackages directory

* Fix reference to Skills project in solution
Rename Skills test folder to Microsoft.Bot.Builder.Solutions.Skills.Tests

* Match botbuilder.solutions.skills.yml to new directory

* Remove .snk file from /build directory as it is duplicated in /sdk/csharp/build

* Move \yaml as subdirectory under \build

* Fix ref to microsoft.bot.builder.solutions.skills directory

* skill fixes (#2449)

* POI: align tests to code, update lu
* Bing search: add locale to GetSearchResult, update lu

* Added fix to clear conversatoin state when skill is cancelled.

* changed to clear conv state instead of delete

* [VA] Convert template to use LG (#2457)

* added lg files

* added cards

* updating tests

* using resource explorer

* Revert "using resource explorer"

This reverts commit 3142d66.

* everything but multilanguage

* fixed adaptive card tests

* commented multi lang tests

* added sdk preview package src to build props

* updated paths in tests

* updated lg loading in tests

* [Weather] update lu (#2451)

* [] () is separated in en, zh due to ludown's bug
* None is added from General
* Use CheckWeatherValue instead of GetForecast

* [POI] add ShouldInterrupt for SelectPointOfInterestPrompt, SelectActionPrompt (#2268)

* Based on how RouterDialog handles DialogTurnStatus.Empty
* Add test RouteToPointOfInterestAndInterruptTest
* fix selectAction (Teams supports 1.1?)

* [Lib] Refactored routerDialog (#2458)

* refactored routerDialog

* updated method documentation

* [VA] ActivityHandler implementation with RouterDialog changes (#2464)

* add missing stylecop ruleset

* removed cancel and escalate dialogs

* moved escalate and cancel responses into main.lg

* changed dialog bot to defaultactivityhandler

* removed dialogbot

* removed qna maker tests

* refactored main dialog with new router dialog

* refactored onboarding

* switched to activity handler

* updated to daily packages

* updated tests

* small change

* [ITSM] make use of number  (#2375)

* remove SimpleWhitelistAuthenticationProvider

* [ITSM] make use of number

* add CountTicket, CountKnowledge
* update navigation of Knowledge, Ticket

* [Samples] Add relevant skills to VA samples (#2479)

* Add relevant skills to hospitality assistant solution

* Add relevant skills to enterprise assistant solution

* [VA] Added "repeat last message" logic (#2484)

* added repeat logic to main

* added repeat test

* [Weather] use Latitude & Longitude if possible (#2447)

* remove sample, bug fix

* [Weather] use Latitude & Longitude if possible

* add Service.GetLocationByGeoAsync

* update manifestTemplate

* [VA] Implemented SDK telemetry fix for websocket connection (#2490)

* updated to latest preview packages

* implemented telemetry fix

* fixed broken tests

* [Lib] add OpenDefaultApp event model in Solutions (#2349)

* add OpenDefaultApp event model

* add access modifier

* add map and music uri

* rename MapUri to MapsUri

* add more exception type (#2357)

* Update cognitivemodels.json

Update the cognitive models with empty entries for LUIS apps

* Delete HospitalityAssistant.sln (#2508)

HospitalityAssistant and hospitalityassistant are merged in windows..

* add copyright headers, null checks (#2514)

* [Solutions] Defensive checks for ContentModerator Middleware (#2505)

* Defensive checks for empty constructor params and empty activity

* correction

* [Skills] sync deploy scripts by templates (#2486)

* [ITSM] add buttons for update/close (#2439)

* add buttons to ticket card

* add providers

* [ITSM] replace flow when "close/update"

fix code style in Startup

* [ITSM] remove Token from state (#2487)

* move OpenDefaultApp to correct folder (#2509)

* [Android] Fix gradle files for CI/CD & add App Center (#2497)

* Removed gradlewrapper at project root, added to app directory including .jar file

* Added app center configuration to json assets and mainactivity onCreate()

* Add local.properties to .gitignore

* Delete local.properties

* Move .gitignore changes to Android app directory

* Fix version in gradle

* Move app center config from dlspeech to app configuration

* Update default_configuration.json

Fix bad json

* [HospitalityVA] fixes (#2546)

* upgrade to 4.5.4 as skills
* change namespace to HospitalitySample as ResourceManager

* [ITSM] updates for tickets, navigation (#2545)

* [ITSM] reorder lu files

* deploy_cognitive_models.ps1 will deploy all lu files in 1st level
* ludown translate will only write to 1st level (ignore now)

* [ITSM] updates for ticket

* use pattern instead of simple entity in lu
* add title (it is used as search text)
    - Cards, lu, logic, service
* add search (when title is not a proper name)
* update format of SharedStrings

* [ITSM] update navigation

* handle more exception type (#2537)

* [Calendar] support search meeting by title/attendee/location (#2494)

* support search meeting by title/attendee/location

* add test case

* remove question when only find one meeting

* update test cases

* fix code style

* [Calendar] update create meeting flow wording (#2528)

* update wording

* only show one email when find user by email address

* update test cases

* Pull "next docs" into next branch (#2549)

* [Docs][Next] introduce new working structure (#2477)

* Introdouce new layout

* Replace underscores with hyphens in tutorial file names

* update tutorial doc titles

* Moved manual auth doc under auth

* move template outline to overview

* Convert "extend a v4 bot with skills" reference to tutorial

* Refactored v4 bot->skill conversion doc to tutorial

* Move deployment refs under help/reference
Move powerbi doc under tutorials

* fix file name

* Move manual va deployment steps to tutorial format

* Convert existing power bi doc to tutorial
Add carousel of power bi images
Link to prerequisites
Replace all ## Intro with ## {{page.title}} for intro docs

* Update power bi template, screenshots, analytics tutorial using new Virtual Assistant analytics sample name
Fixed bugs in template with old query error warnings

* Updated speech tutorial, started template overview

* updates

* Add favicon and include page title in header

* further content

* final content

* Updated favicon with latest asset

* Rename "in this how-to/reference" to "in this topic"

* Rename Intro instances to Introduction
Increase min-width of page to 90%

* Add jekyll-toc to enable styling individual page table of contents on the right

* Update toc of handbook docs

* Update index and va overview

* Update VA Overview

* Add icon assets, update skill overview, index

* Update config to use bootstrap standard classes

* skils doc

* Add TOC to skill samples
Update index, skill overview, va overview
Add css to clean up header, toc, nav bar style

* Update intro of va overview

* Clickable cards and style updates

* fix toc on all

* Update transcript links

* formatting

* Rename files to add hyphens for spacing

* Update a host of links under next steps of tutorials

* Address #2532

* address #2498

* capture cahnge from #2491

* capture change from commit d90308e

* [ITSM] return error if could not get user id (#2492)

* Update MainDialog.cs (#2536)

Use score > 0.5 for OnInterruptDialogAsync

* pedantic fix (#2521)

* Refactor Onboarding state to UserProfile and updates to LG to make use of UserProfile state and provide more response variation

* correct accessor name

* Update style on handbook/overviews to use ** instead of ` in classes, filenames

* [Android] Bug fixes and speech sdk upgrade (#2527)

* [Android] fixed #2422 app only says last message

* [Android] speech sdk upgraded to 1.7.0

* [Android] fixed #2526 app will crash if no attachment layout provided

* [Calendar] add auth steps before call api (#2382)

* add auth steps before call api

* fix merge issue

* fix test

* [Email] Fix as designer's suggestion (#2512)

* fix as designer's comments

* fix translation issue

* change find contact flow

* support find event by time (#2551)

* Extension method.

* [EnterpriseAssistant] Replace Enterprise Template VA with VirtualAssistantSample using LG (#2550)

* Rename sample assistant directories to hyphenate between words
Add Virtual Assistant Sample to enterprise-assistant solution

* copy over build props from va template

* renamed extension method

* [POI] update flow (#2511)

* use reject/select none to reprompt set current location
* use reject/select none to cancel poi selection

* Add enterprise assistant content with latest formatting, usine same formatting on hospitality assistant

* Add tip for oauth connection name

* Updated LG packages, new lg responses

* [Email Skill] resouce translate issue fix (#2554)

* fix as designer's comments

* fix translation issue

* change find contact flow

* fix resource

* fix tests with variable responses from LG

* [POI] geo uri doc (#2562)

* [ToDo] Fix as designer's suggestion (#2548)

* change markToDo reply

* hotfix: luis and responses

* cover tests

* luis issue

* modify wordings as designer's suggustions

* new startover message, supress completion in a few places

* replace the OpenDefaultApp (#2572)

* [Docs] Capture review notes (#2578)

* Address index changes

* Capture overview feedback

* captured skill overview feedback

* [Skills] update google support doc (#2576)

* update google support doc

* fix number

* Update calendar.md

* Update email.md

* [POI] convert to data uri to hide subscription key (#2571)

* [Sdk] do not send Handoff (#2522)

* [POI] fix test (#2581)

* [Skills] set telemetry (#2561)

* [botskills] update split and err (#2575)

* [Weather] use IsNaN instead of comparison (#2588)

* move APIToken from conversation state to turn state (#2569)

* [VA][Skill] fix event, remove BuildServiceProvider (#2579)

BuildServiceProvider and runtime one are not same one

* [Skills] add/update transcripts (#2580)

Hospitality, POI, ITSM

* [Restaurant] update transcript and data uri code (#2582)

* updated to sdk 4.6.0-rc0 (#2593)

* [Libs] Deprecated routerDialog moved changes to ActivityHandlerDialog (#2585)

* Changed routerDialog to dispatchDialog and deprecated routerDialog

* renamed dispatchDialog to activityHandlerDialog

* changed deprecation message

* reverted project changes

* reverted changes to sample

* updated summaries and comments

* Update RouterDialog.cs

* readme

* added myget to build.props for libs

* update VASample with 4.6rc (#2595)

* multi locale LG, localization, tests

* [ITSM] use dot instead of number to remove single '1' step (#2599)

* [VA] Updated to latest sdk and libs (#2601)

* main dialog changes

* updated packages

* removed unused nuget package

* updated build props to remove declarative source

* updated comments and moved const fields

* small comment update

* [Sdk] fix BotTestBase (#2598)

If not fix, it will return empty list

* lib updates and post merge (#2603)

resolved

* update calendar and news transcript (#2597)

* [Email] Update doc and transcripts (#2592)

* fix email doc

* fix comments

* Fix comments

* [ITSM][POI] transcripts (#2591)

* [ITSM][POI] transcripts

POI
* Fix converting AzureMaps
* Convert Foursquare in transcript
ITSM
* "ShowExistingToSolve" before searching knowledgebase before creating
ticket (already included in transcript)

* rephrase converting to data uri

* update doc (#2590)

* add bing search transcript (#2600)

* Proactive notifications tutorial and make samples shared (#2610)

* EventProducer: add userid to app settings and variables in program.cs for all app settings.
VASample: add proactive notifications support

* Move event handler and producer projects to samples/csharp/clients so that they can be shared with other assistant samples in the future.

* Add rouge highlighter for code syntax highlighting
Begin conversion of existing Enterprise Notifications doc to Enable Proactive Notifications tutorial

* Update tutorial doc

* update comments in eventhandler

* Rename event sample directories with hyphens for spacing

* Doc Updates (#2611)

* [Android] Add Crashes SDK and update docs (#2566)

* Add crash SDK and telemetry for Activity Sent, Activity Received, Send VA.Location Event

* Start analytics in app

* Update doc with improved padding
Add empty doc for event companion
Update virtual assistant client doc with screenshots

* Remove typo

* Fix toc

* updated docs of event companion app

* Fix broken character that prevents docs generating

* [VA] Cleaned up comments and moved to 4.6-preview-rc1 libs (#2612)

* updated packages

* cleaned up comments

* cleanup

* small update

* [Calendar] update document and fix some issue (#2589)

* update doc and code

* update test

* fix comments

* [Calendar][POI] add tel prefix in telephone uri (#2616)

* add tel prefix in telephone uri

* add poi tel prefix

* [Skills] Update the SDK version to the latest RC (#2614)

* update skills sdk to new rc

* add botbuilder daily build feed

* Added What's New Content to Docs Site (#2618)

* Added What's New Content to Docs Site

* Fix whats new intro

* Update ActivityHandlerDialog.cs

* Navigation Structure for Docs Update (#2617)

* Navigation Structure for Docs Update

* Move tutorials

* Move notifications and analytics tutorials

* Update ActivityHandlerDialog.cs

* Updated ActivityHandlerDialog.cs

* Updated VirtualAssistantSample.csproj

* [Skill Template] Updated with new libs, LG, activity handler, main dialog changes (#2613)

* updated skill template

* updated to using activity templates

* remove unecessary refs (#2604)

* Rename speech tutorial to reference direct line speech

* Added support for teams authentication (#2619)

* support for teams auth

* added event names to multi-auth validation

* Fixed broken tests

* Updated VirtualAssistantSample.csproj

* [Skills] use single comma for scopes (#2560)

* Update VirtualAssistantSample.csproj

Update to rc3 libraries for teams fix

* Clean up speech tutorial and event companion app

* [Calendar] update wording (#2609)

* update wording

* fixed retry

* Broke Apart Experimental Skills and Updated What's New and Virtual Assistant Overview. (#2637)

* Completed Link check for Clients and Channels section. (#2638)

* fix extra luis call (#2634)

* [Docs] Update links in Overview, VA, Skill, Solution Accelerator sections (#2640)

* Updated links from reviewing home and overview

* Begin review of solution accelerators section

* Review the rest of solution accelerators

* Updated Skills sections

* Update VA section

* Updated FAQ links
Updated names of create,customize,deploy VA tutorials

* [ToDo & Weather] Update transcripts (#2628)

* update doc

* update todo transcripts

* update weather skill transcripts

* [HA] update docs (#2626)

* Clean up speech tutorial and event companion app

* [HA] update docs

* remove event
* bug fixes

* [Calendar] update wording (#2609)

* update wording

* fixed retry

* Broke Apart Experimental Skills and Updated What's New and Virtual Assistant Overview. (#2637)

* Completed Link check for Clients and Channels section. (#2638)

* fix extra luis call (#2634)

* [Docs] Update links in Overview, VA, Skill, Solution Accelerator sections (#2640)

* Updated links from reviewing home and overview

* Begin review of solution accelerators section

* Review the rest of solution accelerators

* Updated Skills sections

* Update VA section

* Updated FAQ links
Updated names of create,customize,deploy VA tutorials

* [ToDo & Weather] Update transcripts (#2628)

* update doc

* update todo transcripts

* update weather skill transcripts

* [HA] update docs

* remove event
* bug fixes

* Update EA/proactive notifications docs to refer to deployment coming soon. Clean up PN with duplicate content explaining Azure resources .
Clean up index.
Rename redundancy in skill tutorial names

* [Android] Button to reinitialize speech service  (#2607)

* [Android] removed unused service binder

* [Android] upgraded adaptive cards sdk to 1.2.3

* [Android] fixed connection leak error

* [Android] #2567 reinitialize speech service

* Fix broken tests, and update to 4.6.1 (#2636)

* fixed auth issues

* update to 4.6

* fix for off-by-one day error

* fixes skill tests

* update to 4.6.1 in VA

* updated skill template to 4.6.1

* updated libs to 4.6.1

* updated props files

* updated mock appsettings buildaction

* commenting broken test

* fix to user conversation.user.id

* fix summary tests utc issue

* added provider variable

* Fix null reference exception in ScheduledTask.AddScheduledTask (#2416)

By initialising the list of Tasks in the base class constructor

* fix todo test (#2629)

* Enterprise VA Sample with proactive notifications and multi-turn QnA (#2641)

* Update to latest template changes that enable teams activity handler and latest LG locale references

* Revert to base VA sample and fix proactive docs

* Update general/dispatch luis class with HR benefits

* Add QnA Dialog for multiturn KBs, with HR Benefits as the sample to demo

* Implement proactive notifications changes in VA

* clean up notification clients

* Address PR comments
Fix event handler bug

* Allow user to exit multiturn dialog and send query back along main dialog stack

* add hospitality multi lan lu (#2653)

* [Email] update to activity handler (#2633)

* update to new structure

* fix pkg path

* fix pkg ref

* try fix

* add more exception type

* [Skills] use DefaultActivityHandler (#2647)

Event, Hospitality, ITSM, Restaurant Booking

* update lib to 4.6.0 (#2650)

* [Skills] add mit license header (#2631)

* [Skills] add mit license header

* Exp Skills: Automotive, BingSearch, Event, Hospitality, Music, News,
Restaurant Booking, Weather
* Skills: Calendar, Email, POI, ToDo
* Skill Tests: Automotive, Calendar, Email,Phone, POI, ToDo

* [VA] add mit license header

* Assistant: Enterprise
* Template: Customer Support, Enterprise, Skill, VA

* [Sdk] add mit license header

* [Calendar] Add retry count limitation (#2524)

* add retry limitation

* remove translate file

* set max reprompt count as const

* fix test

* Add name extraction for onboarding (#2120)

* add name extraction for onboarding

* Add name extraction for onboarding

* Rename some files

* move onboarding model into general model

* fix a problem

* rename OnboardingState to AssistantState

* make the changes in Template

* fix some format

* fix format

* remove old file

* update format

* fix search by time in prompt (#2646)

* [Hospitality] LateCheckOut uses time (#2652)

* Remove redundant luis calls

* add location event support in news skill (#2662)

* update to rc2 (#2660)

* move skills functionalities into solutions package (#2666)

* [Lib] Added skill switch dialog (#2671)

* Added skill switch dialog to lib

* moved files

* variable for prompt id

* renamed to switch skill dialog

* Update SwitchSkillDialog.cs

* [skills] update to ActivityHandler (#2667)

* removed fallback from lib (#2672)

* [VA] dotnet 3.0 update (#2644)

* Update va to .net3.0

* cleanup

* readme

* readme

* readme

* readme

* [VA] Skill switch dialog (#2665)

* simple implementation

* update

* update

* working

* update

* added skillSwitchDialog

* revert unneeded changes

* spacing

* added check for current skill dialog

* updated tests

* resolve comments

* fixed file encoding

* [Templates] Update the VATemplate and SkillTemplate to latest solutions lib (#2674)

* update templates to use the latest lib

* revert unnecessary changes

* revert unnecessary changes

* Update VirtualAssistantSample.csproj

* [POI] use activity handler (#2632)

* [POI][Todo] restore deploy scripts (#2681)

* [POI] search for category when valid (#2683)

* Change phraseList keyword to list KeywordCategory
* IGeoSpatialService: add GetPointOfInterestListByCategoryAsync
* Add Category to state and use when valid
* Add GetPointsOfInterestByCategoryTest,
RouteToPointOfInterestByCategoryTest

* add bing spell check (#2682)

* [Calendar] provide more reasonable time setting when book meeting  (#2655)

* fix time range

* simplify code

* remove blank line

* [Automotive] remove repeat input (#2686)

* remove repeat input

* remove needless codes

* fix error

* [ITSM] add tests (#2621)

* ServiceNowServiceTests
* TicketCreateFlowTests, TicketShowFlowTests, TicketUpdateFlowTests,
TicketCloseUtterances
* KnowledgeShowTests

* Archive Enterprise and Customer Support template (#2676)

* add event debug support (#2685)

* [Lib] Add support for Luis sentiment (#2624)

* add support to sentiment

* fix comments

* [Sdk] restore ManifestTemplateFilename (#2695)

* [Sdk] restore ManifestTemplateFilename

* fix test

* fix test

* [Template] remove usage of MicrosoftAppCredentials since it's not used any more (#2678)

* remove registration of microsoftappcredentials since it's not needed in latest SDK

* remove registration of microsoftappcredentials since it's not needed in latest SDK

* bring back the variable but not register it

* remove overlap intents (#2697)

* [Tools]add synchronize_deploy_scripts.ps1 (#2698)

* [Skills] sync none to general's (#2696)

* [POI] parking requires current location (#2694)

Add MunicipalitySubdivision to AddressAlternative

* [Hospitality] add tests (#2693)

* Add IHotelService for UserReservation data
* GeneralFlowTests
* CheckOutFlowTests, ExtendStayFlowTests, GetReservationFlowTests,
LateCheckOutFlowTests, RequestItemFlowTests, RoomServiceUtterances

* added support for change text and title for multi provider auth card (#2699)

* [Calendar] check available dialog (#2661)

* add check available api

* add check available api

* change find meeting times to get schedule

* add slot filling step

* refactor result from get schedule api

* add find next available time

* handle some corner cases

* only get one contact when check available

* fix test

* refine flow

* translate response

* add check available test

* add slot filling test

* add corner case test

* apply restricted time in check available flow

* add pre-commit hook to check copyright & license (#2649)

* [Skills] Enable anonymous skill (#2692)

* allow anonymous access to skill to enable local debugging of skill

* add more checking

* move async functions out of the constructor

* Add new manifests used for tests

* Add tests related to the scenarios of unrecognized scopes warning

* Fix ESLint issues

* [C#][VA/Skill] Integrate specific cultures (#2368)

* Update Virtual Assistant and Skill templates

* Update Virtual Assistant sample

* Update Skill sample

* Rename files in Skill template and sample

* Fix merge conflicts

* Fix merge conflicts with itsmskill

* Update responses files

* Add fallback implementation in VA and Skill

* Update mainResponses file

* Add unit tests for GetCognitiveModels

- Update MainDialog

* Add missing files

* Update GetCognitiveModels in Templates C#

* Update GetCognitiveModels in Samples C#

* Update fallback implementation in samples

* Update fallback implementation in templates

* Use getCognitiveModels method at localizedServices

* Fix tests in Virtual Assistant sample

* Remove Main, Shared and Sample folders

* Update defaulting localization test in Skill sample

* [TypeScript][VA/Skill] Integrate specific cultures (#2290)

* Update Virtual Assistant and Skill templates

* Update generator

* Update Skill sample

* Update Virtual Assistant sample

* Add fallback implementation in VA and Skill

* Fix tests in Virtual Assistant

* Fix cognitiveModels in Skill Template

* Add tests for fallback implementation in Skill & VA sample

* Add tests for fallback implementation in templates

* Update test and fallback implementation on template

* Update test and fallback implementation on samples

* Move GetCognitiveModels method in samples

* Move GetCognitiveModels method in templates

* Update README.md

* Update README.md

* [Skills] dotnet updates (#2684)

* updated calendar skill to dotnet3.0 and rc6 solutions package

* updated email to 3.0 and rc6 solutions lib

* updated to do skill and tests

* updated POI to dotnet 3.0

* remove fallback

* started experimental skill updates

* style fixes

* finished updating experimental skills and stylecop fixes

* updates to poi and itsm

* cleanup

* Update README.md

* [Sdk] provide full PromptOptions for SwitchSkillDialogOptions (#2717)

* [Sdk] change promptSettings to list to match each authenticationConnections (#2714)

* Update Microsoft.Bot.Builder.Solutions.csproj (#2718)

* [Template] Update the libs version (#2708)

* update libs version to rc7 and 4.6.32

* update solutions package to be 4.6.0

* [Botskills] Implement multilanguage functionality (#2131)

* Implement ESLint

* Modularize methods and implement multilanguage in connect

* Modularize methods and implement multilanguage in disconnect

* Modularize methods and implement multilanguage in update

* Modularize methods and implement multilanguage in refresh

* Fix ESLint issues

* Add an util to get dispatch values

* Add, update, remove mocks files

* Fix and add new tests with the multilanguage implementation

* Remove unnecessary warning and related test

* Update documentation

* Cleanup files

* Update build.botskills.ts.ps1

* Fix npm pack path (#2720)

* fix proactive doc link issue (#2711)

* Replace all links of /tree/next and /blob/next with /tree/master and /blob/master (#2723)

* [Templates] Updated VA and Skill template vsix projects to latest (#2719)

* updated va template

* updated skill vsix

* Update SkillSample.yml

* Update VirtualAssistantTemplate.yml

* [POI][ITSM] fix (#2712)

* [Calendar] find contact dialog refactor (#2713)

* refactor find contact dialog

* update test case

* [Skills] Updated skill projects to use full locale (#2727)

* updated skill projects to use full locale

* Update BotServices.cs

* fixed spellcheck setting

* Fix for manifest generation

* [Template] Updates skill template to .netcore3.0 (#2730)

* update skill template to 3.0

* updated readme

* Updated skill package reference

* Updates skills to use getCognitiveModels

* Updated experimental skills to use getCognitiveModels

* itsm - moved lu file

* Fix for broken locale in skills

* fix bg image issue (#2732)

* [Calendar][Email] fix lu (#2710)
  • Loading branch information
Batta32 authored and lauren-mills committed Nov 26, 2019
1 parent e9c4969 commit 5f06524
Show file tree
Hide file tree
Showing 6 changed files with 269 additions and 7 deletions.
4 changes: 3 additions & 1 deletion tools/botskills/src/utils/authenticationUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,9 @@ export class AuthenticationUtils {
} catch (err) {
logger.warning(`Could not configure authentication connection automatically.`);
if (currentCommand.length > 0) {
logger.warning(`There was an error while executing the following command:\n\t${currentCommand.join(' ')}\n${err.message || err}`);
logger.warning(
`There was an error while executing the following command:\n\t${currentCommand.join(' ')}\n${err.message || err}`
);
logger.warning(`You must configure one of the following connection types MANUALLY in the Azure Portal:
${manifest.authenticationConnections.map((authConn: IAuthenticationConnection) => authConn.serviceProviderId)
.join(', ')}`);
Expand Down
141 changes: 135 additions & 6 deletions tools/botskills/test/authentication.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Licensed under the MIT License.
*/

const { strictEqual } = require("assert");
const { strictEqual, ok } = require("assert");
const { writeFileSync } = require("fs");
const { join, resolve } = require("path");
const sandbox = require("sinon").createSandbox();
Expand All @@ -14,6 +14,7 @@ const authenticationUtils = new AuthenticationUtils();
const emptyAzureAuthSettings = JSON.stringify(require(resolve(__dirname, join("mocks", "azureAuthSettings", "emptyAuthSettings.json"))));
const filledAzureAuthSettings = JSON.stringify(require(resolve(__dirname, join("mocks", "azureAuthSettings", "filledAuthSettings.json"))));
const appShowReplyUrl = JSON.stringify(require(resolve(__dirname, join("mocks", "appShowReplyUrl", "emptyAppShowReplyUrl.json"))));
const unrecognizedWarningPrefix = 'The following scopes were not recognized:';

const noAuthConnectionAppsettings = normalizeContent(JSON.stringify(
{
Expand Down Expand Up @@ -208,11 +209,139 @@ https://aka.ms/vamanualauthsteps`);
const warningList = configuration.logger.getWarning();
strictEqual(warningList[warningList.length - 1], `Could not configure scopes automatically.`)
});
});

describe("should show a message", function() {
describe("when the authentication process finished successfully", function() {
it("without an aadConnection", async function() {

it("when any scope is not recognized", async function () {
const scopeNotRecognized = ['Scope.NoRecognized'];
const warningMessage = `${unrecognizedWarningPrefix} ${scopeNotRecognized.join(',')}`;
const configuration = {
botName: "testScope",
localManifest: resolve(__dirname, join("mocks", "skills", "unrecognizedScopesManifest.json")),
remoteManifest: "",
dispatchName: "",
language: "",
luisFolder: "",
dispatchFolder: "",
outFolder: "",
lgOutFolder: "",
skillsFile: "",
resourceGroup: "testScope",
appSettingsFile: resolve(__dirname, join("mocks", "appsettings", "noAuthConnectionAppsettings.json")),
cognitiveModelsFile: "",
lgLanguage: "",
logger: new TestLogger()
}

// Mock the execution of az bot authsetting list (listAuthSettingsCommand)
this.callback.onCall(0).returns(Promise.resolve(emptyAzureAuthSettings));

await authenticationUtils.authenticate(configuration, require(configuration.localManifest), configuration.logger);
const warningList = configuration.logger.getWarning();

ok(warningList.includes(warningMessage));
});
});

describe("should not show a warning", function() {
it("when the scopes property doesn't exist in the authenticationConnections", async function () {
const configuration = {
botName: "testScope",
localManifest: resolve(__dirname, join("mocks", "skills", "noScopesPropertyManifest.json")),
remoteManifest: "",
dispatchName: "",
language: "",
luisFolder: "",
dispatchFolder: "",
outFolder: "",
lgOutFolder: "",
skillsFile: "",
resourceGroup: "testScope",
appSettingsFile: resolve(__dirname, join("mocks", "appsettings", "noAuthConnectionAppsettings.json")),
cognitiveModelsFile: "",
lgLanguage: "",
logger: new TestLogger()
}

// Mock the execution of az bot authsetting list (listAuthSettingsCommand)
this.callback.onCall(0).returns(Promise.resolve(emptyAzureAuthSettings));

await authenticationUtils.authenticate(configuration, require(configuration.localManifest), configuration.logger);
const warningList = configuration.logger.getWarning();

const warningFound = warningList.find((warning) => {
return warning.includes(unrecognizedWarningPrefix.trim());
});

ok(warningFound === undefined);
});

it("when the scopes property contains empty strings", async function () {
const configuration = {
botName: "testScope",
localManifest: resolve(__dirname, join("mocks", "skills", "emptyScopesManifest.json")),
remoteManifest: "",
dispatchName: "",
language: "",
luisFolder: "",
dispatchFolder: "",
outFolder: "",
lgOutFolder: "",
skillsFile: "",
resourceGroup: "testScope",
appSettingsFile: resolve(__dirname, join("mocks", "appsettings", "noAuthConnectionAppsettings.json")),
cognitiveModelsFile: "",
lgLanguage: "",
logger: new TestLogger()
}

// Mock the execution of az bot authsetting list (listAuthSettingsCommand)
this.callback.onCall(0).returns(Promise.resolve(emptyAzureAuthSettings));

await authenticationUtils.authenticate(configuration, require(configuration.localManifest), configuration.logger);
const warningList = configuration.logger.getWarning();

const warningFound = warningList.find((warning) => {
return warning.includes(unrecognizedWarningPrefix.trim());
});

ok(warningFound === undefined);
});

it("when all the scopes are recognized", async function () {
const configuration = {
botName: "testScope",
localManifest: resolve(__dirname, join("mocks", "skills", "recognizedScopesManifest.json")),
remoteManifest: "",
dispatchName: "",
language: "",
luisFolder: "",
dispatchFolder: "",
outFolder: "",
lgOutFolder: "",
skillsFile: "",
resourceGroup: "testScope",
appSettingsFile: resolve(__dirname, join("mocks", "appsettings", "noAuthConnectionAppsettings.json")),
cognitiveModelsFile: "",
lgLanguage: "",
logger: new TestLogger()
}

// Mock the execution of az bot authsetting list (listAuthSettingsCommand)
this.callback.onCall(0).returns(Promise.resolve(emptyAzureAuthSettings));

await authenticationUtils.authenticate(configuration, require(configuration.localManifest), configuration.logger);
const warningList = configuration.logger.getWarning();

const warningFound = warningList.find((warning) => {
return warning.includes(unrecognizedWarningPrefix.trim());
});

ok(warningFound === undefined);
});
});

describe("should show a message", function () {
describe("when the authentication process finished successfully", function () {
it("without an aadConnection", async function () {
const configuration = {
botName: "",
localManifest: resolve(__dirname, join("mocks", "skills", "azureActiveDirectoryV2AuthenticationManifest.json")),
Expand Down
33 changes: 33 additions & 0 deletions tools/botskills/test/mocks/skills/emptyScopesManifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"id": "authenticationSkill",
"msaAppId": "00000000-0000-0000-0000-000000000000",
"name": "Test Scope",
"endpoint": "https://bftestskill.azurewebsites.net/api/skill/messages",
"description": "This is a test scope to use for testing purpose.",
"authenticationConnections": [
{
"id": "Outlook",
"serviceProviderId": "Azure Active Directory v2",
"scopes": ""
}
],
"actions": [
{
"id": "authenticationSkill_testAction",
"definition": {
"description": "Test Action",
"slots": [],
"triggers": {
"utteranceSources": [
{
"locale": "en",
"source": [
"authenticationSkill#Test"
]
}
]
}
}
}
]
}
32 changes: 32 additions & 0 deletions tools/botskills/test/mocks/skills/noScopesPropertyManifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"id": "authenticationSkill",
"msaAppId": "00000000-0000-0000-0000-000000000000",
"name": "Test Scope",
"endpoint": "https://bftestskill.azurewebsites.net/api/skill/messages",
"description": "This is a test scope to use for testing purpose.",
"authenticationConnections": [
{
"id": "Outlook",
"serviceProviderId": "Azure Active Directory v2"
}
],
"actions": [
{
"id": "authenticationSkill_testAction",
"definition": {
"description": "Test Action",
"slots": [],
"triggers": {
"utteranceSources": [
{
"locale": "en",
"source": [
"authenticationSkill#Test"
]
}
]
}
}
}
]
}
33 changes: 33 additions & 0 deletions tools/botskills/test/mocks/skills/recognizedScopesManifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"id": "authenticationSkill",
"msaAppId": "00000000-0000-0000-0000-000000000000",
"name": "Test Scope",
"endpoint": "https://bftestskill.azurewebsites.net/api/skill/messages",
"description": "This is a test scope to use for testing purpose.",
"authenticationConnections": [
{
"id": "Outlook",
"serviceProviderId": "Azure Active Directory v2",
"scopes": "User.Read.All"
}
],
"actions": [
{
"id": "authenticationSkill_testAction",
"definition": {
"description": "Test Action",
"slots": [],
"triggers": {
"utteranceSources": [
{
"locale": "en",
"source": [
"authenticationSkill#Test"
]
}
]
}
}
}
]
}
33 changes: 33 additions & 0 deletions tools/botskills/test/mocks/skills/unrecognizedScopesManifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"id": "authenticationSkill",
"msaAppId": "00000000-0000-0000-0000-000000000000",
"name": "Test Scope",
"endpoint": "https://bftestskill.azurewebsites.net/api/skill/messages",
"description": "This is a test scope to use for testing purpose.",
"authenticationConnections": [
{
"id": "Outlook",
"serviceProviderId": "Azure Active Directory v2",
"scopes": "Scope.NoRecognized"
}
],
"actions": [
{
"id": "authenticationSkill_testAction",
"definition": {
"description": "Test Action",
"slots": [],
"triggers": {
"utteranceSources": [
{
"locale": "en",
"source": [
"authenticationSkill#Test"
]
}
]
}
}
}
]
}

0 comments on commit 5f06524

Please sign in to comment.