set a flag if the scope has parameters and only call replace in that case

nlf · nlf · commit 8baad900cd08 · 2015-05-20T16:56:18.000-07:00
diff --git a/lib/auth.js b/lib/auth.js
@@ -129,6 +129,15 @@ internals.Auth.prototype._setupRoute = function (options, path) {
         options.scope = [options.scope];
     }
 
+    if (options.scope) {
+        for (var i = 0, il = options.scope.length; i < il; ++i) {
+            if (/{([^{}]+)}/g.test(options.scope[i])) {
+                options.hasScopeParameters = true;
+                break;
+            }
+        }
+    }
+
     Hoek.assert(options.strategies.length, 'Route missing authentication strategy:', path);
 
     options.mode = options.mode || 'required';
@@ -274,17 +283,19 @@ internals.Auth.prototype._authenticate = function (request, next) {
         // Check scope
 
         if (config.scope) {
-            var expandScope = function (_, context) {
-
-                return Hoek.reach({
-                    params: request.params,
-                    query: request.query,
-                    payload: request.payload
-                }, context);
-            };
-
-            for (var i = 0, il = config.scope.length; i < il; ++i) {
-                config.scope[i] = config.scope[i].replace(/{([^{}]+)}/g, expandScope);
+            if (config.hasScopeParameters) {
+                var expandScope = function (_, context) {
+
+                    return Hoek.reach({
+                        params: request.params,
+                        query: request.query,
+                        payload: request.payload
+                    }, context);
+                };
+
+                for (var i = 0, il = config.scope.length; i < il; ++i) {
+                    config.scope[i] = config.scope[i].replace(/{([^{}]+)}/g, expandScope);
+                }
             }
 
             if (!credentials.scope ||
