From 72ceba63e6e9ada6febbadc03ad40897c8ae07c9 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Sat, 5 Sep 2020 21:47:21 +0300
Subject: [PATCH] Move :restrict_unauthenticated settings to Instance tab

---
 src/views/settings/components/Authentication.vue | 10 ----------
 src/views/settings/components/Instance.vue       | 10 ++++++++++
 src/views/settings/components/tabs.js            |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/views/settings/components/Authentication.vue b/src/views/settings/components/Authentication.vue
index 3e919c11..03c3e0c5 100644
--- a/src/views/settings/components/Authentication.vue
+++ b/src/views/settings/components/Authentication.vue
@@ -15,10 +15,6 @@
     <el-form :model="oauth2Data" :label-position="labelPosition" :label-width="labelWidth">
       <setting :setting-group="oauth2" :data="oauth2Data"/>
     </el-form>
-    <el-divider v-if="oauth2" class="divider thick-line"/>
-    <el-form :model="restrictUnauthenticatedData" :label-position="labelPosition" :label-width="labelWidth">
-      <setting :setting-group="restrictUnauthenticated" :data="restrictUnauthenticatedData"/>
-    </el-form>
     <div class="submit-button-container">
       <el-button class="submit-button" type="primary" @click="onSubmit">Submit</el-button>
     </div>
@@ -85,12 +81,6 @@ export default {
     },
     pleromaAuthenticatorData() {
       return _.get(this.settings.settings, [':pleroma', 'Pleroma.Web.Auth.Authenticator']) || {}
-    },
-    restrictUnauthenticated() {
-      return this.settings.description.find(setting => setting.key === ':restrict_unauthenticated')
-    },
-    restrictUnauthenticatedData() {
-      return _.get(this.settings.settings, [':pleroma', ':restrict_unauthenticated']) || {}
     }
   },
   methods: {
diff --git a/src/views/settings/components/Instance.vue b/src/views/settings/components/Instance.vue
index 362393fe..d91b3f28 100644
--- a/src/views/settings/components/Instance.vue
+++ b/src/views/settings/components/Instance.vue
@@ -4,6 +4,10 @@
       <setting :setting-group="instance" :data="instanceData"/>
     </el-form>
     <el-divider v-if="instance" class="divider thick-line"/>
+    <el-form :model="restrictUnauthenticatedData" :label-position="labelPosition" :label-width="labelWidth">
+      <setting :setting-group="restrictUnauthenticated" :data="restrictUnauthenticatedData"/>
+    </el-form>
+    <el-divider v-if="restrictUnauthenticated" class="divider thick-line"/>
     <el-form :model="adminTokenData" :label-position="labelPosition" :label-width="labelWidth">
       <setting :setting-group="adminToken" :data="adminTokenData"/>
     </el-form>
@@ -120,6 +124,12 @@ export default {
     pleromaUserData() {
       return _.get(this.settings.settings, [':pleroma', 'Pleroma.User']) || {}
     },
+    restrictUnauthenticated() {
+      return this.settings.description.find(setting => setting.key === ':restrict_unauthenticated')
+    },
+    restrictUnauthenticatedData() {
+      return _.get(this.settings.settings, [':pleroma', ':restrict_unauthenticated']) || {}
+    },
     scheduledActivity() {
       return this.$store.state.settings.description.find(setting => setting.key === 'Pleroma.ScheduledActivity')
     },
diff --git a/src/views/settings/components/tabs.js b/src/views/settings/components/tabs.js
index 601c0052..b9757fac 100644
--- a/src/views/settings/components/tabs.js
+++ b/src/views/settings/components/tabs.js
@@ -6,7 +6,7 @@ export const tabs = description => {
     },
     'authentication': {
       label: 'settings.auth',
-      settings: [':auth', ':ldap', ':oauth2', 'Pleroma.Web.Auth.Authenticator', ':restrict_unauthenticated']
+      settings: [':auth', ':ldap', ':oauth2', 'Pleroma.Web.Auth.Authenticator']
     },
     'esshd': {
       label: 'settings.esshd',
@@ -30,7 +30,7 @@ export const tabs = description => {
     },
     'instance': {
       label: 'settings.instance',
-      settings: [':admin_token', ':instance', ':instances_favicons', ':welcome', ':manifest', 'Pleroma.User', 'Pleroma.ScheduledActivity', ':uri_schemes', ':feed', ':streamer']
+      settings: [':admin_token', ':instance', ':instances_favicons', ':welcome', ':manifest', 'Pleroma.User', 'Pleroma.ScheduledActivity', ':uri_schemes', ':feed', ':streamer', ':restrict_unauthenticated']
     },
     'job-queue': {
       label: 'settings.jobQueue',