diff --git a/ghost/admin/app/components/modal-regenerate-token.hbs b/ghost/admin/app/components/modal-regenerate-token.hbs
index 2b852172c8..021fede7c2 100644
--- a/ghost/admin/app/components/modal-regenerate-token.hbs
+++ b/ghost/admin/app/components/modal-regenerate-token.hbs
@@ -1,11 +1,11 @@
Regenerate your Personal Token
+ Regenerate your Staff Access Token
- You can regenerate your Personal Token any time, but any scripts or applications using it will need to be updated. + You can regenerate your Staff Access Token any time, but any scripts or applications using it will need to be updated.
{{#if this.errorMessage}}{{this.errorMessage}}
@@ -15,6 +15,6 @@ diff --git a/ghost/admin/app/controllers/staff/user.js b/ghost/admin/app/controllers/staff/user.js index 6542e42f03..50176e2aac 100644 --- a/ghost/admin/app/controllers/staff/user.js +++ b/ghost/admin/app/controllers/staff/user.js @@ -1,5 +1,6 @@ import Controller from '@ember/controller'; import boundOneWay from 'ghost-admin/utils/bound-one-way'; +import copyTextToClipboard from 'ghost-admin/utils/copy-text-to-clipboard'; import isNumber from 'ghost-admin/utils/isNumber'; import validator from 'validator'; import windowProxy from 'ghost-admin/utils/window-proxy'; @@ -471,5 +472,10 @@ export default Controller.extend({ this.notifications.showAPIError(error, {key: 'user.update'}); } } - }).group('saveHandlers') + }).group('saveHandlers'), + + copyContentKey: task(function* () { + copyTextToClipboard(this.personalToken); + yield timeout(this.isTesting ? 50 : 3000); + }) }); diff --git a/ghost/admin/app/styles/layouts/apps.css b/ghost/admin/app/styles/layouts/apps.css index c0eaeb2e58..eb4045b69c 100644 --- a/ghost/admin/app/styles/layouts/apps.css +++ b/ghost/admin/app/styles/layouts/apps.css @@ -174,7 +174,7 @@ border-top: none; } -.apps-card-left { +.apps-card-left { display: flex; align-items: center; } @@ -372,6 +372,13 @@ right: -3px; } +.app-api-personal-token-buttons { + display: flex; + align-items: center; + position: absolute; + right: 5px; +} + .app-button-regenerate { display: flex; align-items: center; @@ -512,4 +519,4 @@ .apps-card-app-orb.rot-3 { transform: rotate(270deg); -} \ No newline at end of file +} diff --git a/ghost/admin/app/templates/staff/user.hbs b/ghost/admin/app/templates/staff/user.hbs index e2011b357d..d51e47d581 100644 --- a/ghost/admin/app/templates/staff/user.hbs +++ b/ghost/admin/app/templates/staff/user.hbs @@ -354,34 +354,42 @@