From 7521d694051e08383594bcc886f6912fa672ef39 Mon Sep 17 00:00:00 2001 From: Hannah Wolfe Date: Mon, 16 May 2022 17:37:00 +0100 Subject: [PATCH] Removed oauth experiment (#2390) refs: https://github.com/TryGhost/Team/issues/1625 - this didn't work the way we wanted to - removing this will free up the namespaces to start over --- ghost/admin/.lint-todo | 6 +++ ghost/admin/app/controllers/settings/labs.js | 20 +-------- ghost/admin/app/models/setting.js | 6 +-- ghost/admin/app/services/feature.js | 1 - ghost/admin/app/services/settings.js | 2 +- ghost/admin/app/templates/settings/labs.hbs | 44 -------------------- ghost/admin/app/templates/signin.hbs | 11 ----- 7 files changed, 9 insertions(+), 81 deletions(-) diff --git a/ghost/admin/.lint-todo b/ghost/admin/.lint-todo index 4f0a40374c..37f200eaf3 100644 --- a/ghost/admin/.lint-todo +++ b/ghost/admin/.lint-todo @@ -1188,3 +1188,9 @@ remove|ember-template-lint|no-action|207|63|207|63|682c80ff5163c8e4a2bea89f2066d remove|ember-template-lint|no-action|216|59|216|59|a80dd18e18dda6fb6f1f97d87bef2b8c2ce3d847|1652054400000|1662422400000|1665014400000|app/templates/settings/membership.hbs remove|ember-template-lint|no-passed-in-event-handlers|206|52|206|52|dcb4785647a50814bcfce82f8d68ac8dd8f54ec2|1652054400000|1662422400000|1665014400000|app/templates/settings/membership.hbs remove|ember-template-lint|no-passed-in-event-handlers|216|52|216|52|70487c008d7dda453fef82f0140699ee93c0055c|1652054400000|1662422400000|1665014400000|app/templates/settings/membership.hbs +remove|ember-template-lint|no-action|214|55|214|55|da852fe4064a61e18c07b15cb10e95b8ecc6666f|1652054400000|1662422400000|1665014400000|app/templates/settings/labs.hbs +remove|ember-template-lint|no-action|215|51|215|51|271aabc30313a0e93dae42dbfc729b7cd0e0ecfd|1652054400000|1662422400000|1665014400000|app/templates/settings/labs.hbs +remove|ember-template-lint|no-action|225|55|225|55|da852fe4064a61e18c07b15cb10e95b8ecc6666f|1652054400000|1662422400000|1665014400000|app/templates/settings/labs.hbs +remove|ember-template-lint|no-action|226|51|226|51|4104427b3770f8810844e0c71c7b49f00cd4adc3|1652054400000|1662422400000|1665014400000|app/templates/settings/labs.hbs +remove|ember-template-lint|no-passed-in-event-handlers|215|44|215|44|5d98389160e93540d9c809151effabc297a8a2a1|1652054400000|1662422400000|1665014400000|app/templates/settings/labs.hbs +remove|ember-template-lint|no-passed-in-event-handlers|226|44|226|44|57b3bc0ba2625f4feb98ee4fae58805f88c075ca|1652054400000|1662422400000|1665014400000|app/templates/settings/labs.hbs diff --git a/ghost/admin/app/controllers/settings/labs.js b/ghost/admin/app/controllers/settings/labs.js index d3c2db7212..b4ab751e95 100644 --- a/ghost/admin/app/controllers/settings/labs.js +++ b/ghost/admin/app/controllers/settings/labs.js @@ -10,7 +10,7 @@ import { isRequestEntityTooLargeError, isUnsupportedMediaTypeError } from 'ghost-admin/services/ajax'; -import {action, set} from '@ember/object'; +import {action} from '@ember/object'; import {isBlank} from '@ember/utils'; import {isArray as isEmberArray} from '@ember/array'; import {run} from '@ember/runloop'; @@ -58,7 +58,6 @@ export default class LabsController extends Controller { yamlExtension = null; yamlMimeType = null; yamlAccept = null; - isOAuthConfigurationOpen = false; init() { super.init(...arguments); @@ -143,11 +142,6 @@ export default class LabsController extends Controller { this.utils.downloadFile(this.ghostPaths.url.api(endpoint)); } - @action - async saveOAuthSettings() { - await this.settings.save(); - } - @action toggleDeleteAllModal() { this.toggleProperty('showDeleteAllModal'); @@ -158,18 +152,6 @@ export default class LabsController extends Controller { this.toggleProperty('showEarlyAccessModal'); } - @action - async toggleIsOAuthEnabled() { - if (this.isOAuthEnabled) { - this.settings.set('oauthClientId', ''); - this.settings.set('oauthClientSecret', ''); - set(this, 'isOAuthConfigurationOpen', false); - await this.settings.save(); - } else { - set(this, 'isOAuthConfigurationOpen', true); - } - } - /** * Opens a file selection dialog - Triggered by "Upload x" buttons, * searches for the hidden file input within the .gh-setting element diff --git a/ghost/admin/app/models/setting.js b/ghost/admin/app/models/setting.js index d06016eacc..4764da2cf7 100644 --- a/ghost/admin/app/models/setting.js +++ b/ghost/admin/app/models/setting.js @@ -69,11 +69,7 @@ export default Model.extend(ValidationEngine, { stripeConnectLivemode: attr('boolean'), stripeConnectDisplayName: attr('string'), stripeConnectAccountId: attr('string'), - /** - * OAuth settings - */ - oauthClientId: attr('string'), - oauthClientSecret: attr('string'), + /** * Editor settings */ diff --git a/ghost/admin/app/services/feature.js b/ghost/admin/app/services/feature.js index 9d303c021b..ead6b95166 100644 --- a/ghost/admin/app/services/feature.js +++ b/ghost/admin/app/services/feature.js @@ -57,7 +57,6 @@ export default class FeatureService extends Service { // labs flags @feature('dashboardV5') dashboardV5; - @feature('oauthLogin') oauthLogin; @feature('membersActivity') membersActivity; @feature('urlCache') urlCache; @feature('beforeAfterCard') beforeAfterCard; diff --git a/ghost/admin/app/services/settings.js b/ghost/admin/app/services/settings.js index 5b791ad6b2..19fe83c5d9 100644 --- a/ghost/admin/app/services/settings.js +++ b/ghost/admin/app/services/settings.js @@ -29,7 +29,7 @@ export default class SettingsService extends Service.extend(_ProxyMixin, Validat _loadSettings() { if (!this._loadingPromise) { this._loadingPromise = this.store - .queryRecord('setting', {group: 'site,theme,private,members,portal,newsletter,email,amp,labs,slack,unsplash,views,firstpromoter,oauth,editor'}) + .queryRecord('setting', {group: 'site,theme,private,members,portal,newsletter,email,amp,labs,slack,unsplash,views,firstpromoter,editor'}) .then((settings) => { this._loadingPromise = null; return settings; diff --git a/ghost/admin/app/templates/settings/labs.hbs b/ghost/admin/app/templates/settings/labs.hbs index 6d4935c77b..23d648ea7c 100644 --- a/ghost/admin/app/templates/settings/labs.hbs +++ b/ghost/admin/app/templates/settings/labs.hbs @@ -187,50 +187,6 @@

Alpha Features

-
-
-
-

Google OAuth for staff users

-

- Allow people to sign into Ghost Admin using Google SSO, - docs here -

-
-
- -
-
-
- {{#if this.feature.oauthLogin}} -
- {{svg-jar "google-favicon"}}Configure Google OAuth - -
- - -
- -
- - -
- -
- {{/if}} -
-
diff --git a/ghost/admin/app/templates/signin.hbs b/ghost/admin/app/templates/signin.hbs index 246e514d01..32b225b793 100644 --- a/ghost/admin/app/templates/signin.hbs +++ b/ghost/admin/app/templates/signin.hbs @@ -17,17 +17,6 @@

Sign in to {{this.config.blogTitle}}.

- {{#if this.config.oauth}} - - -
- or -
- {{/if}}