Merge branch 'main' into abrown/fix/security-issue

Author: boydc2014

Composer/packages/client/src/components/CreationFlow/DefineConversation.tsx

@@ -216,7 +216,7 @@ const DefineConversation: React.FC<DefineConversationProps> = (props) => {
     <Fragment>
       <DialogWrapper
         isOpen
-        {...DialogCreationCopy.DEFINE_CONVERSATION_OBJECTIVE}
+        {...DialogCreationCopy.DEFINE_BOT_PROJECT}
         dialogType={DialogTypes.CreateFlow}
         onDismiss={onDismiss}
       >

Composer/packages/client/src/constants.ts

@@ -108,6 +108,14 @@ export const DialogCreationCopy = {
       `What can the user accomplish through this conversation? For example, BookATable, OrderACoffee etc.`
     ),
   },
+  DEFINE_BOT_PROJECT: {
+    title: formatMessage('Create a bot project'),
+    subText: formatMessage(`Specify a name, description, and location for your new bot project.`),
+  },
+  DEFINE_DIALOG: {
+    title: formatMessage('Create a dialog'),
+    subText: formatMessage(`Specify a name and description for your new dialog.`),
+  },
   SELECT_LOCATION: {
     title: formatMessage('Select a Bot'),
     subText: formatMessage('Which bot do you want to open?'),

Composer/packages/client/src/pages/design/createDialogModal.tsx

@@ -71,7 +71,7 @@ export const CreateDialogModal: React.FC<CreateDialogModalProps> = (props) => {
     <DialogWrapper
       isOpen={isOpen}
       onDismiss={onDismiss}
-      {...DialogCreationCopy.DEFINE_CONVERSATION_OBJECTIVE}
+      {...DialogCreationCopy.DEFINE_DIALOG}
       dialogType={DialogTypes.DesignFlow}
     >
       <form onSubmit={handleSubmit}>

Composer/packages/intellisense/src/components/IntellisenseTextField.tsx

@@ -2,10 +2,8 @@
 // Licensed under the MIT License.
 
 import React from 'react';
-
 import { useLanguageServer } from '../hooks/useLanguageServer';
 import { checkIsOutside } from '../utils/uiUtils';
-
 import { CompletionList } from './CompletionList';
 
 export const IntellisenseTextField = React.memo(
@@ -42,7 +40,7 @@ export const IntellisenseTextField = React.memo(
       if (value !== undefined && value !== textFieldValue) {
         setTextFieldValue(value);
       }
-    }, [value]);
+    }, [value, textFieldValue]);
 
     // Show the completion list again every time the results are different (unless something was just selected from the list)
     React.useEffect(() => {

Composer/packages/server/src/services/project.ts

@@ -147,6 +147,10 @@ export class BotProjectService {
       throw new Error(`file ${locationRef.path} does not exist`);
     }
 
+    if (!(await StorageService.checkIsBotFolder(locationRef.storageId, locationRef.path, user))) {
+      throw new Error(`${locationRef.path} is not a bot project folder`);
+    }
+
     for (const key in BotProjectService.projectLocationMap) {
       if (BotProjectService.projectLocationMap[key] === locationRef.path) {
         // TODO: this should probably move to getProjectById

Composer/packages/server/src/services/storage.ts

@@ -138,6 +138,11 @@ class StorageService {
     }
   };
 
+  public checkIsBotFolder = async (storageId: string, path: string, user?: UserIdentity) => {
+    const storageClient = this.getStorageClient(storageId, user);
+    return await this.isBotFolder(storageClient, path);
+  };
+
   private ensureDefaultBotFoldersExist = () => {
     this.storageConnections.forEach((s) => {
       this.createFolderRecurively(s.defaultPath);