Thanks to visit codestin.com
Credit goes to github.com

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

[TypeScript][BotBuilder Skills] Rename property msAppId to msaAppId #2000

Merged
lauren-mills merged 1 commit into from
Aug 8, 2019
Merged

[TypeScript][BotBuilder Skills] Rename property msAppId to msaAppId #2000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/typescript/botbuilder-skills/src/models/skillManifest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/
export interface ISkillManifest {
id: string;
msAppId: string;
msaAppId: string;
name: string;
endpoint: string;
description: string;
Expand Down
2 changes: 1 addition & 1 deletion lib/typescript/botbuilder-skills/src/skillManifestGenerator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export class SkillManifestGenerator {
if (!skillManifest.id) { throw new Error('Skill manifest ID property was not present in the template manifest file.'); }
if (!skillManifest.name) { throw new Error('Skill manifest Name property was not present in the template manifest file.'); }

skillManifest.msAppId = appId;
skillManifest.msaAppId = appId;
skillManifest.endpoint = `${uriBase}${this.skillRoute}`;

if (skillManifest.iconUrl !== undefined) {
Expand Down
2 changes: 1 addition & 1 deletion lib/typescript/botbuilder-skills/src/websocket/skillWebSocketTransport.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export class SkillWebSocketTransport implements ISkillTransport {
// set recipient to the skill
if (activity !== undefined && activity.recipient !== undefined) {
const recipientId: string = activity.recipient.id;
activity.recipient.id = this.skillManifest.msAppId;
activity.recipient.id = this.skillManifest.msaAppId;

// Serialize the activity and POST to the Skill endpoint
const request: Request = Request.create('POST', '');
Expand Down
4 changes: 2 additions & 2 deletions lib/typescript/botbuilder-skills/test/manifest.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ describe("manifest", function() {
.expect(200)
.expect(function(res) {

assert.strictEqual(res.body.msAppId, botSettings.microsoftAppId, "Skill Manifest msaAppId not set correctly");
assert.strictEqual(res.body.msaAppId, botSettings.microsoftAppId, "Skill Manifest msaAppId not set correctly");
assert.strictEqual(res.body.endpoint, `http://${res.req.getHeaders().host}/api/skill/messages`, "Skill Manifest endpoint not set correctly");
assert.strictEqual(res.body.iconUrl, `http://${res.req.getHeaders().host}/calendarSkill.png`, "Skill Manifest iconUrl not set correctly");
assert.strictEqual(res.body.actions[0].definition.triggers.utteranceSources.length, 3);
Expand All @@ -35,7 +35,7 @@ describe("manifest", function() {
.expect(200)
.expect(function(res) {

assert.strictEqual(res.body.msAppId, botSettings.microsoftAppId, "Skill Manifest msaAppId not set correctly");
assert.strictEqual(res.body.msaAppId, botSettings.microsoftAppId, "Skill Manifest msaAppId not set correctly");
assert.strictEqual(res.body.endpoint, `http://${res.req.getHeaders().host}/api/skill/messages`, "Skill Manifest endpoint not set correctly");
assert.strictEqual(res.body.iconUrl, `http://${res.req.getHeaders().host}/calendarSkill.png`, "Skill Manifest iconUrl not set correctly");
// Ensure each of the registered actions has triggering utterances added
Expand Down
2 changes: 1 addition & 1 deletion lib/typescript/botbuilder-skills/test/mocks/fixtures/manifest_with_utterances.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35906,7 +35906,7 @@
}
}
],
"msAppId": "9afc4045-b3f3-4106-80be-d152d8821879",
"msaAppId": "9afc4045-b3f3-4106-80be-d152d8821879",
"endpoint": "http://127.0.0.1:3980/api/skill/messages"
},
"rawHeaders": [
Expand Down
2 changes: 1 addition & 1 deletion lib/typescript/botbuilder-skills/test/mocks/fixtures/manifest_without_utterances.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@
}
}
],
"msAppId": "9afc4045-b3f3-4106-80be-d152d8821879",
"msaAppId": "9afc4045-b3f3-4106-80be-d152d8821879",
"endpoint": "http://127.0.0.1:3980/api/skill/messages"
},
"rawHeaders": [
Expand Down