Skip to content

Commit 145cb4d

Browse files
committed
model.getClient() allows passing in null clientSecret (search for client is performed in this case based solely on clientId)
1 parent 3672c3a commit 145cb4d

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

examples/dynamodb/model.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ model.getClient = function (clientId, clientSecret, callback) {
4444
function(err, data) {
4545
if (err || !data) return callback(err, data);
4646

47-
if (data.clientSecret !== clientSecret) return callback();
47+
if (clientSecret !== null && data.clientSecret !== clientSecret) {
48+
return callback();
49+
}
4850

4951
callback(null, data);
5052
});

examples/memory/model.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ model.getRefreshToken = function (bearerToken, callback) {
6262
model.getClient = function (clientId, clientSecret, callback) {
6363
for(var i = 0, len = oauthClients.length; i < len; i++) {
6464
var elem = oauthClients[i];
65-
if(elem.clientId === clientId && elem.clientSecret === clientSecret) {
65+
if(elem.clientId === clientId &&
66+
(clientSecret === null || elem.client_secret === clientSecret)) {
6667
return callback(false, elem);
6768
}
6869
}

examples/mongodb/model.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ model.getAccessToken = function (bearerToken, callback) {
7070

7171
model.getClient = function (clientId, clientSecret, callback) {
7272
console.log('in getClient (clientId: ' + clientId + ', clientSecret: ' + clientSecret + ')');
73-
73+
if (clientSecret === null) {
74+
return OAuthClientsModel.findOne({ clientId: clientId }, callback);
75+
}
7476
OAuthClientsModel.findOne({ clientId: clientId, clientSecret: clientSecret }, callback);
7577
};
7678

0 commit comments

Comments
 (0)