From 3a998d860b9f0ef8964f2c3d56d76af74a76d8ba Mon Sep 17 00:00:00 2001 From: Eric Dahlvang Date: Tue, 8 Oct 2019 07:36:40 -0700 Subject: [PATCH] Fix names of Messaging Extension projects --- .../teams-app-manifest/manifest.json | 73 --------------- .../teams-app-manifest/manifest.json | 86 ------------------ .../.env | 0 .../package.json | 0 .../src/index.ts | 4 +- .../src/messagingExtensionAuthBot.ts} | 2 +- .../teams-app-manifest/color.png | Bin .../teams-app-manifest/manifest.json | 73 +++++++++++++++ .../teams-app-manifest/outline.png | Bin .../tsconfig.json | 0 .../.env | 0 .../package.json | 0 .../src/index.ts | 4 +- .../src/messagingExtensionConfigBot.ts} | 2 +- .../teams-app-manifest/color.png | Bin .../teams-app-manifest/manifest.json | 69 ++++++++++++++ .../teams-app-manifest/outline.png | Bin .../tsconfig.json | 0 18 files changed, 148 insertions(+), 165 deletions(-) delete mode 100644 libraries/botbuilder/tests/teams/composeMessagingExtensionAuth/teams-app-manifest/manifest.json delete mode 100644 libraries/botbuilder/tests/teams/composeMessagingExtensions/teams-app-manifest/manifest.json rename libraries/botbuilder/tests/teams/{composeMessagingExtensionAuth => messagingExtensionAuth}/.env (100%) rename libraries/botbuilder/tests/teams/{composeMessagingExtensionAuth => messagingExtensionAuth}/package.json (100%) rename libraries/botbuilder/tests/teams/{composeMessagingExtensionAuth => messagingExtensionAuth}/src/index.ts (90%) rename libraries/botbuilder/tests/teams/{composeMessagingExtensionAuth/src/composeMessagingExtensionAuthBot.ts => messagingExtensionAuth/src/messagingExtensionAuthBot.ts} (98%) rename libraries/botbuilder/tests/teams/{composeMessagingExtensionAuth => messagingExtensionAuth}/teams-app-manifest/color.png (100%) create mode 100644 libraries/botbuilder/tests/teams/messagingExtensionAuth/teams-app-manifest/manifest.json rename libraries/botbuilder/tests/teams/{composeMessagingExtensionAuth => messagingExtensionAuth}/teams-app-manifest/outline.png (100%) rename libraries/botbuilder/tests/teams/{composeMessagingExtensionAuth => messagingExtensionAuth}/tsconfig.json (100%) rename libraries/botbuilder/tests/teams/{composeMessagingExtensions => messagingExtensionConfig}/.env (100%) rename libraries/botbuilder/tests/teams/{composeMessagingExtensions => messagingExtensionConfig}/package.json (100%) rename libraries/botbuilder/tests/teams/{composeMessagingExtensions => messagingExtensionConfig}/src/index.ts (92%) rename libraries/botbuilder/tests/teams/{composeMessagingExtensions/src/composeMessagingExtensionsBot.ts => messagingExtensionConfig/src/messagingExtensionConfigBot.ts} (96%) rename libraries/botbuilder/tests/teams/{composeMessagingExtensions => messagingExtensionConfig}/teams-app-manifest/color.png (100%) create mode 100644 libraries/botbuilder/tests/teams/messagingExtensionConfig/teams-app-manifest/manifest.json rename libraries/botbuilder/tests/teams/{composeMessagingExtensions => messagingExtensionConfig}/teams-app-manifest/outline.png (100%) rename libraries/botbuilder/tests/teams/{composeMessagingExtensions => messagingExtensionConfig}/tsconfig.json (100%) diff --git a/libraries/botbuilder/tests/teams/composeMessagingExtensionAuth/teams-app-manifest/manifest.json b/libraries/botbuilder/tests/teams/composeMessagingExtensionAuth/teams-app-manifest/manifest.json deleted file mode 100644 index 3e636a3d77..0000000000 --- a/libraries/botbuilder/tests/teams/composeMessagingExtensionAuth/teams-app-manifest/manifest.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.5/MicrosoftTeams.schema.json", - "manifestVersion": "1.5", - "version": "1.0", - "id": "<>", - "packageName": "com.teams.sample.compose.extension", - "developer": { - "name": "Microsoft", - "websiteUrl": "https://www.microsoft.com", - "privacyUrl": "https://www.teams.com/privacy", - "termsOfUseUrl": "https://www.teams.com/termsofuser" - }, - "icons": { - "color": "color.png", - "outline": "outline.png" - }, - "name": { - "short": "Compose Extension Auth", - "full": "Compose Messaging Extension Auth Example" - }, - "description": { - "short": "Bot Service Auth in Compose Extension", - "full": "Demonstrates Bot Service Auth in a Compose Messaging Extension" - }, - "accentColor": "#FFFFFF", - "bots": [ - { - "botId": "<>", - "scopes": [ - "personal", - "team", - "groupchat" - ], - "supportsFiles": false, - "isNotificationOnly": false - } - ], - "composeExtensions": [ - { - "botId": "<>", - "canUpdateConfiguration": false, - "commands": [ - { - "id": "loginCommand", - "type": "action", - "title": "Log In", - "description": "Bot Service Auth flow in a Compose Messaging Extension", - "initialRun": false, - "fetchTask": true, - "context": [ - "commandBox", - "compose", - "message" - ], - "parameters": [ - { - "name": "param", - "title": "param", - "description": "" - } - ] - } - ] - } - ], - "permissions": [ - "identity", - "messageTeamMembers" - ], - "validDomains": [ - "*.botframework.com" - ] -} \ No newline at end of file diff --git a/libraries/botbuilder/tests/teams/composeMessagingExtensions/teams-app-manifest/manifest.json b/libraries/botbuilder/tests/teams/composeMessagingExtensions/teams-app-manifest/manifest.json deleted file mode 100644 index 0bc7571ac5..0000000000 --- a/libraries/botbuilder/tests/teams/composeMessagingExtensions/teams-app-manifest/manifest.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.5/MicrosoftTeams.schema.json", - "manifestVersion": "1.5", - "version": "1.0", - "id": "", - "packageName": "com.teams.sample.composeextension", - "developer": { - "name": "Microsoft", - "websiteUrl": "https://www.microsoft.com", - "privacyUrl": "https://www.teams.com/privacy", - "termsOfUseUrl": "https://www.teams.com/termsofuser" - }, - "icons": { - "color": "color.png", - "outline": "outline.png" - }, - "name": { - "short": "ComposeExtensions", - "full": "ComposeExtensions" - }, - "description": { - "short": "ComposeExtensions", - "full": "ComposeExtensions" - }, - "accentColor": "#FFFFFF", - "configurableTabs": [ - { - "configurationUrl": "https://teamssettingspagescenario.azurewebsites.net", - "canUpdateConfiguration": false, - "scopes": ["groupchat", "team"] - } - ], - "bots": [ - { - "botId": "", - "scopes": [ - "personal", - "team", - "groupchat" - ], - "supportsFiles": false, - "isNotificationOnly": false - } - ], - "composeExtensions": [ - { - "botId": "", - "canUpdateConfiguration": true, - "commands": [ - { - "id": "searchQueryCommand", - "context": [ "commandBox" ], - "description": "Test command to run query", - "title": "Search", - "type": "query", - "parameters": [ - { - "name": "searchQuery", - "title": "Search Query", - "description": "Your search query", - "inputType": "text" - } - ] - }, - { - "id": "searchQueryCompose", - "context": [ "compose" ], - "description": "Test command to run query", - "title": "Search", - "type": "query", - "parameters": [ - { - "name": "searchQuery", - "title": "Search Query", - "description": "Your search query", - "inputType": "text" - } - ] - } - ] - } - ], - "validDomains": [ - "*.azurewebsites.net" - ] -} \ No newline at end of file diff --git a/libraries/botbuilder/tests/teams/composeMessagingExtensionAuth/.env b/libraries/botbuilder/tests/teams/messagingExtensionAuth/.env similarity index 100% rename from libraries/botbuilder/tests/teams/composeMessagingExtensionAuth/.env rename to libraries/botbuilder/tests/teams/messagingExtensionAuth/.env diff --git a/libraries/botbuilder/tests/teams/composeMessagingExtensionAuth/package.json b/libraries/botbuilder/tests/teams/messagingExtensionAuth/package.json similarity index 100% rename from libraries/botbuilder/tests/teams/composeMessagingExtensionAuth/package.json rename to libraries/botbuilder/tests/teams/messagingExtensionAuth/package.json diff --git a/libraries/botbuilder/tests/teams/composeMessagingExtensionAuth/src/index.ts b/libraries/botbuilder/tests/teams/messagingExtensionAuth/src/index.ts similarity index 90% rename from libraries/botbuilder/tests/teams/composeMessagingExtensionAuth/src/index.ts rename to libraries/botbuilder/tests/teams/messagingExtensionAuth/src/index.ts index 047204cd6e..00ed0d294f 100644 --- a/libraries/botbuilder/tests/teams/composeMessagingExtensionAuth/src/index.ts +++ b/libraries/botbuilder/tests/teams/messagingExtensionAuth/src/index.ts @@ -10,7 +10,7 @@ import * as restify from 'restify'; import { BotFrameworkAdapter } from 'botbuilder'; // This bot's main dialog. -import { ComposeMessagingExtensionAuthBot } from './composeMessagingExtensionAuthBot'; +import { MessagingExtensionAuthBot } from './messagingExtensionAuthBot'; const ENV_FILE = path.join(__dirname, '..', '.env'); config({ path: ENV_FILE }); @@ -40,7 +40,7 @@ adapter.onTurnError = async (context, error) => { }; // Create the main dialog. -const myBot = new ComposeMessagingExtensionAuthBot(process.env.ConnectionName); +const myBot = new MessagingExtensionAuthBot(process.env.ConnectionName); // Listen for incoming requests. server.post('/api/messages', (req, res) => { diff --git a/libraries/botbuilder/tests/teams/composeMessagingExtensionAuth/src/composeMessagingExtensionAuthBot.ts b/libraries/botbuilder/tests/teams/messagingExtensionAuth/src/messagingExtensionAuthBot.ts similarity index 98% rename from libraries/botbuilder/tests/teams/composeMessagingExtensionAuth/src/composeMessagingExtensionAuthBot.ts rename to libraries/botbuilder/tests/teams/messagingExtensionAuth/src/messagingExtensionAuthBot.ts index 25aa8d9385..27fc0ff26a 100644 --- a/libraries/botbuilder/tests/teams/composeMessagingExtensionAuth/src/composeMessagingExtensionAuthBot.ts +++ b/libraries/botbuilder/tests/teams/messagingExtensionAuth/src/messagingExtensionAuthBot.ts @@ -25,7 +25,7 @@ import { * * Clicking this bot's Task Menu will retrieve the login dialog, if the user is not already signed in. */ -export class ComposeMessagingExtensionAuthBot extends TeamsActivityHandler { +export class MessagingExtensionAuthBot extends TeamsActivityHandler { connectionName: string; constructor(authConnectionName: string) { super(); diff --git a/libraries/botbuilder/tests/teams/composeMessagingExtensionAuth/teams-app-manifest/color.png b/libraries/botbuilder/tests/teams/messagingExtensionAuth/teams-app-manifest/color.png similarity index 100% rename from libraries/botbuilder/tests/teams/composeMessagingExtensionAuth/teams-app-manifest/color.png rename to libraries/botbuilder/tests/teams/messagingExtensionAuth/teams-app-manifest/color.png diff --git a/libraries/botbuilder/tests/teams/messagingExtensionAuth/teams-app-manifest/manifest.json b/libraries/botbuilder/tests/teams/messagingExtensionAuth/teams-app-manifest/manifest.json new file mode 100644 index 0000000000..9547dd032c --- /dev/null +++ b/libraries/botbuilder/tests/teams/messagingExtensionAuth/teams-app-manifest/manifest.json @@ -0,0 +1,73 @@ +{ + "$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.5/MicrosoftTeams.schema.json", + "manifestVersion": "1.5", + "version": "1.0", + "id": "", + "packageName": "com.teams.sample.compose.extension", + "developer": { + "name": "Microsoft", + "websiteUrl": "https://www.microsoft.com", + "privacyUrl": "https://www.teams.com/privacy", + "termsOfUseUrl": "https://www.teams.com/termsofuser" + }, + "icons": { + "color": "color.png", + "outline": "outline.png" + }, + "name": { + "short": "Messaging Extension Auth", + "full": "Messaging Extension Auth Example" + }, + "description": { + "short": "Bot Service Auth in Messaging Extension", + "full": "Demonstrates Bot Service Auth in a Messaging Extension" + }, + "accentColor": "#FFFFFF", + "bots": [ + { + "botId": "", + "scopes": [ + "personal", + "team", + "groupchat" + ], + "supportsFiles": false, + "isNotificationOnly": false + } + ], + "composeExtensions": [ + { + "botId": "", + "canUpdateConfiguration": false, + "commands": [ + { + "id": "loginCommand", + "type": "action", + "title": "Log In", + "description": "Bot Service Auth flow in a Messaging Extension", + "initialRun": false, + "fetchTask": true, + "context": [ + "commandBox", + "compose", + "message" + ], + "parameters": [ + { + "name": "param", + "title": "param", + "description": "" + } + ] + } + ] + } + ], + "permissions": [ + "identity", + "messageTeamMembers" + ], + "validDomains": [ + "*.botframework.com" + ] +} \ No newline at end of file diff --git a/libraries/botbuilder/tests/teams/composeMessagingExtensionAuth/teams-app-manifest/outline.png b/libraries/botbuilder/tests/teams/messagingExtensionAuth/teams-app-manifest/outline.png similarity index 100% rename from libraries/botbuilder/tests/teams/composeMessagingExtensionAuth/teams-app-manifest/outline.png rename to libraries/botbuilder/tests/teams/messagingExtensionAuth/teams-app-manifest/outline.png diff --git a/libraries/botbuilder/tests/teams/composeMessagingExtensionAuth/tsconfig.json b/libraries/botbuilder/tests/teams/messagingExtensionAuth/tsconfig.json similarity index 100% rename from libraries/botbuilder/tests/teams/composeMessagingExtensionAuth/tsconfig.json rename to libraries/botbuilder/tests/teams/messagingExtensionAuth/tsconfig.json diff --git a/libraries/botbuilder/tests/teams/composeMessagingExtensions/.env b/libraries/botbuilder/tests/teams/messagingExtensionConfig/.env similarity index 100% rename from libraries/botbuilder/tests/teams/composeMessagingExtensions/.env rename to libraries/botbuilder/tests/teams/messagingExtensionConfig/.env diff --git a/libraries/botbuilder/tests/teams/composeMessagingExtensions/package.json b/libraries/botbuilder/tests/teams/messagingExtensionConfig/package.json similarity index 100% rename from libraries/botbuilder/tests/teams/composeMessagingExtensions/package.json rename to libraries/botbuilder/tests/teams/messagingExtensionConfig/package.json diff --git a/libraries/botbuilder/tests/teams/composeMessagingExtensions/src/index.ts b/libraries/botbuilder/tests/teams/messagingExtensionConfig/src/index.ts similarity index 92% rename from libraries/botbuilder/tests/teams/composeMessagingExtensions/src/index.ts rename to libraries/botbuilder/tests/teams/messagingExtensionConfig/src/index.ts index 98ba632675..7124faf10a 100644 --- a/libraries/botbuilder/tests/teams/composeMessagingExtensions/src/index.ts +++ b/libraries/botbuilder/tests/teams/messagingExtensionConfig/src/index.ts @@ -10,7 +10,7 @@ import * as restify from 'restify'; import { BotFrameworkAdapter } from 'botbuilder'; // This bot's main dialog. -import { ComposeMessagingExtensionsBot } from './composeMessagingExtensionsBot'; +import { MessagingExtensionConfigBot } from './messagingExtensionConfigBot'; const ENV_FILE = path.join(__dirname, '..', '.env'); config({ path: ENV_FILE }); @@ -42,7 +42,7 @@ adapter.onTurnError = async (context, error) => { }; // Create the main dialog. -const myBot = new ComposeMessagingExtensionsBot(); +const myBot = new MessagingExtensionConfigBot(); // Listen for incoming requests. server.post('/api/messages', (req, res) => { diff --git a/libraries/botbuilder/tests/teams/composeMessagingExtensions/src/composeMessagingExtensionsBot.ts b/libraries/botbuilder/tests/teams/messagingExtensionConfig/src/messagingExtensionConfigBot.ts similarity index 96% rename from libraries/botbuilder/tests/teams/composeMessagingExtensions/src/composeMessagingExtensionsBot.ts rename to libraries/botbuilder/tests/teams/messagingExtensionConfig/src/messagingExtensionConfigBot.ts index 1f59c5305b..8b12ae6620 100644 --- a/libraries/botbuilder/tests/teams/composeMessagingExtensions/src/composeMessagingExtensionsBot.ts +++ b/libraries/botbuilder/tests/teams/messagingExtensionConfig/src/messagingExtensionConfigBot.ts @@ -14,7 +14,7 @@ import { ActionTypes, } from 'botframework-schema' -export class ComposeMessagingExtensionsBot extends TeamsActivityHandler { +export class MessagingExtensionConfigBot extends TeamsActivityHandler { constructor() { super(); diff --git a/libraries/botbuilder/tests/teams/composeMessagingExtensions/teams-app-manifest/color.png b/libraries/botbuilder/tests/teams/messagingExtensionConfig/teams-app-manifest/color.png similarity index 100% rename from libraries/botbuilder/tests/teams/composeMessagingExtensions/teams-app-manifest/color.png rename to libraries/botbuilder/tests/teams/messagingExtensionConfig/teams-app-manifest/color.png diff --git a/libraries/botbuilder/tests/teams/messagingExtensionConfig/teams-app-manifest/manifest.json b/libraries/botbuilder/tests/teams/messagingExtensionConfig/teams-app-manifest/manifest.json new file mode 100644 index 0000000000..4a7581543c --- /dev/null +++ b/libraries/botbuilder/tests/teams/messagingExtensionConfig/teams-app-manifest/manifest.json @@ -0,0 +1,69 @@ +{ + "$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.5/MicrosoftTeams.schema.json", + "manifestVersion": "1.5", + "version": "1.0", + "id": "", + "packageName": "com.teams.sample.messagingextension", + "developer": { + "name": "Microsoft", + "websiteUrl": "https://www.microsoft.com", + "privacyUrl": "https://www.teams.com/privacy", + "termsOfUseUrl": "https://www.teams.com/termsofuser" + }, + "icons": { + "color": "color.png", + "outline": "outline.png" + }, + "name": { + "short": "MessagingExtensionConfig", + "full": "MessagingExtensionConfig" + }, + "description": { + "short": "MessagingExtensionConfig", + "full": "MessagingExtensionConfig" + }, + "accentColor": "#FFFFFF", + "bots": [ + { + "botId": "", + "scopes": [ + "personal", + "team", + "groupchat" + ], + "supportsFiles": false, + "isNotificationOnly": false + } + ], + "composeExtensions": [ + { + "botId": "", + "canUpdateConfiguration": true, + "commands": [ + { + "id": "testCommand", + "type": "action", + "title": "Test", + "description": "Config extension test command", + "initialRun": false, + "fetchTask": false, + "context": [ + "commandBox", + "compose", + "message" + ], + "parameters": [ + { + "name": "param", + "title": "param", + "description": "" + } + ] + } + ] + } + ], + "validDomains": [ + "*.azurewebsites.net" + ] +} \ No newline at end of file diff --git a/libraries/botbuilder/tests/teams/composeMessagingExtensions/teams-app-manifest/outline.png b/libraries/botbuilder/tests/teams/messagingExtensionConfig/teams-app-manifest/outline.png similarity index 100% rename from libraries/botbuilder/tests/teams/composeMessagingExtensions/teams-app-manifest/outline.png rename to libraries/botbuilder/tests/teams/messagingExtensionConfig/teams-app-manifest/outline.png diff --git a/libraries/botbuilder/tests/teams/composeMessagingExtensions/tsconfig.json b/libraries/botbuilder/tests/teams/messagingExtensionConfig/tsconfig.json similarity index 100% rename from libraries/botbuilder/tests/teams/composeMessagingExtensions/tsconfig.json rename to libraries/botbuilder/tests/teams/messagingExtensionConfig/tsconfig.json