Change to single strategy

plugins/core/base/routes/admin/migration.js

@@ -10,9 +10,7 @@ module.exports = {
   path: "/admin/migration/{tool}/{id?}",
   method: "GET",
   config: {
-    auth: {
-      strategies: ["q-auth-azure", "q-auth-ld"],
-    },
+    auth: "q-auth-azure-then-ld",
     cors: {
       credentials: true,
     },

plugins/core/base/routes/item.js

@@ -41,7 +41,7 @@ module.exports = {
     method: "GET",
     options: {
       auth: {
-        strategies: ["q-auth-azure", "q-auth-ld"],
+        strategy: "q-auth-azure-then-ld",
         mode: "optional",
       },
       cors: {
@@ -82,7 +82,7 @@ module.exports = {
         },
       },
       auth: {
-        strategies: ["q-auth-azure", "q-auth-ld"],
+        strategy: "q-auth-azure-then-ld",
       },
       cors: {
         credentials: true,
@@ -150,9 +150,7 @@ module.exports = {
           allowUnknown: true,
         },
       },
-      auth: {
-        strategies: ["q-auth-azure", "q-auth-ld"],
-      },
+      auth: "q-auth-azure-then-ld",
       cors: {
         credentials: true,
       },

plugins/core/base/routes/search.js

@@ -5,7 +5,7 @@ module.exports = {
   method: "GET",
   options: {
     auth: {
-      strategies: ["q-auth-azure", "q-auth-ld"],
+      strategy: "q-auth-azure-then-ld",
       mode: "try",
     },
     cors: {

plugins/core/editor/index.js

@@ -35,7 +35,7 @@ module.exports = {
       method: "GET",
       options: {
         auth: {
-          strategies: ["q-auth-azure", "q-auth-ld"],
+          strategy: "q-auth-azure-then-ld",
           mode: "try",
         },
         description: "Returns configuration for Q Editor",

plugins/core/editor/routes/tools-ordered-by-user-usage.js

@@ -2,9 +2,7 @@ module.exports = {
   path: "/editor/tools-ordered-by-user-usage",
   method: "GET",
   options: {
-    auth: {
-      strategies: ["q-auth-azure", "q-auth-ld"],
-    },
+    auth: "q-auth-azure-then-ld",
     cors: {
       credentials: true,
     },

plugins/core/editor/routes/tools.js

@@ -3,7 +3,7 @@ module.exports = {
   method: "GET",
   options: {
     auth: {
-      strategies: ["q-auth-azure", "q-auth-ld"],
+      strategy: "q-auth-azure-then-ld",
       mode: "try",
     },
     description: "Returns all available Q tool names",

plugins/file/index.js

@@ -60,9 +60,7 @@ module.exports = {
       method: "POST",
       path: "/file",
       options: {
-        auth: {
-          strategies: ["q-auth-azure", "q-auth-ld"],
-        },
+        auth: "q-auth-azure-then-ld",
         cors: {
           credentials: true,
           additionalHeaders: [

plugins/fixtures/routes.js

@@ -5,7 +5,7 @@ module.exports = {
     path: "/fixtures/data",
     method: "POST",
     options: {
-      auth: "q-auth-azure",
+      auth: "q-auth-azure-then-ld",
       cors: {
         credentials: true,
       },
@@ -28,7 +28,7 @@ module.exports = {
             method: "PUT",
             payload: item,
             auth: {
-              strategy: "q-auth-azure",
+              strategy: "q-auth-azure-then-ld",
               credentials: request.auth.credentials,
             },
           });
@@ -48,7 +48,7 @@ module.exports = {
             method: "POST",
             payload: item,
             auth: {
-              strategy: "q-auth-azure",
+              strategy: "q-auth-azure-then-ld",
               credentials: request.auth.credentials,
             },
           });

plugins/statistics/index.js

@@ -10,7 +10,7 @@ module.exports = {
       method: "GET",
       config: {
         auth: {
-          strategies: ["q-auth-azure", "q-auth-ld"],
+          strategy: "q-auth-azure-then-ld",
           mode: "optional",
         },
         cors: {

plugins/tasks/index.js

@@ -17,9 +17,7 @@ module.exports = {
       options: {
         description: "Returns configuration for tasks",
         tags: ["api", "tasks"],
-        auth: {
-          strategies: ["q-auth-azure", "q-auth-ld"],
-        },
+        auth: "q-auth-azure-then-ld",
         cors: {
           credentials: true,
         },

test/config/tasks.js

@@ -10,9 +10,7 @@ const tasks = {
           path: "/tasks/test",
           method: "POST",
           options: {
-            auth: {
-              strategies: ["q-auth-azure", "q-auth-ld"],
-            },
+            auth: "q-auth-azure-then-ld",
             cors: {
               credentials: true,
             },
@@ -44,9 +42,7 @@ const tasks = {
           path: "/tasks/admintest",
           method: "POST",
           options: {
-            auth: {
-              strategies: ["q-auth-azure", "q-auth-ld"],
-            },
+            auth: "q-auth-azure-then-ld",
             cors: {
               credentials: true,
             },

test/e2e-tests.js

@@ -85,7 +85,7 @@ lab.experiment("core item", () => {
     const request = {
       method: "POST",
       auth: {
-        strategy: "q-auth-azure",
+        strategy: "q-auth-azure-then-ld",
         credentials: { username: "user", password: "pass" },
       },
       url: "/item",
@@ -103,7 +103,7 @@ lab.experiment("core item", () => {
     const request = {
       method: "PUT",
       auth: {
-        strategy: "q-auth-azure",
+        strategy: "q-auth-azure-then-ld",
         credentials: { username: "user", password: "pass" },
       },
       url: "/item",
@@ -119,7 +119,7 @@ lab.experiment("core item", () => {
     const request = {
       method: "PUT",
       auth: {
-        strategy: "q-auth-azure",
+        strategy: "q-auth-azure-then-ld",
         credentials: { username: "user", password: "pass" },
       },
       url: "/item",
@@ -142,7 +142,7 @@ lab.experiment("core item", () => {
       const request = {
         method: "POST",
         auth: {
-          strategy: "q-auth-azure",
+          strategy: "q-auth-azure-then-ld",
           credentials: { username: "user", password: "pass" },
         },
         url: "/item",
@@ -168,7 +168,7 @@ lab.experiment("core item", () => {
       const request = {
         method: "PUT",
         auth: {
-          strategy: "q-auth-azure",
+          strategy: "q-auth-azure-then-ld",
           credentials: { username: "user", password: "pass" },
         },
         url: "/item",
@@ -199,7 +199,7 @@ lab.experiment("core item", () => {
       const request = {
         method: "POST",
         auth: {
-          strategy: "q-auth-azure",
+          strategy: "q-auth-azure-then-ld",
           credentials: { username: "user", password: "pass" },
         },
         url: "/item",
@@ -230,7 +230,7 @@ lab.experiment("core item", () => {
       const request = {
         method: "PUT",
         auth: {
-          strategy: "q-auth-azure",
+          strategy: "q-auth-azure-then-ld",
           credentials: { username: "user", password: "pass" },
         },
         url: "/item",
@@ -262,7 +262,7 @@ lab.experiment("core item", () => {
       const request = {
         method: "PUT",
         auth: {
-          strategy: "q-auth-azure",
+          strategy: "q-auth-azure-then-ld",
           credentials: { username: "user", password: "pass" },
         },
         url: "/item",
@@ -294,7 +294,7 @@ lab.experiment("core item", () => {
       const request = {
         method: "PUT",
         auth: {
-          strategy: "q-auth-azure",
+          strategy: "q-auth-azure-then-ld",
           credentials: { username: "user", password: "pass" },
         },
         url: "/item",
@@ -326,7 +326,7 @@ lab.experiment("core item", () => {
       const request = {
         method: "PUT",
         auth: {
-          strategy: "q-auth-azure",
+          strategy: "q-auth-azure-then-ld",
           credentials: { username: "user", password: "pass" },
         },
         url: "/item",
@@ -801,7 +801,7 @@ lab.experiment("fixture data plugin", () => {
       method: "POST",
       url: "/fixtures/data",
       auth: {
-        strategy: "q-auth-azure",
+        strategy: "q-auth-azure-then-ld",
         credentials: { username: "user", password: "pass" },
       },
     });
@@ -868,7 +868,7 @@ lab.experiment("tasks plugin", () => {
       method: "GET",
       url: "/tasks",
       auth: {
-        strategy: "q-auth-azure",
+        strategy: "q-auth-azure-then-ld",
         credentials: { username: "user", password: "pass" },
       },
     });
@@ -880,7 +880,7 @@ lab.experiment("tasks plugin", () => {
       method: "GET",
       url: "/tasks",
       auth: {
-        strategy: "q-auth-azure",
+        strategy: "q-auth-azure-then-ld",
         credentials: { username: "user", password: "pass", roles: ["admin"] },
       },
     });
@@ -897,7 +897,7 @@ lab.experiment("tasks plugin", () => {
       method: "POST",
       url: "/tasks/test",
       auth: {
-        strategy: "q-auth-azure",
+        strategy: "q-auth-azure-then-ld",
         credentials: { username: "user", password: "pass" },
       },
       payload: payload,

test/server.js

@@ -23,8 +23,7 @@ function getServer() {
       },
     };
   });
-  server.auth.strategy("q-auth-azure", "mock");
-  server.auth.strategy("q-auth-ld", "mock");
+  server.auth.strategy("q-auth-azure-then-ld", "mock");
   return server;
 }