move array creation to route setup, clean up the loop a little

nlf · nlf · commit 2b10130ddf2b · 2015-05-19T11:47:01.000-07:00
diff --git a/lib/auth.js b/lib/auth.js
@@ -125,6 +125,10 @@ internals.Auth.prototype._setupRoute = function (options, path) {
         options = Hoek.applyToDefaults(this.settings.default, options);
     }
 
+    if (typeof options.scope === 'string') {
+        options.scope = [options.scope];
+    }
+
     Hoek.assert(options.strategies.length, 'Route missing authentication strategy:', path);
 
     options.mode = options.mode || 'required';
@@ -269,25 +273,18 @@ internals.Auth.prototype._authenticate = function (request, next) {
 
         // Check scope
 
-        var expandScope = function (scope) {
-
-            return scope.replace(/{([^{}]+)}/g, function (_, context) {
+        if (config.scope) {
+            var expandScope = function (_, context) {
 
                 return Hoek.reach({
                     params: request.params,
                     query: request.query,
                     payload: request.payload
                 }, context);
-            });
-        };
-
-        if (config.scope) {
-            if (typeof config.scope === 'string') {
-                config.scope = [config.scope];
-            }
+            };
 
             for (var i = 0, il = config.scope.length; i < il; ++i) {
-                config.scope[i] = expandScope(config.scope[i]);
+                config.scope[i] = config.scope[i].replace(/{([^{}]+)}/g, expandScope);
             }
 
             if (!credentials.scope ||
