Merge pull request #37 from MSMeMend/master

Added brain loading for peristent brains
microsoft · Aug 28, 2018 · 342cb8c · 342cb8c
2 parents a42662c + 7a5a541
commit 342cb8c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/src/adapter.coffee b/src/adapter.coffee
@@ -31,18 +31,20 @@ class BotFrameworkAdapter extends Adapter
         robot.logger.info "#{LogPrefix} Adapter loaded. Using appId #{@appId}"
 
         # Initial Admins should be required when auth is enabled
-        if @enableAuth
-            if @initialAdmins?
-                # If there isn't a list of authorized users in the brain, populate
-                # it with admins from the environment variable
-                if robot.brain.get("authorizedUsers") is null
-                    robot.logger.info "#{LogPrefix} Restricting by name, setting admins"
-                    authorizedUsers = {}
-                    for admin in process.env.HUBOT_TEAMS_INITIAL_ADMINS.split(",")
-                        authorizedUsers[admin.toLowerCase()] = true
-                    robot.brain.set("authorizedUsers", authorizedUsers)
-            else
-                throw new Error("HUBOT_TEAMS_INITIAL_ADMINS is required for authorization")
+        @robot.brain.on( "loaded", () =>
+            if @enableAuth
+                if @initialAdmins?
+                    # If there isn't a list of authorized users in the brain, populate
+                    # it with admins from the environment variable
+                    if robot.brain.get("authorizedUsers") is null
+                        robot.logger.info "#{LogPrefix} Restricting by name, setting admins"
+                        authorizedUsers = {}
+                        for admin in process.env.HUBOT_TEAMS_INITIAL_ADMINS.split(",")
+                            authorizedUsers[admin.toLowerCase()] = true
+                        robot.brain.set("authorizedUsers", authorizedUsers)
+                else
+                    throw new Error("HUBOT_TEAMS_INITIAL_ADMINS is required for authorization")
+        )
 
         @connector  = new BotBuilder.ChatConnector {
             appId: @appId
@@ -53,7 +55,6 @@ class BotFrameworkAdapter extends Adapter
 
         @connector.onInvoke (events, cb) => @onInvoke events, cb
 
-
     # Handles the invoke and passes an event to be handled, if needed
     onInvoke: (invokeEvent, cb) ->
         middleware = @using(invokeEvent.source)

diff --git a/test/mock-robot.coffee b/test/mock-robot.coffee
@@ -32,6 +32,8 @@ class MockRobot
                 return null
             set: (key, value) ->
                 @data[key] = value
+            on: (eventType, functionToRun) ->
+                functionToRun()
 
     receive: (event) ->
         @brain.data["event"] = event