From 4441ee15a09b93d82e5598605ddd76bac3030723 Mon Sep 17 00:00:00 2001
From: Nazar Gargol <nazargargol@gmail.com>
Date: Thu, 25 Jul 2019 14:36:51 +0200
Subject: [PATCH] Migrated authentication.isSetup method to v2

---
 core/server/api/v2/authentication.js            | 17 +++++++++++++++++
 .../utils/serializers/output/authentication.js  |  6 ++++++
 core/server/web/api/v2/admin/routes.js          |  2 +-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/core/server/api/v2/authentication.js b/core/server/api/v2/authentication.js
index acfd947f24..a48a2fa21e 100644
--- a/core/server/api/v2/authentication.js
+++ b/core/server/api/v2/authentication.js
@@ -1,4 +1,5 @@
 const api = require('./index');
+const config = require('../../config');
 const web = require('../../web');
 const models = require('../../models');
 const auth = require('../../services/auth');
@@ -34,6 +35,22 @@ module.exports = {
         }
     },
 
+    isSetup: {
+        permissions: false,
+        query() {
+            return auth.setup.checkIsSetup()
+                .then((isSetup) => {
+                    return {
+                        status: isSetup,
+                        // Pre-populate from config if, and only if the values exist in config.
+                        title: config.title || undefined,
+                        name: config.user_name || undefined,
+                        email: config.user_email || undefined
+                    };
+                });
+        }
+    },
+
     generateResetToken: {
         permissions: true,
         options: [
diff --git a/core/server/api/v2/utils/serializers/output/authentication.js b/core/server/api/v2/utils/serializers/output/authentication.js
index a300a62ad0..9aa02df289 100644
--- a/core/server/api/v2/utils/serializers/output/authentication.js
+++ b/core/server/api/v2/utils/serializers/output/authentication.js
@@ -11,6 +11,12 @@ module.exports = {
         };
     },
 
+    isSetup(data, apiConfig, frame) {
+        frame.response = {
+            setup: [data]
+        };
+    },
+
     acceptInvitation(data, apiConfig, frame) {
         debug('acceptInvitation');
 
diff --git a/core/server/web/api/v2/admin/routes.js b/core/server/web/api/v2/admin/routes.js
index b7296f5089..85851f2458 100644
--- a/core/server/web/api/v2/admin/routes.js
+++ b/core/server/web/api/v2/admin/routes.js
@@ -191,7 +191,7 @@ module.exports = function apiRoutes() {
     router.get('/authentication/invitation', api.http(apiv2.authentication.isInvitation));
     router.post('/authentication/setup', api.http(apiv2.authentication.setup));
     router.put('/authentication/setup', mw.authAdminApi, api.http(api.authentication.updateSetup));
-    router.get('/authentication/setup', api.http(api.authentication.isSetup));
+    router.get('/authentication/setup', api.http(apiv2.authentication.isSetup));
 
     // ## Images
     router.post('/images/upload',