Streaming: refactor streaming into adapter. General improvements and quality.

lerna.json

@@ -13,8 +13,7 @@
     "libraries/botframework-schema",
     "libraries/functional-tests",
     "libraries/testbot",
-    "libraries/botframework-streaming-extensions",
-    "libraries/botbuilder-streaming-extensions",
+    "libraries/botframework-streaming",
     "transcripts"
   ],
   "version": "independent",

libraries/botbuilder-core/src/botAdapter.ts

@@ -18,7 +18,7 @@ import { TurnContext } from './turnContext';
  * of channels.
  */
 export abstract class BotAdapter {
-    private middleware: MiddlewareSet = new MiddlewareSet();
+    protected middleware: MiddlewareSet = new MiddlewareSet();
     private turnError: (context: TurnContext, error: Error) => Promise<void>;
 
     /**

libraries/botbuilder-core/src/turnContext.ts

@@ -538,15 +538,4 @@ export class TurnContext {
 
         return emitNext(0);
     }
-
-    /**
-      * Determine if the Activity was sent via an Http/Https connection or Streaming
-      * This can be determined by looking at the ServiceUrl property:
-      *   (1) All channels that send messages via http/https are not streaming
-      *   (2) Channels that send messages via streaming have a ServiceUrl that does not begin with http/https.
-      * @param activity 
-      */
-     public static isFromStreamingConnection(activity: Activity): boolean {
-        return activity && activity.serviceUrl && !activity.serviceUrl.toLowerCase().startsWith('http');
-     }
 }

libraries/botbuilder-dialogs/src/prompts/oauthPrompt.ts

@@ -250,7 +250,7 @@ export class OAuthPrompt extends Dialog {
             const cards: Attachment[] = msg.attachments.filter((a: Attachment) => a.contentType === CardFactory.contentTypes.oauthCard);
             if (cards.length === 0) {
                 let link: string = undefined;
-                if (TurnContext.isFromStreamingConnection(context.activity)) {
+                if (OAuthPrompt.isFromStreamingConnection(context.activity)) {
                     link = await (context.adapter as any).getSignInLink(context, this.settings.connectionName);
                 }
                 // Append oauth card
@@ -312,12 +312,18 @@ export class OAuthPrompt extends Dialog {
         return token !== undefined ? { succeeded: true, value: token } : { succeeded: false };
     }
 
+    private static isFromStreamingConnection(activity: Activity): boolean {
+        return activity && activity.serviceUrl && !activity.serviceUrl.toLowerCase().startsWith('http');
+    }
+
     private isTokenResponseEvent(context: TurnContext): boolean {
         const activity: Activity = context.activity;
 
         return activity.type === ActivityTypes.Event && activity.name === 'tokens/response';
     }
 
+
+
     private isTeamsVerificationInvoke(context: TurnContext): boolean {
         const activity: Activity = context.activity;