fix-auth-cookie

README.md

@@ -40,7 +40,8 @@ $ npm install satop -g
 $ satop --rpccookiefile=/home/user/.bitcoin/.cookie
 ```
 
-Or using username and password:
+Or using username and password, if `rpccookiefile` has valid value(file exists and readble) auth method
+bypass any values of `rpcuser/rpcpassword` and satop use the cookie file.
 ```sh
 $  satop --rpcuser=<username> --rpcpassword=<password>
 ```

lib/bitcoin/rpc.js

@@ -17,7 +17,7 @@ const loadAuth = async opts => {
 
     let authType = 'usernamePassword';
 
-    if (fs.existsSync(rpccookiefile) && (!rpcuser || !rpcpassword) ) {
+    if (fs.existsSync(rpccookiefile)) {
         authType = 'cookie';
     }
 
@@ -37,7 +37,7 @@ const loadAuth = async opts => {
             connect();
         });*/
 
-        if (!rpcpassword) {
+        if (!rpcuser || !rpcpassword) {
             throw new Error(`Cookie file ${rpccookiefile} in unexpected format`);
         }
     }
@@ -46,8 +46,8 @@ const loadAuth = async opts => {
       host: rpcconnect,
       port: Number(rpcport),
       //authType,
-      username: rpcuser,
-      password: rpcpassword,
+      username: `${rpcuser}`.trim(),
+      password: `${rpcpassword}`.trim(),
       timeout: 1000 //TODO Number(rpctimeout),
     };
 };