Skip to content

Commit d577196

Browse files
committed
Merge pull request #559 from Martii/Issue-484repairOAuthAPIKeysUpdate
Fix OAuth API Keys update Auto-merge
2 parents 0d674cd + 3b035cd commit d577196

1 file changed

Lines changed: 10 additions & 3 deletions

File tree

controllers/admin.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -369,9 +369,15 @@ exports.apiAdminUpdate = function (aReq, aRes, aNext) {
369369

370370
if (!userIsAdmin(aReq)) { return aNext(); }
371371

372-
postStrats = Object.keys(aReq.body).map(function (aPostStrat) {
373-
var values = aReq.body[aPostStrat];
374-
return { name: aPostStrat, id: values[0], key: values[1] };
372+
postStrats = Object.keys(aReq.body).filter(function (aEl) {
373+
return /\[0\]$/.test(aEl);
374+
}).map(function (aPostStrat) {
375+
var strat = aPostStrat.replace(/\[0\]/, '');
376+
return {
377+
name: strat,
378+
id: aReq.body[strat + '[0]'] || '',
379+
key: aReq.body[strat + '[1]'] || ''
380+
};
375381
});
376382

377383
Strategy.find({}, function (aErr, aStrats) {
@@ -380,6 +386,7 @@ exports.apiAdminUpdate = function (aReq, aRes, aNext) {
380386
aStrats.forEach(function (aStrat) {
381387
stored[aStrat.name] = aStrat;
382388
});
389+
383390
async.each(postStrats, function (aPostStrat, aCallback) {
384391
var strategy = null;
385392
var name = aPostStrat.name;

0 commit comments

Comments
 (0)