Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

✨ change ghost client redirect_uri #7595

Merged
merged 1 commit into from
Oct 21, 2016
Merged

✨ change ghost client redirect_uri #7595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 23 additions & 5 deletions core/server/auth/passport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,27 @@ _private.registerClient = function (options) {
.then(function fetchedClient(client) {
// CASE: Ghost Auth client is already registered
if (client) {
return {
client_id: client.get('uuid'),
client_secret: client.get('secret')
};
if (client.get('redirection_uri') === url) {
return {
client_id: client.get('uuid'),
client_secret: client.get('secret')
};
}

logging.debug('Update ghost client callback url...');
return ghostOAuth2Strategy.changeCallbackURL({
callbackURL: url + '/ghost/',
clientId: client.get('uuid'),
clientSecret: client.get('secret')
}).then(function changedCallbackURL() {
client.set('redirection_uri', url);
return client.save(null, {context: {internal: true}});
}).then(function updatedClient() {
return {
client_id: client.get('uuid'),
client_secret: client.get('secret')
};
});
}

return ghostOAuth2Strategy.registerClient({clientName: url})
Expand All @@ -33,7 +50,8 @@ _private.registerClient = function (options) {
name: 'Ghost Auth',
slug: 'ghost-auth',
uuid: credentials.client_id,
secret: credentials.client_secret
secret: credentials.client_secret,
redirection_uri: url + '/ghost/'
}, {context: {internal: true}});
})
.then(function returnClient(client) {
Expand Down
29 changes: 27 additions & 2 deletions core/test/unit/auth/passport_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ var passport = require('passport'),
testUtils = require('../../utils'),
GhostPassport = rewire('../../../server/auth/passport'),
models = require('../../../server/models'),
utils = require('../../../server/utils'),
errors = require('../../../server/errors');

should.equal(true, true);
Expand Down Expand Up @@ -35,6 +36,7 @@ describe('Ghost Passport', function () {

FakeGhostOAuth2Strategy.prototype.setClient = sandbox.stub();
FakeGhostOAuth2Strategy.prototype.registerClient = sandbox.stub().returns(Promise.resolve({}));
FakeGhostOAuth2Strategy.prototype.changeCallbackURL = sandbox.stub().returns(Promise.resolve({}));
});

afterEach(function () {
Expand All @@ -53,13 +55,16 @@ describe('Ghost Passport', function () {
models.Client.add.called.should.eql(false);
FakeGhostOAuth2Strategy.prototype.setClient.called.should.eql(false);
FakeGhostOAuth2Strategy.prototype.registerClient.called.should.eql(false);
FakeGhostOAuth2Strategy.prototype.changeCallbackURL.called.should.eql(false);
});
});
});

describe('auth_type: ghost', function () {
it('ghost client is already present in database', function () {
client = new models.Client(testUtils.DataGenerator.forKnex.createClient());
it('ghost client is already present in database and redirect_uri hasn\'t changed', function () {
client = new models.Client(testUtils.DataGenerator.forKnex.createClient({
redirection_uri: utils.url.getBaseUrl()
}));

return GhostPassport.init({
type: 'ghost'
Expand All @@ -71,6 +76,26 @@ describe('Ghost Passport', function () {
models.Client.add.called.should.eql(false);
FakeGhostOAuth2Strategy.prototype.setClient.called.should.eql(true);
FakeGhostOAuth2Strategy.prototype.registerClient.called.should.eql(false);
FakeGhostOAuth2Strategy.prototype.changeCallbackURL.called.should.eql(false);
});
});

it('ghost client is already present in database and redirect_uri has changed', function () {
client = new models.Client(testUtils.DataGenerator.forKnex.createClient({
redirection_uri: 'URL-HAS-CHANGED'
}));

return GhostPassport.init({
type: 'ghost'
}).then(function (response) {
should.exist(response.passport);
passport.use.callCount.should.eql(3);

models.Client.findOne.called.should.eql(true);
models.Client.add.called.should.eql(false);
FakeGhostOAuth2Strategy.prototype.setClient.called.should.eql(true);
FakeGhostOAuth2Strategy.prototype.registerClient.called.should.eql(false);
FakeGhostOAuth2Strategy.prototype.changeCallbackURL.called.should.eql(true);
});
});

Expand Down