remove callback support

Author: baileympearson

lib/auth_processes/mongodb.js

@@ -9,8 +9,3 @@ module.exports = kerberos;
 module.exports.Kerberos = kerberos;
 
 module.exports.version = require('../package.json').version;
-
-// Set up the auth processes
-module.exports.processes = {
-  MongoAuthProcess: require('./auth_processes/mongodb').MongoAuthProcess
-};

lib/index.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { loadBindings, defineOperation } = require('./util');
+const { promisify } = require('util');
+const { loadBindings } = require('./util');
 
 const kerberos = loadBindings();
 const KerberosClient = kerberos.KerberosClient;
@@ -31,20 +32,20 @@ const GSS_MECH_OID_SPNEGO = 6;
  * @property {boolean} contextComplete Indicates that authentication has successfully completed or not
  */
 
+const originalStep = KerberosClient.prototype.step;
 /**
  * Processes a single kerberos client-side step using the supplied server challenge.
  *
  * @kind function
  * @memberof KerberosClient
  * @param {string} challenge A string containing the base64-encoded server data (which may be empty for the first step)
- * @param {function} [callback]
- * @return {Promise} returns Promise if no callback passed
+ * @return {Promise} returns Promise
  */
-KerberosClient.prototype.step = defineOperation(KerberosClient.prototype.step, [
-  { name: 'challenge', type: 'string' },
-  { name: 'callback', type: 'function', required: false }
-]);
+KerberosClient.prototype.step = async function step(challenge) {
+  return await promisify(originalStep.bind(this))(challenge);
+};
 
+const originalWrap = KerberosClient.prototype.wrap;
 /**
  * Perform the client side kerberos wrap step.
  *
@@ -54,29 +55,26 @@ KerberosClient.prototype.step = defineOperation(KerberosClient.prototype.step, [
  * @param {object} [options] Optional settings
  * @param {string} [options.user] The user to authorize
  * @param {boolean} [options.protect] Indicates if the wrap should request message confidentiality
- * @param {function} [callback]
- * @return {Promise} returns Promise if no callback passed
+ * @return {Promise} returns Promise
  */
-KerberosClient.prototype.wrap = defineOperation(KerberosClient.prototype.wrap, [
-  { name: 'challenge', type: 'string' },
-  { name: 'options', type: 'object' },
-  { name: 'callback', type: 'function', required: false }
-]);
+KerberosClient.prototype.wrap = async function wrap(challenge, options = {}) {
+  return await promisify(originalWrap.bind(this))(challenge, options);
+};
 
+const originalUnwrap = KerberosClient.prototype.unwrap;
 /**
  * Perform the client side kerberos unwrap step
  *
  * @kind function
  * @memberof KerberosClient
  * @param {string} challenge A string containing the base64-encoded server data
- * @param {function} [callback]
- * @return {Promise} returns Promise if no callback passed
+ * @return {Promise} returns Promise
  */
-KerberosClient.prototype.unwrap = defineOperation(KerberosClient.prototype.unwrap, [
-  { name: 'challenge', type: 'string' },
-  { name: 'callback', type: 'function', required: false }
-]);
+KerberosClient.prototype.unwrap = async function unwrap(challenge) {
+  return await promisify(originalUnwrap.bind(this))(challenge);
+};
 
+const originalServerStep = KerberosServer.prototype.step;
 /**
  * @class KerberosServer
  *
@@ -92,13 +90,11 @@ KerberosClient.prototype.unwrap = defineOperation(KerberosClient.prototype.unwra
  * @kind function
  * @memberof KerberosServer
  * @param {string} challenge A string containing the base64-encoded client data
- * @param {function} [callback]
- * @return {Promise} returns Promise if no callback passed
+ * @return {Promise} returns Promise
  */
