Merge branch 'main' into southworks/update/msal-node-and-browser

microsoft · Feb 15, 2024 · d520b5c · d520b5c
2 parents 95ffef2 + cdd3508
commit d520b5c
Show file tree

Hide file tree

Showing 33 changed files with 45 additions and 78 deletions.
diff --git a/generators/generator-botbuilder/generators/app/templates/core/bots/dialogAndWelcomeBot.js b/generators/generator-botbuilder/generators/app/templates/core/bots/dialogAndWelcomeBot.js
@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
 const { CardFactory } = require('botbuilder-core');
 const { DialogBot } = require('./dialogBot');
 const WelcomeCard = require('../resources/welcomeCard.json');

diff --git a/generators/generator-botbuilder/generators/app/templates/core/bots/dialogAndWelcomeBot.ts b/generators/generator-botbuilder/generators/app/templates/core/bots/dialogAndWelcomeBot.ts
@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
 import { BotState, CardFactory } from 'botbuilder';
 import { Dialog, DialogState } from 'botbuilder-dialogs';
 import { MainDialog } from '../dialogs/mainDialog';

diff --git a/generators/generator-botbuilder/generators/app/templates/core/bots/dialogBot.js b/generators/generator-botbuilder/generators/app/templates/core/bots/dialogBot.js
@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
 const { ActivityHandler } = require('botbuilder');
 
 class DialogBot extends ActivityHandler {

diff --git a/generators/generator-botbuilder/generators/app/templates/core/bots/dialogBot.ts b/generators/generator-botbuilder/generators/app/templates/core/bots/dialogBot.ts
@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
 import { ActivityHandler, BotState, ConversationState, StatePropertyAccessor, UserState } from 'botbuilder';
 import { Dialog, DialogState } from 'botbuilder-dialogs';
 import { MainDialog } from '../dialogs/mainDialog';

diff --git a/generators/generator-botbuilder/generators/app/templates/core/index.js b/generators/generator-botbuilder/generators/app/templates/core/index.js
@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
 // index.js is used to setup and configure your bot
 
 // Import required packages

diff --git a/generators/generator-botbuilder/generators/app/templates/core/index.ts b/generators/generator-botbuilder/generators/app/templates/core/index.ts
@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
 import { config } from 'dotenv';
 import * as path from 'path';
 

diff --git a/generators/generator-botbuilder/generators/app/templates/core/package-with-tests.json.js b/generators/generator-botbuilder/generators/app/templates/core/package-with-tests.json.js
@@ -17,10 +17,10 @@
     },
     "dependencies": {
         "@microsoft/recognizers-text-data-types-timex-expression": "1.1.4",
-        "botbuilder": "~4.20.0",
-        "botbuilder-ai": "~4.20.0",
-        "botbuilder-dialogs": "~4.20.0",
-        "botbuilder-testing": "~4.20.0",
+        "botbuilder": "~4.22.1",
+        "botbuilder-ai": "~4.22.1",
+        "botbuilder-dialogs": "~4.22.1",
+        "botbuilder-testing": "~4.22.1",
         "dotenv": "^8.2.0",
         "restify": "^11.1.0"
     },

