Renaming of methods

services/device.js

@@ -10,10 +10,10 @@ class DeviceService extends AuthService {
 
  constructor() {
  super();
- this.orderedCalls = [this.generateDeviceRequest, this.generateCallbackRequest, this.performQuery];
+ this.orderedCalls = [this.executeDeviceFlow, this.generateCallbackRequest, this.performQuery];
  }
 
- generateDeviceRequest = async () => {
+ executeDeviceFlow = async () => {
  // Define parameters
  const responseType = 'device_code';
  let endpointUrl = this.getTokenEndpoint();

services/jwt.js

@@ -6,14 +6,14 @@ var base64url = require('base64-url'),
 class JwtService extends AuthService {
  constructor() {
  super();
- this.orderedCalls = [this.generateJwtRequest, this.performQuery];
+ this.orderedCalls = [this.executeJwtBearerTokenFlow, this.performQuery];
  }
 
  /**
  * Create a JSON Web Token that is signed using the private key stored in 'key.pem'.
  * It first creates the Claims JSON and passes it to the signJwtClaims method.
  */
- getSignedJwt() {
+ generateSignedJwt() {
  var claims = {
  iss: this.clientId,
  sub: this.username,
@@ -24,11 +24,11 @@ class JwtService extends AuthService {
  return this.signJwtClaims(claims);
  }
 
- generateJwtRequest = async () => {
+ executeJwtBearerTokenFlow = async () => {
  // Set parameters for POST request
  const grantType = 'urn:ietf:params:oauth:grant-type:jwt-bearer';
  let endpointUrl = this.getTokenEndpoint();
- let token = this.getSignedJwt();
+ let token = this.generateSignedJwt();
  let paramBody = 'grant_type=' + base64url.escape(grantType) + '&assertion=' + token;
 
  // Create the current POST request based on the constructed body

services/refresh.js

@@ -6,10 +6,10 @@ const base64url = require('base64-url'),
 class RefreshService extends AuthService {
  constructor() {
  super();
- this.orderedCalls = [this.generateRefreshRequest, this.performQuery];
+ this.orderedCalls = [this.executeRefreshTokenFlow, this.performQuery];
  }
 
- generateRefreshRequest = async () => {
+ executeRefreshTokenFlow = async () => {
  // Set parameters for POST request
  const grantType = 'refresh_token';
  let endpointUrl = this.getTokenEndpoint();

services/samlassert.js

@@ -7,10 +7,10 @@ var fs = require('fs'),
 class SamlAssertService extends AuthService {
  constructor() {
  super();
- this.orderedCalls = [this.generateSamlAssertRequest, this.performQuery];
+ this.orderedCalls = [this.executeSamlAssertionFlow, this.performQuery];
  }
 
- generateSamlAssertRequest = async () => {
+ executeSamlAssertionFlow = async () => {
  // Set parameters for the SAML request body
  const assertionType = 'urn:oasis:names:tc:SAML:2.0:profiles:SSO:browser';
  let endpointUrl = this.getTokenEndpoint();

services/samlbearer.js

@@ -9,7 +9,7 @@ var saml = require('saml').Saml20,
 class SamlBearerService extends AuthService {
  constructor() {
  super();
- this.orderedCalls = [this.generateSamlBearerRequest, this.performQuery];
+ this.orderedCalls = [this.executeSamlBearerTokenFlow, this.performQuery];
  }
 
  /**
@@ -36,7 +36,7 @@ class SamlBearerService extends AuthService {
  return saml.create(samlClaims);
  }
 
- generateSamlBearerRequest = async () => {
+ executeSamlBearerTokenFlow = async () => {
  // Set parameters for the SAML request body
  const assertionType = 'urn:ietf:params:oauth:grant-type:saml2-bearer';
  const token = this.getSignedSamlToken();

services/useragent.js

@@ -3,10 +3,10 @@ const { AuthService } = require('./auth');
 class UserAgentService extends AuthService {
  constructor() {
  super();
- this.orderedCalls = [this.generateUserAgentRequest, this.performQuery];
+ this.orderedCalls = [this.executeUserAgentFlow, this.performQuery];
  }
 
- generateUserAgentRequest = async () => {
+ executeUserAgentFlow = async () => {
  // Set response type and get url of authorization endpoint
  let responseType = 'token';
  let endpointUrl = this.getAuthorizeEndpoint();

services/usernamepassword.js

@@ -8,12 +8,12 @@ class UsernamePasswordService extends AuthService {
 
  constructor(username, password) {
  super();
- this.orderedCalls = [this.generateUsernamePasswordRequest, this.performQuery];
+ this.orderedCalls = [this.executeUsernamePasswordFlow, this.performQuery];
  this.#username = username;
  this.#password = password;
  }
 
- generateUsernamePasswordRequest = async () => {
+ executeUsernamePasswordFlow = async () => {
  // Construct parameters for POST request
  const grantType = 'password';
  let endpointUrl = this.getTokenEndpoint();

services/webserver.js

@@ -13,7 +13,7 @@ class WebServerService extends AuthService {
  this.webServerType = webServerType;
  this.codeVerifier = this.generateCodeVerifier();
  this.codeChallenge = this.generateCodeChallenge(this.codeVerifier);
- this.orderedCalls = [this.generateAuthorizationRequest, this.generateTokenRequest, this.performQuery];
+ this.orderedCalls = [this.executeAuthorizationCodeRequest, this.executeWebServerFlow, this.performQuery];
  }
 
  /**
@@ -53,7 +53,7 @@ class WebServerService extends AuthService {
  return this.signJwtClaims(assertionData);
  }
 
- generateAuthorizationRequest = () => {
+ executeAuthorizationCodeRequest = () => {
  // Set parameter values for retrieving authorization code
  let responseType = 'code';
  let scope = 'full%20refresh_token';
@@ -89,7 +89,7 @@ class WebServerService extends AuthService {
  * This is the second step in the flow where the access token is retrieved by passing the previously
  * obtained authorization code to the token endpoint.
  */
- generateTokenRequest = async () => {
+ executeWebServerFlow = async () => {
  // Set parameter values for retrieving access token
  let grantType = 'authorization_code';
  let endpointUrl = this.getTokenEndpoint();