-KerberosServer.prototype.step = defineOperation(KerberosServer.prototype.step, [
-  { name: 'challenge', type: 'string' },
-  { name: 'callback', type: 'function', required: false }
-]);
+KerberosServer.prototype.step = async function step(challenge) {
+  return await promisify(originalServerStep.bind(this))(challenge);
+};
 
 /**
  * This function provides a simple way to verify that a user name and password
@@ -122,16 +118,11 @@ KerberosServer.prototype.step = defineOperation(KerberosServer.prototype.step, [
  * @param {string} password The password for the user.
  * @param {string} service The Kerberos service to check access for.
  * @param {string} [defaultRealm] The default realm to use if one is not supplied in the user argument.
- * @param {function} [callback]
- * @return {Promise} returns Promise if no callback passed
+ * @return {Promise} returns Promise
  */
-const checkPassword = defineOperation(kerberos.checkPassword, [
-  { name: 'username', type: 'string' },
-  { name: 'password', type: 'string' },
-  { name: 'service', type: 'string' },
-  { name: 'defaultRealm', type: 'string', required: false },
-  { name: 'callback', type: 'function', required: false }
-]);
+async function checkPassword(username, password, service, defaultRealm) {
+  return await promisify(kerberos.checkPassword)(username, password, service, defaultRealm);
+}
 
 /**
  * This function returns the service principal for the server given a service type and hostname.
@@ -141,14 +132,11 @@ const checkPassword = defineOperation(kerberos.checkPassword, [
  * @kind function
  * @param {string} service The Kerberos service type for the server.
  * @param {string} hostname The hostname of the server.
- * @param {function} [callback]
- * @return {Promise} returns Promise if no callback passed
+ * @return {Promise} returns Promise
  */
-const principalDetails = defineOperation(kerberos.principalDetails, [
-  { name: 'service', type: 'string' },
-  { name: 'hostname', type: 'string' },
-  { name: 'callback', type: 'function', required: false }
-]);
+async function principalDetails(service, hostname) {
+  return await promisify(kerberos.principalDetails)(service, hostname);
+}
 
 /**
  * Initializes a context for client-side authentication with the given service principal.
@@ -159,27 +147,22 @@ const principalDetails = defineOperation(kerberos.principalDetails, [
  * @param {string} [options.principal] Optional string containing the client principal in the form 'user@realm' (e.g. '[email protected]').
  * @param {number} [options.flags] Optional integer used to set GSS flags. (e.g.  `GSS_C_DELEG_FLAG\|GSS_C_MUTUAL_FLAG\|GSS_C_SEQUENCE_FLAG` will allow for forwarding credentials to the remote host)
  * @param {number} [options.mechOID] Optional GSS mech OID. Defaults to None (GSS_C_NO_OID). Other possible values are `GSS_MECH_OID_KRB5`, `GSS_MECH_OID_SPNEGO`.
- * @param {function} [callback]
- * @return {Promise} returns Promise if no callback passed
+ * @return {Promise} returns Promise
  */
-const initializeClient = defineOperation(kerberos.initializeClient, [
-  { name: 'service', type: 'string' },
-  { name: 'options', type: 'object', default: { mechOID: GSS_C_NO_OID } },
-  { name: 'callback', type: 'function', required: false }
-]);
+async function initializeClient(service, options = { mechOID: GSS_C_NO_OID }) {
+  return await promisify(kerberos.initializeClient)(service, options);
+}
 
 /**
  * Initializes a context for server-side authentication with the given service principal.
  *
  * @kind function
  * @param {string} service A string containing the service principal in the form 'type@fqdn' (e.g. '[email protected]').
- * @param {function} [callback]
- * @return {Promise} returns Promise if no callback passed
+ * @return {Promise} returns Promise
  */
-const initializeServer = defineOperation(kerberos.initializeServer, [
-  { name: 'service', type: 'string' },
-  { name: 'callback', type: 'function', required: false }
-]);
+async function initializeServer(service) {
+  return await promisify(kerberos.initializeServer)(service);
+}
 
 module.exports = {
   initializeClient,