diff --git a/generators/generator-botbuilder/generators/app/templates/core/package-with-tests.json.ts b/generators/generator-botbuilder/generators/app/templates/core/package-with-tests.json.ts
@@ -38,10 +38,10 @@
     },
     "dependencies": {
       "@microsoft/recognizers-text-data-types-timex-expression": "1.1.4",
-      "botbuilder": "~4.20.0",
-      "botbuilder-ai": "~4.20.0",
-      "botbuilder-dialogs": "~4.20.0",
-      "botbuilder-testing": "~4.20.0",
+      "botbuilder": "~4.22.1",
+      "botbuilder-ai": "~4.22.1",
+      "botbuilder-dialogs": "~4.22.1",
+      "botbuilder-testing": "~4.22.1",
       "dotenv": "^8.2.0",
       "replace": "~1.2.0",
       "restify": "~11.1.0"

diff --git a/generators/generator-botbuilder/generators/app/templates/core/package.json.js b/generators/generator-botbuilder/generators/app/templates/core/package.json.js
@@ -17,9 +17,9 @@
     },
     "dependencies": {
         "@microsoft/recognizers-text-data-types-timex-expression": "1.1.4",
-        "botbuilder": "~4.20.0",
-        "botbuilder-ai": "~4.20.0",
-        "botbuilder-dialogs": "~4.20.0",
+        "botbuilder": "~4.22.1,
+        "botbuilder-ai": "~4.22.1",
+        "botbuilder-dialogs": "~4.22.1",
         "dotenv": "~8.2.0",
         "restify": "~11.1.0"
     },

