Skip to content

Remove lodash dependency #37

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.

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

Merged
merged 3 commits into from
Oct 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 15 additions & 18 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
version: 2
updates:
- package-ecosystem: npm
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 10
ignore:
- dependency-name: sinon
versions:
- 10.0.0
- 9.2.4
- dependency-name: mocha
versions:
- 8.2.1
- 8.3.0
- 8.3.1
- dependency-name: lodash
versions:
- 4.17.20
- package-ecosystem: npm
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 10
ignore:
- dependency-name: sinon
versions:
- 10.0.0
- 9.2.4
- dependency-name: mocha
versions:
- 8.2.1
- 8.3.0
- 8.3.1
3 changes: 1 addition & 2 deletions lib/errors/access-denied-error.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Module dependencies.
*/

var _ = require('lodash');
var OAuthError = require('./oauth-error');
var util = require('util');

Expand All @@ -17,7 +16,7 @@ var util = require('util');
*/

function AccessDeniedError(message, properties) {
properties = _.assign({
properties = Object.assign({
code: 400,
name: 'access_denied'
}, properties);
Expand Down
3 changes: 1 addition & 2 deletions lib/errors/insufficient-scope-error.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Module dependencies.
*/

var _ = require('lodash');
var OAuthError = require('./oauth-error');
var util = require('util');

Expand All @@ -17,7 +16,7 @@ var util = require('util');
*/

function InsufficientScopeError(message, properties) {
properties = _.assign({
properties = Object.assign({
code: 403,
name: 'insufficient_scope'
}, properties);
Expand Down
3 changes: 1 addition & 2 deletions lib/errors/invalid-argument-error.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Module dependencies.
*/

var _ = require('lodash');
var OAuthError = require('./oauth-error');
var util = require('util');

Expand All @@ -13,7 +12,7 @@ var util = require('util');
*/

function InvalidArgumentError(message, properties) {
properties = _.assign({
properties = Object.assign({
code: 500,
name: 'invalid_argument'
}, properties);
Expand Down
3 changes: 1 addition & 2 deletions lib/errors/invalid-client-error.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Module dependencies.
*/

var _ = require('lodash');
var OAuthError = require('./oauth-error');
var util = require('util');

Expand All @@ -18,7 +17,7 @@ var util = require('util');
*/

function InvalidClientError(message, properties) {
properties = _.assign({
properties = Object.assign({
code: 400,
name: 'invalid_client'
}, properties);
Expand Down
3 changes: 1 addition & 2 deletions lib/errors/invalid-grant-error.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Module dependencies.
*/

var _ = require('lodash');
var OAuthError = require('./oauth-error');
var util = require('util');

Expand All @@ -19,7 +18,7 @@ var util = require('util');
*/

function InvalidGrantError(message, properties) {
properties = _.assign({
properties = Object.assign({
code: 400,
name: 'invalid_grant'
}, properties);
Expand Down
3 changes: 1 addition & 2 deletions lib/errors/invalid-request-error.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Module dependencies.
*/

var _ = require('lodash');
var OAuthError = require('./oauth-error');
var util = require('util');

Expand All @@ -18,7 +17,7 @@ var util = require('util');
*/

function InvalidRequest(message, properties) {
properties = _.assign({
properties = Object.assign({
code: 400,
name: 'invalid_request'
}, properties);
Expand Down
3 changes: 1 addition & 2 deletions lib/errors/invalid-scope-error.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Module dependencies.
*/

var _ = require('lodash');
var OAuthError = require('./oauth-error');
var util = require('util');

Expand All @@ -17,7 +16,7 @@ var util = require('util');
*/

function InvalidScopeError(message, properties) {
properties = _.assign({
properties = Object.assign({
code: 400,
name: 'invalid_scope'
}, properties);
Expand Down
3 changes: 1 addition & 2 deletions lib/errors/invalid-token-error.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Module dependencies.
*/

var _ = require('lodash');
var OAuthError = require('./oauth-error');
var util = require('util');

Expand All @@ -17,7 +16,7 @@ var util = require('util');
*/

function InvalidTokenError(message, properties) {
properties = _.assign({
properties = Object.assign({
code: 401,
name: 'invalid_token'
}, properties);
Expand Down
8 changes: 3 additions & 5 deletions lib/errors/oauth-error.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
/**
* Module dependencies.
*/
var _ = require('lodash');
var util = require('util');
var http = require('http');
/**
Expand All @@ -13,17 +12,16 @@ var http = require('http');
function OAuthError(messageOrError, properties) {
var message = messageOrError instanceof Error ? messageOrError.message : messageOrError;
var error = messageOrError instanceof Error ? messageOrError : null;
if (_.isEmpty(properties))
{
if (properties == null || !Object.entries(properties).length ) {
properties = {};
}

_.defaults(properties, { code: 500 });
properties = Object.assign({ code: 500 }, properties);

if (error) {
properties.inner = error;
}
if (_.isEmpty(message)) {
if (!message || message.length === 0) {
message = http.STATUS_CODES[properties.code];
}
this.code = this.status = this.statusCode = properties.code;
Expand Down
3 changes: 1 addition & 2 deletions lib/errors/server-error.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Module dependencies.
*/

var _ = require('lodash');
var OAuthError = require('./oauth-error');
var util = require('util');

Expand All @@ -17,7 +16,7 @@ var util = require('util');
*/

function ServerError(message, properties) {
properties = _.assign({
properties = Object.assign({
code: 503,
name: 'server_error'
}, properties);
Expand Down
3 changes: 1 addition & 2 deletions lib/errors/unauthorized-client-error.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Module dependencies.
*/

var _ = require('lodash');
var OAuthError = require('./oauth-error');
var util = require('util');

Expand All @@ -17,7 +16,7 @@ var util = require('util');
*/

function UnauthorizedClientError(message, properties) {
properties = _.assign({
properties = Object.assign({
code: 400,
name: 'unauthorized_client'
}, properties);
Expand Down
3 changes: 1 addition & 2 deletions lib/errors/unauthorized-request-error.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Module dependencies.
*/

var _ = require('lodash');
var OAuthError = require('./oauth-error');
var util = require('util');

Expand All @@ -20,7 +19,7 @@ var util = require('util');
*/

function UnauthorizedRequestError(message, properties) {
properties = _.assign({
properties = Object.assign({
code: 401,
name: 'unauthorized_request'
}, properties);
Expand Down
3 changes: 1 addition & 2 deletions lib/errors/unsupported-grant-type-error.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Module dependencies.
*/

var _ = require('lodash');
var OAuthError = require('./oauth-error');
var util = require('util');

Expand All @@ -17,7 +16,7 @@ var util = require('util');
*/

function UnsupportedGrantTypeError(message, properties) {
properties = _.assign({
properties = Object.assign({
code: 400,
name: 'unsupported_grant_type'
}, properties);
Expand Down
3 changes: 1 addition & 2 deletions lib/errors/unsupported-response-type-error.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Module dependencies.
*/

var _ = require('lodash');
var OAuthError = require('./oauth-error');
var util = require('util');

Expand All @@ -18,7 +17,7 @@ var util = require('util');
*/

function UnsupportedResponseTypeError(message, properties) {
properties = _.assign({
properties = Object.assign({
code: 400,
name: 'unsupported_response_type'
}, properties);
Expand Down
7 changes: 3 additions & 4 deletions lib/handlers/authorize-handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Module dependencies.
*/

var _ = require('lodash');
var AccessDeniedError = require('../errors/access-denied-error');
var AuthenticateHandler = require('../handlers/authenticate-handler');
var InvalidArgumentError = require('../errors/invalid-argument-error');
Expand Down Expand Up @@ -186,15 +185,15 @@ AuthorizeHandler.prototype.getClient = function(request) {
throw new InvalidClientError('Invalid client: missing client `grants`');
}

if (!_.includes(client.grants, 'authorization_code')) {
if (!Array.isArray(client.grants) || !client.grants.includes('authorization_code')) {
throw new UnauthorizedClientError('Unauthorized client: `grant_type` is invalid');
}

if (!client.redirectUris || 0 === client.redirectUris.length) {
throw new InvalidClientError('Invalid client: missing client `redirectUri`');
}

if (redirectUri && !_.includes(client.redirectUris, redirectUri)) {
if (redirectUri && !client.redirectUris.includes(redirectUri)) {
throw new InvalidClientError('Invalid client: `redirect_uri` does not match client value');
}
return client;
Expand Down Expand Up @@ -301,7 +300,7 @@ AuthorizeHandler.prototype.getResponseType = function(request) {
throw new InvalidRequestError('Missing parameter: `response_type`');
}

if (!_.has(responseTypes, responseType)) {
if (!Object.prototype.hasOwnProperty.call(responseTypes, responseType)) {
throw new UnsupportedResponseTypeError('Unsupported response type: `response_type` is not supported');
}

Expand Down
7 changes: 3 additions & 4 deletions lib/handlers/token-handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Module dependencies.
*/

var _ = require('lodash');
var BearerTokenType = require('../token-types/bearer-token-type');
var InvalidArgumentError = require('../errors/invalid-argument-error');
var InvalidClientError = require('../errors/invalid-client-error');
Expand Down Expand Up @@ -56,7 +55,7 @@ function TokenHandler(options) {
}

this.accessTokenLifetime = options.accessTokenLifetime;
this.grantTypes = _.assign({}, grantTypes, options.extendedGrantTypes);
this.grantTypes = Object.assign({}, grantTypes, options.extendedGrantTypes);
this.model = options.model;
this.refreshTokenLifetime = options.refreshTokenLifetime;
this.allowExtendedTokenAttributes = options.allowExtendedTokenAttributes;
Expand Down Expand Up @@ -208,11 +207,11 @@ TokenHandler.prototype.handleGrantType = function(request, client) {
throw new InvalidRequestError('Invalid parameter: `grant_type`');
}

if (!_.has(this.grantTypes, grantType)) {
if (!Object.prototype.hasOwnProperty.call(this.grantTypes, grantType)) {
throw new UnsupportedGrantTypeError('Unsupported grant type: `grant_type` is invalid');
}

if (!_.includes(client.grants, grantType)) {
if (!Array.isArray(client.grants) || !client.grants.includes(grantType)) {
throw new UnauthorizedClientError('Unauthorized client: `grant_type` is invalid');
}

Expand Down
7 changes: 3 additions & 4 deletions lib/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Module dependencies.
*/

var _ = require('lodash');
var AuthenticateHandler = require('./handlers/authenticate-handler');
var AuthorizeHandler = require('./handlers/authorize-handler');
var InvalidArgumentError = require('./errors/invalid-argument-error');
Expand Down Expand Up @@ -33,7 +32,7 @@ OAuth2Server.prototype.authenticate = function(request, response, options, callb
options = {scope: options};
}

options = _.assign({
options = Object.assign({
addAcceptedScopesHeader: true,
addAuthorizedScopesHeader: true,
allowBearerTokensInQueryString: false
Expand All @@ -49,7 +48,7 @@ OAuth2Server.prototype.authenticate = function(request, response, options, callb
*/

OAuth2Server.prototype.authorize = function(request, response, options, callback) {
options = _.assign({
options = Object.assign({
allowEmptyState: false,
authorizationCodeLifetime: 5 * 60 // 5 minutes.
}, this.options, options);
Expand All @@ -64,7 +63,7 @@ OAuth2Server.prototype.authorize = function(request, response, options, callback
*/

OAuth2Server.prototype.token = function(request, response, options, callback) {
options = _.assign({
options = Object.assign({
accessTokenLifetime: 60 * 60, // 1 hour.
refreshTokenLifetime: 60 * 60 * 24 * 14, // 2 weeks.
allowExtendedTokenAttributes: false,
Expand Down
3 changes: 2 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading