OpenSourceArk/Ghost
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛 fix oAuth login for blog urls which contain /ghost (#429)

Browse Source 
no issue
- use the configured `blogUrl` value rather than using `window.location.href` with a poor regex that was incorrectly matching on domains containing multiple `/ghost` parts such as `http://ghost.local:2368/ghost`
This commit is contained in:
Kevin Ansfield 2016-12-03 15:56:51 +07:00 committed by Austin Burdine
parent 413ea7de18
commit 106be90416
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ghost/admin/app/torii-providers/ghost-oauth2.js
View File

@ -19,7 +19,10 @@ let GhostOauth2 = Oauth2.extend({
responseParams: ['code'], responseParams: ['code'],
// we want to redirect to the ghost admin app by default // we want to redirect to the ghost admin app by default
redirectUri: window.location.href.replace(/(\/ghost)(.*)/, '$1/'), init() {
this._super(...arguments);
this.set('redirectUri', `${this.get('config.blogUrl')}/ghost/`);
},
open(options) { open(options) {
if (options.type) { if (options.type) {