diff --git a/generators/generator-botbuilder/generators/app/templates/core/package.json.ts b/generators/generator-botbuilder/generators/app/templates/core/package.json.ts
@@ -19,9 +19,9 @@
     },
     "dependencies": {
         "@microsoft/recognizers-text-data-types-timex-expression": "1.1.4",
-        "botbuilder": "~4.20.0",
-        "botbuilder-ai": "~4.20.0",
-        "botbuilder-dialogs": "~4.20.0",
+        "botbuilder": "~4.22.1",
+        "botbuilder-ai": "~4.22.1",
+        "botbuilder-dialogs": "~4.22.1",
         "dotenv": "~8.2.0",
         "replace": "~1.2.0",
         "restify": "~11.1.0"

diff --git a/...generator-botbuilder/generators/app/templates/core/tests/bots/dialogAndWelcomeBot.test.js b/...generator-botbuilder/generators/app/templates/core/tests/bots/dialogAndWelcomeBot.test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License.
- */
-
 /* eslint-env node, mocha */
 const { TestAdapter, ActivityTypes, TurnContext, ConversationState, MemoryStorage, UserState } = require('botbuilder');
 const { DialogSet, DialogTurnStatus, Dialog } = require('botbuilder-dialogs');

diff --git a/...generator-botbuilder/generators/app/templates/core/tests/bots/dialogAndWelcomeBot.test.ts b/...generator-botbuilder/generators/app/templates/core/tests/bots/dialogAndWelcomeBot.test.ts
@@ -1,7 +1,3 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License.
- */
 import { ActivityTypes, ConversationState, MemoryStorage, TestAdapter, TurnContext, UserState } from 'botbuilder';
 import { Dialog, DialogSet, DialogTurnStatus } from 'botbuilder-dialogs';
 import { DialogAndWelcomeBot } from '../../bots/dialogAndWelcomeBot';

diff --git a/generators/generator-botbuilder/generators/app/templates/echo/bot.js b/generators/generator-botbuilder/generators/app/templates/echo/bot.js
@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
 const { ActivityHandler, MessageFactory } = require('botbuilder');
 
 class EchoBot extends ActivityHandler {

diff --git a/generators/generator-botbuilder/generators/app/templates/echo/bot.ts b/generators/generator-botbuilder/generators/app/templates/echo/bot.ts
@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
 import { ActivityHandler, MessageFactory } from 'botbuilder';
 
 export class EchoBot extends ActivityHandler {

diff --git a/generators/generator-botbuilder/generators/app/templates/echo/index.js b/generators/generator-botbuilder/generators/app/templates/echo/index.js
@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
 const path = require('path');
 
 const dotenv = require('dotenv');

diff --git a/generators/generator-botbuilder/generators/app/templates/echo/index.ts b/generators/generator-botbuilder/generators/app/templates/echo/index.ts
@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
 import * as path from 'path';
 
 import { config } from 'dotenv';

diff --git a/generators/generator-botbuilder/generators/app/templates/echo/package.json.js b/generators/generator-botbuilder/generators/app/templates/echo/package.json.js
@@ -16,7 +16,7 @@
         "url": "https://github.com"
     },
     "dependencies": {
-        "botbuilder": "~4.20.0",
+        "botbuilder": "~4.22.1",
         "dotenv": "~8.2.0",
         "restify": "~11.1.0"
     },

diff --git a/generators/generator-botbuilder/generators/app/templates/echo/package.json.ts b/generators/generator-botbuilder/generators/app/templates/echo/package.json.ts
@@ -18,7 +18,7 @@
         "url": "https://github.com"
     },
     "dependencies": {
-        "botbuilder": "~4.20.0",
+        "botbuilder": "~4.22.1",
         "dotenv": "~8.2.0",
         "replace": "~1.2.0",
         "restify": "~11.1.0"

diff --git a/generators/generator-botbuilder/generators/app/templates/empty/bot.js b/generators/generator-botbuilder/generators/app/templates/empty/bot.js
@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
 const { ActivityHandler } = require('botbuilder');
 
 class EmptyBot extends ActivityHandler {

diff --git a/generators/generator-botbuilder/generators/app/templates/empty/bot.ts b/generators/generator-botbuilder/generators/app/templates/empty/bot.ts
@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
 import { ActivityHandler } from 'botbuilder';
 
 export class EmptyBot extends ActivityHandler {

diff --git a/generators/generator-botbuilder/generators/app/templates/empty/index.js b/generators/generator-botbuilder/generators/app/templates/empty/index.js
@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
 const restify = require('restify');
 
 // Import required bot services.

diff --git a/generators/generator-botbuilder/generators/app/templates/empty/index.ts b/generators/generator-botbuilder/generators/app/templates/empty/index.ts
@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
 import * as restify from 'restify';
 
 // Import required bot services.

diff --git a/generators/generator-botbuilder/generators/app/templates/empty/package.json.js b/generators/generator-botbuilder/generators/app/templates/empty/package.json.js
@@ -16,7 +16,7 @@
         "url": "https://github.com"
     },
     "dependencies": {
-        "botbuilder": "~4.20.0",
+        "botbuilder": "~4.22.1",
         "restify": "~11.1.0"
     },
     "devDependencies": {

diff --git a/generators/generator-botbuilder/generators/app/templates/empty/package.json.ts b/generators/generator-botbuilder/generators/app/templates/empty/package.json.ts
@@ -18,7 +18,7 @@
         "url": "https://github.com"
     },
     "dependencies": {
-        "botbuilder": "~4.20.0",
+        "botbuilder": "~4.22.1",
         "replace": "~1.2.0",
         "restify": "~11.1.0"
     },

diff --git a/libraries/botbuilder-dialogs-adaptive/package.json b/libraries/botbuilder-dialogs-adaptive/package.json
@@ -60,7 +60,7 @@
     "postbuild": "downlevel-dts lib _ts3.4/lib --checksum",
     "test": "yarn build && nyc mocha tests/",
     "test:compat": "api-extractor run --verbose",
-    "postinstall": "yarn text-suite && yarn date-time && yarn number-with-unit",
+    "postinstall": "npm run text-suite && npm run date-time && npm run number-with-unit",
     "text-suite": "npx rimraf ../@microsoft/recognizers-text-suite/node_modules/@microsoft/recognizers-text-number",
     "date-time": "npx rimraf ../@microsoft/recognizers-text-date-time/node_modules/@microsoft/recognizers-text-number",
     "number-with-unit": "npx rimraf ../@microsoft/recognizers-text-number-with-unit/node_modules/@microsoft/recognizers-text-number"

diff --git a/libraries/botbuilder-dialogs/package.json b/libraries/botbuilder-dialogs/package.json
@@ -54,7 +54,7 @@
     "test": "npm-run-all build test:mocha",
     "test:mocha": "nyc mocha --recursive --require source-map-support/register tests",
     "test:compat": "api-extractor run --verbose",
-    "postinstall": "yarn text-suite && yarn date-time && yarn number-with-unit",
+    "postinstall": "npm run text-suite && npm run date-time && npm run number-with-unit",
     "text-suite": "npx rimraf ../@microsoft/recognizers-text-suite/node_modules/@microsoft/recognizers-text-number",
     "date-time": "npx rimraf ../@microsoft/recognizers-text-date-time/node_modules/@microsoft/recognizers-text-number",
     "number-with-unit": "npx rimraf ../@microsoft/recognizers-text-number-with-unit/node_modules/@microsoft/recognizers-text-number"

diff --git a/libraries/botframework-connector/src/connectorApi/models/mappers.ts b/libraries/botframework-connector/src/connectorApi/models/mappers.ts
@@ -158,6 +158,12 @@ export const ChannelAccount: CompositeMapper = {
         type: {
           name: "String"
         }
+      },
+      properties: {
+        serializedName: "properties",
+        type: {
+          name: "Object"
+        }
       }
     }
   }

diff --git a/libraries/botframework-schema/etc/botframework-schema.api.md b/libraries/botframework-schema/etc/botframework-schema.api.md
@@ -579,6 +579,7 @@ export interface ChannelAccount {
     aadObjectId?: string;
     id: string;
     name: string;
+    properties?: any;
     role?: RoleTypes | string;
 }
 

diff --git a/libraries/botframework-schema/src/index.ts b/libraries/botframework-schema/src/index.ts
@@ -155,6 +155,11 @@ export interface ChannelAccount {
      * 'user', 'bot', 'skill'
      */
     role?: RoleTypes | string;
+
+    /**
+     * Custom properties object (optional)
+     */
+    properties?: any; // eslint-disable-line @typescript-eslint/no-explicit-any
 }
 
 const channelAccount = z.object({

diff --git a/package.json b/package.json
@@ -56,7 +56,7 @@
     "**/request-promise-native/tough-cookie": "^4.1.3",
     "**/istanbul-lib-instrument/@babel/core": "^7.23.2",
     "**/@babel/plugin-proposal-class-properties/@babel/core": "^7.23.2",
-    "follow-redirects": "^1.14.8",
+    "follow-redirects": "^1.15.4",
     "@types/ramda": "0.26.0",
     "@azure/msal-browser": "^2.38.3",
     "@azure/msal-node": "^1.18.4",
@@ -117,4 +117,4 @@
       "**/internal.*"
     ]
   }
-}
+}
diff --git a/testing/browser-functional/browser-echo-bot/package.json b/testing/browser-functional/browser-echo-bot/package.json
@@ -35,5 +35,11 @@
     "webpack": "^4.35.3",
     "webpack-cli": "^3.3.6",
     "webpack-dev-server": "^3.7.2"
+  },
+  "resolutions": {
+    "follow-redirects": "^1.15.4"
+  },
+  "overrides": {
+    "follow-redirects": "^1.15.4"
   }
 }
diff --git a/testing/browser-functional/browser-echo-bot/yarn.lock b/testing/browser-functional/browser-echo-bot/yarn.lock
@@ -3321,10 +3321,10 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.3"
     readable-stream "^2.3.6"
 
-follow-redirects@^1.0.0:
-  version "1.14.9"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7"
-  integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==
+follow-redirects@^1.0.0, follow-redirects@^1.15.4:
+  version "1.15.5"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.5.tgz#54d4d6d062c0fa7d9d17feb008461550e3ba8020"
+  integrity sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==
 
 for-in@^1.0.2:
   version "1.0.2"

diff --git a/yarn.lock b/yarn.lock
@@ -6768,7 +6768,7 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.3"
     readable-stream "^2.3.6"
 
-follow-redirects@^1.10.0, follow-redirects@^1.14.8:
+follow-redirects@^1.10.0, follow-redirects@^1.15.4:
   version "1.15.4"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf"
   integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==