diff --git a/src/bch-js.js b/src/bch-js.js index 23517ba..8777ba5 100644 --- a/src/bch-js.js +++ b/src/bch-js.js @@ -65,7 +65,7 @@ class BCHJS { // Generate a Basic Authentication token from an auth password this.authToken = "" if (this.authPass) { - console.log(`bch-js initialized with authPass: ${this.authPass}`) + // console.log(`bch-js initialized with authPass: ${this.authPass}`) // Generate the header for Basic Authentication. const combined = `fullstackcash:${this.authPass}` var base64Credential = Buffer.from(combined).toString("base64") diff --git a/src/raw-transactions.js b/src/raw-transactions.js index 636d903..31a02b3 100644 --- a/src/raw-transactions.js +++ b/src/raw-transactions.js @@ -272,9 +272,7 @@ class RawTransactions { txids: txid, verbose: verbose }, - headers: { - authorization: `Token ${this.apiToken}` - } + headers: _this.axiosOptions.headers } const response = await axios(options) @@ -347,9 +345,7 @@ class RawTransactions { data: { hexes: hex }, - headers: { - authorization: `Token ${this.apiToken}` - } + headers: _this.axiosOptions.headers } const response = await axios(options) diff --git a/src/slp/tokentype1.js b/src/slp/tokentype1.js index d6392f2..733df8d 100644 --- a/src/slp/tokentype1.js +++ b/src/slp/tokentype1.js @@ -18,17 +18,28 @@ class TokenType1 { constructor(config) { this.restURL = config.restURL this.apiToken = config.apiToken + this.authToken = config.authToken + + if (this.authToken) { + // Add Basic Authentication token to the authorization header. + this.axiosOptions = { + headers: { + authorization: this.authToken + } + } + } else { + // Add JWT token to the authorization header. + this.axiosOptions = { + headers: { + authorization: `Token ${this.apiToken}` + } + } + } addy = new Address(config) this.Script = new Script() this.axios = axios - // Add JWT token to the authorization header. - this.axiosOptions = { - headers: { - authorization: `Token ${this.apiToken}` - } - } // Instantiate the transaction builder. TransactionBuilder.setAddress(addy) diff --git a/src/slp/utils.js b/src/slp/utils.js index 6889526..f8a6bfb 100644 --- a/src/slp/utils.js +++ b/src/slp/utils.js @@ -13,11 +13,21 @@ class Utils { this.restURL = config.restURL this.apiToken = config.apiToken this.slpParser = slpParser + this.authToken = config.authToken - // Add JWT token to the authorization header. - this.axiosOptions = { - headers: { - authorization: `Token ${this.apiToken}` + if (this.authToken) { + // Add Basic Authentication token to the authorization header. + this.axiosOptions = { + headers: { + authorization: this.authToken + } + } + } else { + // Add JWT token to the authorization header. + this.axiosOptions = { + headers: { + authorization: `Token ${this.apiToken}` + } } }