@hapi/bell 13.0.2 → 13.1.0

package/lib/index.d.ts

@@ -30,7 +30,6 @@ export type Provider =
     | 'live'
     | 'medium'
     | 'meetup'
-    | 'mixer'
     | 'nest'
     | 'okta'
     | 'phabricator'
@@ -125,6 +124,12 @@ export interface OptionalOptions {
         | { extendedProfile?: boolean | undefined; getMethod?: string | undefined }
         | { uri?: string | undefined }
         | undefined;
+    /**
+     * provider-specific query parameters for the token endpoint.
+     * It may be passed either as an object to merge into the query string,
+     * or a function which takes the client's request and returns an object.
+    */
+    tokenParams?: StringLikeMap | ((request: Request) => StringLikeMap) | undefined;
     /**
      * an object of key-value pairs that specify additional
      * URL query parameters to send with the profile request to the provider.

package/lib/index.js

@@ -104,6 +104,8 @@ internals.schema = Joi.object({
 
     config: Joi.object(),
 
+    tokenParams: Joi.alternatives(Joi.object(), Joi.func()),
+
     profileParams: Joi.object(),
 
     skipProfile: internals.flexBoolean.optional().default(false),

package/lib/oauth.js

@@ -72,12 +72,11 @@ exports.v1 = function (settings) {
 
             h.state(cookie, state);
 
-            const authQuery = internals.resolveProviderParams(request, settings.providerParams);
-            authQuery.oauth_token = temp.oauth_token;
-
-            if (settings.allowRuntimeProviderParams) {
-                Hoek.merge(authQuery, request.query);
-            }
+            const authQuery = {
+                ...internals.resolveProviderParams(request, settings.providerParams),
+                oauth_token: temp.oauth_token,
+                ...(settings.allowRuntimeProviderParams && request.query)
+            };
 
             return h.redirect(settings.provider.auth + '?' + internals.queryString(authQuery)).takeover();
         }
@@ -123,7 +122,7 @@ exports.v1 = function (settings) {
         const get = async (uri, params = {}) => {
 
             if (settings.profileParams) {
-                Hoek.merge(params, settings.profileParams);
+                Object.assign(params, settings.profileParams);
             }
 
             const { payload: resource } = await client.resource('get', uri, params, { token: token.oauth_token, secret: token.oauth_token_secret });
@@ -178,16 +177,14 @@ exports.v2 = function (settings) {
             credentials.query = request.query;
 
             const nonce = Cryptiles.randomAlphanumString(internals.nonceLength);
-            const query = internals.resolveProviderParams(request, settings.providerParams);
-
-            if (settings.allowRuntimeProviderParams) {
-                Hoek.merge(query, request.query);
-            }
-
-            query.client_id = settings.clientId;
-            query.response_type = 'code';
-            query.redirect_uri = internals.location(request, protocol, settings.location);
-            query.state = nonce;
+            const query = {
+                ...internals.resolveProviderParams(request, settings.providerParams),
+                ...(settings.allowRuntimeProviderParams && request.query),
+                client_id: settings.clientId,
+                response_type: 'code',
+                redirect_uri: internals.location(request, protocol, settings.location),
+                state: nonce
+            };
 
             if (settings.runtimeStateCallback) {
                 const runtimeState = settings.runtimeStateCallback(request);
@@ -251,7 +248,8 @@ exports.v2 = function (settings) {
         const query = {
             grant_type: 'authorization_code',
             code: request.query.code,
-            redirect_uri: internals.location(request, protocol, settings.location)
+            redirect_uri: internals.location(request, protocol, settings.location),
+            ...internals.resolveProviderParams(request, settings.tokenParams)
         };
 
         if (settings.provider.pkce) {
@@ -731,6 +729,5 @@ internals.getProtocol = function (request, settings) {
 
 internals.resolveProviderParams = function (request, params) {
 
-    const obj = typeof params === 'function' ? params(request) : params;
-    return obj ? Hoek.clone(obj) : {};
+    return (typeof params === 'function' ? params(request) : params) ?? {};
 };

package/lib/providers/index.js

@@ -25,7 +25,6 @@ exports = module.exports = {
     live: require('./live'),
     medium: require('./medium'),
     meetup: require('./meetup'),
-    mixer: require('./mixer'),
     nest: require('./nest'),
     okta: require('./okta'),
     phabricator: require('./phabricator'),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hapi/bell",
   "description": "Third-party login plugin for hapi",
-  "version": "13.0.2",
+  "version": "13.1.0",
   "repository": "git://github.com/hapijs/bell",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -59,7 +59,7 @@
   },
   "devDependencies": {
     "@hapi/code": "^9.0.3",
-    "@hapi/eslint-plugin": "*",
+    "@hapi/eslint-plugin": "^6.0.0",
     "@hapi/hapi": "^21.2.1",
     "@hapi/hawk": "^8.0.0",
     "@hapi/lab": "^25.0.1",

package/lib/providers/mixer.js

@@ -1,25 +0,0 @@
-'use strict';
-
-const internals = {};
-
-
-exports = module.exports = function (options) {
-
-    return {
-        protocol: 'oauth2',
-        useParamsAuth: true,
-        auth: 'https://mixer.com/oauth/authorize',
-        token: 'https://mixer.com/api/v1/oauth/token',
-        scope: ['user:details:self'],
-        scopeSeparator: ' ',
-        profile: async function (credentials, params, get) {
-
-            const queryOptions = {
-                oauth_token: params.access_token
-            };
-
-            const profile = await get('https://mixer.com/api/v1/users/current', queryOptions);
-            credentials.profile = profile;
-        }
-    };
-};