Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Swagger connector api updates #980

Merged
merged 6 commits into from
Jun 12, 2019
Merged

Swagger connector api updates #980

merged 6 commits into from
Jun 12, 2019

Conversation

jspruance
Copy link

@jspruance jspruance commented Jun 12, 2019

Fixes #943 - 'Add State field to Semantic Action in Schema'

Description

This pull request contains updates for the Connector API, based on changes in the swagger spec since Nov 2018:
https://github.com/microsoft/botframework-sdk/blob/master/specs/botframework-protocol/botframework-channel.json

Specific Changes

Change log:

'localTimestamp' - update description
'localTimezone - update description
botbuilder-js\libraries\botframework-schema\src\index.ts
botbuilder-js\libraries\botframework-schema\src\activityInterfaces.ts

SemanticActions / SemanticActionStates - add 'state' field:
botbuilder-js\libraries\botframework-schema\src\index.ts
botbuilder-js\libraries\botframework-connector\src\connectorApi\models\mappers.ts

ConversationParameters / add 'tenantId' field
botbuilder-js\libraries\botframework-schema\src\index.ts (ALREADY EXISTS - NO CHANGE)
botbuilder-js\libraries\botframework-connector\src\connectorApi\models\mappers.ts

ConversationAccount / add 'tenantId' field
botbuilder-js\libraries\botframework-schema\src\index.ts (ALREADY EXISTS - NO CHANGE)
botbuilder-js\libraries\botframework-connector\src\connectorApi\models\mappers.ts

TokenResponse / add 'channelId' field

botbuilder-js\libraries\botframework-connector\src\tokenApi\models\index.ts (ALREADY EXISTS - NO CHANGE)
botbuilder-js\libraries\botframework-connector\src\tokenApi\models\mappers.ts (ALREADY EXISTS - NO CHANGE)

botbuilder-js\libraries\botframework-schema\src\index.ts
botbuilder-js\libraries\botframework-connector\src\connectorApi\models\mappers.ts

AttachmentView viewId / size descriptions
botbuilder-js\libraries\botframework-schema\src\index.ts

Activity / add 'callerId' field
botbuilder-js\libraries\botframework-schema\src\index.ts
botbuilder-js\libraries\botframework-connector\src\connectorApi\models\mappers.ts

Testing

  1. Manual testing with local bots
  2. botbuilder-js\libraries\botbuilder\tests\botFrameworkAdapter.test.js
  3. Additional tests could be added to 'connector.test.js', once that test suite is refactored and back i a working state (in progress - see Added support for Teams mentions & re-enable Connector SDK tests #908).

@jspruance
Copy link
Author

Merging in latest from master

@@ -288,6 +288,10 @@ export interface SemanticAction {
* ID of this action
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add state property to semanticAction field (on Activity)

@@ -480,7 +488,7 @@ export interface Activity {
/**
* An optional programmatic action accompanying this request
*/
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be optional, per code comments

@jspruance jspruance requested a review from cleemullins June 12, 2019 17:31
@gabog gabog merged commit 5b8b7ef into master Jun 12, 2019
@gabog gabog deleted the swagger-connector-api-updates branch June 12, 2019 20:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add State field to Semantic Action in Schema
2 participants