Prompts methods verification for session parameter

Author: carlosscastro

Node/core/lib/dialogs/Prompts.js

@@ -263,21 +263,21 @@ var Prompts = (function (_super) {
         }
     };
     Prompts.text = function (session, prompt, options) {
-        if (!session || typeof session != 'object') {
-            throw 'Session should be provided to Prompts.Text as first parameter.';
-        }
+        Prompts.validateSession(session);
         var args = options || {};
         args.promptType = PromptType.text;
         args.prompt = prompt;
         beginPrompt(session, args);
     };
     Prompts.number = function (session, prompt, options) {
+        Prompts.validateSession(session);
         var args = options || {};
         args.promptType = PromptType.number;
         args.prompt = prompt;
         beginPrompt(session, args);
     };
     Prompts.confirm = function (session, prompt, options) {
+        Prompts.validateSession(session);
         var locale = session.preferredLocale();
         var args = options || {};
         args.promptType = PromptType.confirm;
@@ -290,6 +290,7 @@ var Prompts = (function (_super) {
         beginPrompt(session, args);
     };
     Prompts.choice = function (session, prompt, choices, options) {
+        Prompts.validateSession(session);
         var args = options || {};
         args.promptType = PromptType.choice;
         args.prompt = prompt;
@@ -303,24 +304,32 @@ var Prompts = (function (_super) {
         beginPrompt(session, args);
     };
     Prompts.time = function (session, prompt, options) {
+        Prompts.validateSession(session);
         var args = options || {};
         args.promptType = PromptType.time;
         args.prompt = prompt;
         beginPrompt(session, args);
     };
     Prompts.attachment = function (session, prompt, options) {
+        Prompts.validateSession(session);
         var args = options || {};
         args.promptType = PromptType.attachment;
         args.prompt = prompt;
         beginPrompt(session, args);
     };
     Prompts.disambiguate = function (session, prompt, choices, options) {
+        Prompts.validateSession(session);
         session.beginDialog(consts.DialogId.Disambiguate, {
             prompt: prompt,
             choices: choices,
             options: options
         });
     };
+    Prompts.validateSession = function (session) {
+        if (!session || typeof session != 'object') {
+            throw 'Session should be provided as first parameter.';
+        }
+    };
     return Prompts;
 }(Dialog_1.Dialog));
 Prompts.options = {

Node/core/src/dialogs/Prompts.ts

@@ -354,25 +354,23 @@ export class Prompts extends Dialog {
 
     static text(session: Session, prompt: string|string[]|IMessage|IIsMessage, options?: IPromptOptions): void {
 
-        // Make sure that the session is passed, otherwise throw a clear error 
-        if (!session || typeof session != 'object') {
-            throw 'Session should be provided to Prompts.Text as first parameter.';
-        }
-        
+        Prompts.validateSession(session);
         var args: IPromptArgs = <any>options || {};
         args.promptType = PromptType.text;
         args.prompt = prompt;
         beginPrompt(session, args);
     }
 
     static number(session: Session, prompt: string|string[]|IMessage|IIsMessage, options?: IPromptOptions): void {
+        Prompts.validateSession(session);
         var args: IPromptArgs = <any>options || {};
         args.promptType = PromptType.number;
         args.prompt = prompt;
         beginPrompt(session, args);
     }
 
     static confirm(session: Session, prompt: string|string[]|IMessage|IIsMessage, options?: IPromptOptions): void {
+        Prompts.validateSession(session);
         var locale:string = session.preferredLocale();
         var args: IPromptArgs = <any>options || {};
         args.promptType = PromptType.confirm;
@@ -386,6 +384,7 @@ export class Prompts extends Dialog {
     }
 
     static choice(session: Session, prompt: string|string[]|IMessage|IIsMessage, choices: string|Object|string[], options?: IPromptOptions): void {
+        Prompts.validateSession(session);
         var args: IPromptArgs = <any>options || {};
         args.promptType = PromptType.choice;
         args.prompt = prompt;
@@ -400,26 +399,36 @@ export class Prompts extends Dialog {
     }
 
     static time(session: Session, prompt: string|string[]|IMessage|IIsMessage, options?: IPromptOptions): void {
+        Prompts.validateSession(session);
         var args: IPromptArgs = <any>options || {};
         args.promptType = PromptType.time;
         args.prompt = prompt;
         beginPrompt(session, args);
     }
 
     static attachment(session: Session, prompt: string|string[]|IMessage|IIsMessage, options?: IPromptOptions): void {
+        Prompts.validateSession(session);
         var args: IPromptArgs = <any>options || {};
         args.promptType = PromptType.attachment;
         args.prompt = prompt;
         beginPrompt(session, args);
     }
 
     static disambiguate(session: Session, prompt: string|string[]|IMessage|IIsMessage, choices: IDisambiguateChoices, options?: IPromptOptions): void {
+        Prompts.validateSession(session);
         session.beginDialog(consts.DialogId.Disambiguate, {
             prompt: prompt,
             choices: choices,
             options: options
         });
     }
+
+    private static validateSession(session: Session): void {
+        // Make sure that the session is passed, otherwise throw a clear error 
+        if (!session || typeof session != 'object') {
+            throw 'Session should be provided as first parameter.';
+        }
+    }
 }
 systemLib.dialog(consts.DialogId.Prompts, new Prompts());