bitcoincash-oauth-client 0.2.0 → 0.2.10

package/dist/index.cjs

@@ -258,13 +258,14 @@ function getFetch(userProvidedFetch = null) {
  * @typedef {Object} Keypair
  * @property {string} privateKey - Hex-encoded private key
  * @property {string} publicKey - Hex-encoded compressed public key
- * @property {string} address - Bitcoin Cash address
+ * @property {string} bitcoincash_address - Bitcoin Cash address
  */
 
 /**
  * @typedef {Object} OAuthClientOptions
  * @property {string} [serverUrl="http://localhost:8000"] - OAuth server URL
  * @property {string} [network="mainnet"] - Network type ("mainnet" or "testnet")
+ * @property {string} [authBasePath="/auth"] - Base path for auth endpoints (e.g., "/auth" or "/bch-auth")
  * @property {SecureStorage} [secureStorage] - Storage interface for tokens
  * @property {Function} [fetch] - Custom fetch implementation (optional)
  * @property {string} [tokenKey="oauth_token"] - Key for storing access token
@@ -302,6 +303,7 @@ class BitcoinCashOAuthClient {
   constructor(options = {}) {
     this.serverUrl = options.serverUrl || "http://localhost:8000";
     this.network = options.network || "mainnet";
+    this.authBasePath = options.authBasePath || "/auth";
     this.secureStorage = options.secureStorage || null;
     this.fetchImpl = options.fetch || getFetch(options.fetch);
     this.secp256k1 = null;
@@ -372,14 +374,14 @@ class BitcoinCashOAuthClient {
     const publicKeyBytes = this.secp256k1.derivePublicKeyCompressed(privateKeyBytes);
     
     // Convert to address
-    const address = await this.publicKeyToCashAddress(publicKeyBytes);
-
-    this._log('Generated new keypair', { address });
+    const bitcoincash_address = await this.publicKeyToCashAddress(publicKeyBytes);
+    
+    this._log('Generated new keypair', { bitcoincash_address });
 
     return {
       privateKey: this.bytesToHex(privateKeyBytes),
       publicKey: this.bytesToHex(publicKeyBytes),
-      address,
+      bitcoincash_address,
     };
   }
 
@@ -433,40 +435,55 @@ class BitcoinCashOAuthClient {
   }
 
   /**
-   * Register a new user with the server
-   * @param {string} address - Bitcoin Cash address
-   * @param {string} [userId] - Optional user-provided ID
+   * Register a new user with the server (signature required)
+   * @param {string} bitcoincash_address - Bitcoin Cash address
+   * @param {string} privateKeyHex - Private key for signing (hex-encoded)
+   * @param {string} publicKeyHex - Public key for signature verification (hex-encoded)
+   * @param {string} userId - User-provided ID (required)
+   * @param {number} [timestamp] - Optional Unix timestamp (defaults to now)
+   * @param {string} [domain] - Optional domain for message binding
    * @returns {Promise<Object>} Registration result with assigned userId
    * @throws {NetworkError} If network request fails
    * @throws {AuthenticationError} If registration fails
    */
-  async register(address, userId = null) {
+  async register(bitcoincash_address, privateKeyHex, publicKeyHex, userId, timestamp = null, domain = null) {
     try {
-      const response = await this.fetchImpl(`${this.serverUrl}/auth/register`, {
+      const ts = timestamp || Math.floor(Date.now() / 1000);
+      const host = domain || this._getDefaultDomain();
+      const message = this.createAuthMessage(userId, ts, host);
+      const signature = await this.signAuthMessage(message, privateKeyHex);
+
+      this._log('Registering user', { bitcoincash_address, userId, domain: host });
+
+      const response = await this.fetchImpl(`${this.serverUrl}${this.authBasePath}/register`, {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
         },
         body: JSON.stringify({
-          address,
+          bitcoincash_address,
           user_id: userId,
+          timestamp: ts,
+          domain: host,
+          public_key: publicKeyHex,
+          signature: signature,
         }),
       });
 
       if (!response.ok) {
         const errorData = await response.json().catch(() => ({}));
-        
+
         if (response.status === 404) {
           throw new UserNotFoundError(errorData.detail || 'User not found');
         }
-        
+
         throw new AuthenticationError(
           errorData.detail || `Registration failed: ${response.statusText}`,
           response.status
         );
       }
 
-      this._log('User registered successfully', { address, userId });
+      this._log('User registered successfully', { bitcoincash_address, userId });
       return await response.json();
     } catch (error) {
       if (error instanceof OAuthError) {
@@ -534,7 +551,7 @@ class BitcoinCashOAuthClient {
     this._log('Message signed successfully');
 
     try {
-      const response = await this.fetchImpl(`${this.serverUrl}/auth/token`, {
+      const response = await this.fetchImpl(`${this.serverUrl}${this.authBasePath}/token`, {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -755,7 +772,7 @@ class BitcoinCashOAuthClient {
     if (serverCheck) {
       try {
         this._log('Token validation: checking with server');
-        const response = await this.fetchImpl(`${this.serverUrl}/auth/verify`, {
+        const response = await this.fetchImpl(`${this.serverUrl}${this.authBasePath}/verify`, {
           method: "POST",
           headers: {
             "Authorization": `Bearer ${token}`,
@@ -835,7 +852,7 @@ class BitcoinCashOAuthClient {
    */
   async refreshToken(refreshToken) {
     try {
-      const response = await this.fetchImpl(`${this.serverUrl}/auth/refresh`, {
+      const response = await this.fetchImpl(`${this.serverUrl}${this.authBasePath}/refresh`, {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -904,7 +921,7 @@ class BitcoinCashOAuthClient {
         this.refreshTimer = null;
       }
       
-      const response = await this.fetchImpl(`${this.serverUrl}/auth/revoke`, {
+      const response = await this.fetchImpl(`${this.serverUrl}${this.authBasePath}/revoke`, {
         method: "POST",
         headers: {
           "Content-Type": "application/json",

package/dist/index.mjs

@@ -254,13 +254,14 @@ function getFetch(userProvidedFetch = null) {
  * @typedef {Object} Keypair
  * @property {string} privateKey - Hex-encoded private key
  * @property {string} publicKey - Hex-encoded compressed public key
- * @property {string} address - Bitcoin Cash address
+ * @property {string} bitcoincash_address - Bitcoin Cash address
  */
 
 /**
  * @typedef {Object} OAuthClientOptions
  * @property {string} [serverUrl="http://localhost:8000"] - OAuth server URL
  * @property {string} [network="mainnet"] - Network type ("mainnet" or "testnet")
+ * @property {string} [authBasePath="/auth"] - Base path for auth endpoints (e.g., "/auth" or "/bch-auth")
  * @property {SecureStorage} [secureStorage] - Storage interface for tokens
  * @property {Function} [fetch] - Custom fetch implementation (optional)
  * @property {string} [tokenKey="oauth_token"] - Key for storing access token
@@ -298,6 +299,7 @@ class BitcoinCashOAuthClient {
   constructor(options = {}) {
     this.serverUrl = options.serverUrl || "http://localhost:8000";
     this.network = options.network || "mainnet";
+    this.authBasePath = options.authBasePath || "/auth";
     this.secureStorage = options.secureStorage || null;
     this.fetchImpl = options.fetch || getFetch(options.fetch);
     this.secp256k1 = null;
@@ -368,14 +370,14 @@ class BitcoinCashOAuthClient {
     const publicKeyBytes = this.secp256k1.derivePublicKeyCompressed(privateKeyBytes);
     
     // Convert to address
-    const address = await this.publicKeyToCashAddress(publicKeyBytes);
-
-    this._log('Generated new keypair', { address });
+    const bitcoincash_address = await this.publicKeyToCashAddress(publicKeyBytes);
+    
+    this._log('Generated new keypair', { bitcoincash_address });
 
     return {
       privateKey: this.bytesToHex(privateKeyBytes),
       publicKey: this.bytesToHex(publicKeyBytes),
-      address,
+      bitcoincash_address,
     };
   }
 
@@ -429,40 +431,55 @@ class BitcoinCashOAuthClient {
   }
 
   /**
-   * Register a new user with the server
-   * @param {string} address - Bitcoin Cash address
-   * @param {string} [userId] - Optional user-provided ID
+   * Register a new user with the server (signature required)
+   * @param {string} bitcoincash_address - Bitcoin Cash address
+   * @param {string} privateKeyHex - Private key for signing (hex-encoded)
+   * @param {string} publicKeyHex - Public key for signature verification (hex-encoded)
+   * @param {string} userId - User-provided ID (required)
+   * @param {number} [timestamp] - Optional Unix timestamp (defaults to now)
+   * @param {string} [domain] - Optional domain for message binding
    * @returns {Promise<Object>} Registration result with assigned userId
    * @throws {NetworkError} If network request fails
    * @throws {AuthenticationError} If registration fails
    */
-  async register(address, userId = null) {
+  async register(bitcoincash_address, privateKeyHex, publicKeyHex, userId, timestamp = null, domain = null) {
     try {
-      const response = await this.fetchImpl(`${this.serverUrl}/auth/register`, {
+      const ts = timestamp || Math.floor(Date.now() / 1000);
+      const host = domain || this._getDefaultDomain();
+      const message = this.createAuthMessage(userId, ts, host);
+      const signature = await this.signAuthMessage(message, privateKeyHex);
+
+      this._log('Registering user', { bitcoincash_address, userId, domain: host });
+
+      const response = await this.fetchImpl(`${this.serverUrl}${this.authBasePath}/register`, {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
         },
         body: JSON.stringify({
-          address,
+          bitcoincash_address,
           user_id: userId,
+          timestamp: ts,
+          domain: host,
+          public_key: publicKeyHex,
+          signature: signature,
         }),
       });
 
       if (!response.ok) {
         const errorData = await response.json().catch(() => ({}));
-        
+
         if (response.status === 404) {
           throw new UserNotFoundError(errorData.detail || 'User not found');
         }
-        
+
         throw new AuthenticationError(
           errorData.detail || `Registration failed: ${response.statusText}`,
           response.status
         );
       }
 
-      this._log('User registered successfully', { address, userId });
+      this._log('User registered successfully', { bitcoincash_address, userId });
       return await response.json();
     } catch (error) {
       if (error instanceof OAuthError) {
@@ -530,7 +547,7 @@ class BitcoinCashOAuthClient {
     this._log('Message signed successfully');
 
     try {
-      const response = await this.fetchImpl(`${this.serverUrl}/auth/token`, {
+      const response = await this.fetchImpl(`${this.serverUrl}${this.authBasePath}/token`, {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -751,7 +768,7 @@ class BitcoinCashOAuthClient {
     if (serverCheck) {
       try {
         this._log('Token validation: checking with server');
-        const response = await this.fetchImpl(`${this.serverUrl}/auth/verify`, {
+        const response = await this.fetchImpl(`${this.serverUrl}${this.authBasePath}/verify`, {
           method: "POST",
           headers: {
             "Authorization": `Bearer ${token}`,
@@ -831,7 +848,7 @@ class BitcoinCashOAuthClient {
    */
   async refreshToken(refreshToken) {
     try {
-      const response = await this.fetchImpl(`${this.serverUrl}/auth/refresh`, {
+      const response = await this.fetchImpl(`${this.serverUrl}${this.authBasePath}/refresh`, {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -900,7 +917,7 @@ class BitcoinCashOAuthClient {
         this.refreshTimer = null;
       }
       
-      const response = await this.fetchImpl(`${this.serverUrl}/auth/revoke`, {
+      const response = await this.fetchImpl(`${this.serverUrl}${this.authBasePath}/revoke`, {
         method: "POST",
         headers: {
           "Content-Type": "application/json",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bitcoincash-oauth-client",
-  "version": "0.2.0",
+  "version": "0.2.10",
   "repository": {
     "type": "git",
     "url": "https://github.com/paytaca/bitcoincash-oauth.git"