From 58759b3069ff3430f49dcb198cfd0df894f94b5f Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@ghost.org>
Date: Wed, 21 Apr 2021 12:09:40 +0100
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Added=20option=20to=20disable=20mem?=
 =?UTF-8?q?ber=20subscriptions=20(#1925)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

refs https://github.com/TryGhost/Team/issues/579

- new Access settings screen that moves subscription access and default post visibility from the Payments settings screen
- expanded "Free signup" toggle into three signup access options
  - "anyone" - same as previous "allow free member signup" option set to `true`
  - "invite only" -  same as previous "allow free member signup" option set to `false`
  - "nobody" - completely disables member signup and login. Removes injected portal and stripe scripts on the front-end and hides member related sections on the admin dashboard

(this commit moves the above changes out from behind the developer experiments flag and cleans up now-unused code)
---
 .../gh-launch-wizard/set-pricing.hbs          |  2 +-
 .../gh-launch-wizard/set-pricing.js           |  2 +-
 .../gh-members-payments-setting.hbs           | 64 -------------------
 .../components/gh-members-payments-setting.js | 20 ------
 .../app/components/modal-portal-settings.js   |  4 +-
 ghost/admin/app/models/setting.js             | 16 +----
 ghost/admin/app/templates/settings.hbs        | 14 ++--
 7 files changed, 12 insertions(+), 110 deletions(-)

diff --git a/ghost/admin/app/components/gh-launch-wizard/set-pricing.hbs b/ghost/admin/app/components/gh-launch-wizard/set-pricing.hbs
index 31da1f55f5..63f4ace1e2 100644
--- a/ghost/admin/app/components/gh-launch-wizard/set-pricing.hbs
+++ b/ghost/admin/app/components/gh-launch-wizard/set-pricing.hbs
@@ -66,7 +66,7 @@
                         checked={{this.isFreeChecked}}
                         id="free-plan"
                         name="free-plan"
-                        disabled={{not this.settings.membersAllowFreeSignup}}
+                        disabled={{not (eq this.settings.membersSignupAccess "all")}}
                         class="gh-input post-settings-featured"
                         {{on "click" this.toggleFreePlan}}
                         data-test-checkbox="featured"
diff --git a/ghost/admin/app/components/gh-launch-wizard/set-pricing.js b/ghost/admin/app/components/gh-launch-wizard/set-pricing.js
index cefbb3ee13..b3e33e2843 100644
--- a/ghost/admin/app/components/gh-launch-wizard/set-pricing.js
+++ b/ghost/admin/app/components/gh-launch-wizard/set-pricing.js
@@ -46,7 +46,7 @@ export default class GhLaunchWizardSetPricingComponent extends Component {
 
     get isFreeChecked() {
         const allowedPlans = this.settings.get('portalPlans') || [];
-        return (this.settings.get('membersAllowFreeSignup') && allowedPlans.includes('free'));
+        return (this.settings.get('membersSignupAccess') === 'all' && allowedPlans.includes('free'));
     }
 
     get isMonthlyChecked() {
diff --git a/ghost/admin/app/components/gh-members-payments-setting.hbs b/ghost/admin/app/components/gh-members-payments-setting.hbs
index 05148fd5e5..b2a57ecc6e 100644
--- a/ghost/admin/app/components/gh-members-payments-setting.hbs
+++ b/ghost/admin/app/components/gh-members-payments-setting.hbs
@@ -216,70 +216,6 @@
     </section>
 </div>
 
-{{#unless (enable-developer-experiments)}}
-<div class="gh-main-section">
-    <h4 class="gh-main-section-header small bn">Access</h4>
-    <section class="gh-expandable">
-        <div class="gh-expandable-block">
-            <div class="gh-expandable-header">
-                <div>
-                    <h4 class="gh-expandable-title">Allow free member signup</h4>
-                    <p class="gh-expandable-description">If disabled, members can only be signed up via payment checkout or API integration</p>
-                </div>
-                <div class="for-switch">
-                    <label class="switch" for="members-allow-self-signup" {{action "toggleSelfSignup" bubbles="false"}}>
-                        <input type="checkbox" checked={{this.allowSelfSignup}} class="gh-input" onclick={{action "toggleSelfSignup"}} data-test-checkbox="members-allow-self-signup">
-                        <span class="input-toggle-component mt1"></span>
-                    </label>
-                </div>
-            </div>
-        </div>
-
-        <div class="gh-expandable-block">
-            <div class="gh-expandable-header">
-                <div>
-                    <h4 class="gh-expandable-title">Default post access</h4>
-                    <p class="gh-expandable-description">When a new post is created, who should have access to it?</p>
-                </div>
-                <button type="button" class="gh-btn" {{action (toggle "membersPostAccessOpen" this)}} data-test-toggle-memberspostaccess><span>{{if this.membersPostAccessOpen "Close" "Expand"}}</span></button>
-            </div>
-            <div class="gh-expandable-content">
-                {{#liquid-if this.membersPostAccessOpen}}
-                <div class="flex flex-column w-50 flex">
-                    <div class="gh-radio {{if (eq settings.defaultContentVisibility "public") "active"}}"
-                        {{action "setDefaultContentVisibility" "public" on="click"}}>
-                        <div class="gh-radio-button" data-test-publishmenu-unpublished-option></div>
-                        <div class="gh-radio-content">
-                            <div class="gh-radio-label">Public<br>
-                            <small class="midgrey">All site visitors to your site, no login required</small></div>
-                        </div>
-                    </div>
-
-                    <div class="gh-radio {{if (eq settings.defaultContentVisibility "members") "active"}}"
-                        {{action "setDefaultContentVisibility" "members" on="click"}}>
-                        <div class="gh-radio-button" data-test-publishmenu-published-option></div>
-                        <div class="gh-radio-content">
-                            <div class="gh-radio-label">Members only<br>
-                            <small class="midgrey">All logged-in members</small></div>
-                        </div>
-                    </div>
-
-                    <div class="gh-radio {{if (eq settings.defaultContentVisibility "paid") "active"}}"
-                        {{action "setDefaultContentVisibility" "paid" on="click"}}>
-                        <div class="gh-radio-button" data-test-publishmenu-published-option></div>
-                        <div class="gh-radio-content">
-                            <div class="gh-radio-label">Paid-members only<br>
-                            <small class="midgrey">Only logged-in members with an active Stripe subscription</small></div>
-                        </div>
-                    </div>
-                </div>
-                {{/liquid-if}}
-            </div>
-        </div>
-    </section>
-</div>
-{{/unless}}
-
 {{#if this.showDisconnectStripeConnectModal}}
     <GhFullscreenModal @modal="disconnect-stripe"
         @model={{hash
diff --git a/ghost/admin/app/components/gh-members-payments-setting.js b/ghost/admin/app/components/gh-members-payments-setting.js
index 9e5254afa4..532653f454 100644
--- a/ghost/admin/app/components/gh-members-payments-setting.js
+++ b/ghost/admin/app/components/gh-members-payments-setting.js
@@ -6,9 +6,7 @@ import {inject as service} from '@ember/service';
 import {task} from 'ember-concurrency';
 
 export default Component.extend({
-    feature: service(),
     config: service(),
-    mediaQueries: service(),
     ghostPaths: service(),
     ajax: service(),
     settings: service(),
@@ -23,12 +21,8 @@ export default Component.extend({
     // passed in actions
     setStripeConnectIntegrationTokenSetting() {},
 
-    defaultContentVisibility: reads('settings.defaultContentVisibility'),
-
     stripeDirect: reads('config.stripeDirect'),
 
-    allowSelfSignup: reads('settings.membersAllowFreeSignup'),
-
     /** OLD **/
     stripeDirectPublicKey: reads('settings.stripePublishableKey'),
     stripeDirectSecretKey: reads('settings.stripeSecretKey'),
@@ -41,12 +35,6 @@ export default Component.extend({
         return this.get('currencies').findBy('value', this.get('stripePlans.monthly.currency')) || this.get('topCurrencies').findBy('value', this.get('stripePlans.monthly.currency'));
     }),
 
-    blogDomain: computed('config.blogDomain', function () {
-        let blogDomain = this.config.blogDomain || '';
-        const domainExp = blogDomain.replace('https://', '').replace('http://', '').match(new RegExp('^([^/:?#]+)(?:[/:?#]|$)', 'i'));
-        return (domainExp && domainExp[1]) || '';
-    }),
-
     stripePlans: computed('settings.stripePlans', function () {
         const plans = this.settings.get('stripePlans');
         const monthly = plans.find(plan => plan.interval === 'month');
@@ -103,14 +91,6 @@ export default Component.extend({
     },
 
     actions: {
-        setDefaultContentVisibility(value) {
-            this.setDefaultContentVisibility(value);
-        },
-
-        toggleSelfSignup() {
-            this.set('settings.membersAllowFreeSignup', !this.get('allowSelfSignup'));
-        },
-
         setStripeDirectPublicKey(event) {
             this.set('settings.stripeProductName', this.get('settings.title'));
             this.set('settings.stripePublishableKey', event.target.value);
diff --git a/ghost/admin/app/components/modal-portal-settings.js b/ghost/admin/app/components/modal-portal-settings.js
index 2045d125d7..fd511bb9ca 100644
--- a/ghost/admin/app/components/modal-portal-settings.js
+++ b/ghost/admin/app/components/modal-portal-settings.js
@@ -1,8 +1,8 @@
 import $ from 'jquery';
 import ModalComponent from 'ghost-admin/components/modal-base';
 import copyTextToClipboard from 'ghost-admin/utils/copy-text-to-clipboard';
-import {alias, reads} from '@ember/object/computed';
 import {computed} from '@ember/object';
+import {equal, reads} from '@ember/object/computed';
 import {htmlSafe} from '@ember/string';
 import {run} from '@ember/runloop';
 import {inject as service} from '@ember/service';
@@ -49,7 +49,7 @@ export default ModalComponent.extend({
 
     confirm() {},
 
-    allowSelfSignup: alias('settings.membersAllowFreeSignup'),
+    allowSelfSignup: equal('settings.membersSignupAccess', 'all'),
 
     isStripeConfigured: reads('membersUtils.isStripeEnabled'),
 
diff --git a/ghost/admin/app/models/setting.js b/ghost/admin/app/models/setting.js
index bdeb135c15..1145b5b675 100644
--- a/ghost/admin/app/models/setting.js
+++ b/ghost/admin/app/models/setting.js
@@ -1,7 +1,6 @@
 /* eslint-disable camelcase */
 import Model, {attr} from '@ember-data/model';
 import ValidationEngine from 'ghost-admin/mixins/validation-engine';
-import {computed} from '@ember/object';
 
 export default Model.extend(ValidationEngine, {
     validationType: 'setting',
@@ -75,18 +74,5 @@ export default Model.extend(ValidationEngine, {
     newsletterShowHeader: attr('boolean'),
     newsletterBodyFontCategory: attr('string'),
     newsletterShowBadge: attr('boolean'),
-    newsletterFooterContent: attr('string'),
-
-    // TODO: remove when Access screen with "Nobody" option is out of dev experiments
-    membersAllowFreeSignup: computed('membersSignupAccess', {
-        get() {
-            const signupAccess = this.membersSignupAccess;
-            return signupAccess === 'all' ? true : false;
-        },
-        set(key, allowFreeSignup) {
-            const signupAccess = allowFreeSignup ? 'all' : 'invite';
-            this.set('membersSignupAccess', signupAccess);
-            return allowFreeSignup;
-        }
-    })
+    newsletterFooterContent: attr('string')
 });
diff --git a/ghost/admin/app/templates/settings.hbs b/ghost/admin/app/templates/settings.hbs
index 1d255dcdbd..46fb479c43 100644
--- a/ghost/admin/app/templates/settings.hbs
+++ b/ghost/admin/app/templates/settings.hbs
@@ -40,14 +40,14 @@
 
         <div class="gh-setting-header">Members</div>
         <div class="gh-settings-main-grid">
+            <LinkTo class="gh-setting-group" @route="settings.members-access" data-test-nav="members-access">
+                <span class="blue">{{svg-jar "eye"}}</span>
+                <div>
+                    <h4>Access</h4>
+                    <p>Configure members usage and default access levels</p>
+                </div>
+            </LinkTo>
             {{#if (enable-developer-experiments)}}
-                <LinkTo class="gh-setting-group" @route="settings.members-access" data-test-nav="members-access">
-                    <span class="blue">{{svg-jar "eye"}}</span>
-                    <div>
-                        <h4>Access</h4>
-                        <p>Configure members usage and default access levels</p>
-                    </div>
-                </LinkTo>
             <LinkTo class="gh-setting-group" @route="settings.products" data-test-nav="members-access">
                 <span class="green">{{svg-jar "module"}}</span>
                 <div>