fix(fileop) authCheck

Author: coderaiser

README.md

@@ -98,7 +98,7 @@ app.use(fileop({
 fileop.listen(socket, {
     prefix: '/fileop',   /* default              */
     root: '/',          /* string or function   */
-    authCheck: (username, password, accept, reject) => {
+    authCheck: (accept, reject) => (username, password) => {
         if (username === 'root' && password === 'toor')
             accept();
 

server/listen.js

@@ -37,9 +37,7 @@ function listen(socket, options) {
                 return connection(root, socket);
 
             const reject = () => socket.emit('reject');
-            socket.on('auth', (username, password) => {
-                authCheck(username, password, connectionWraped(root, socket), reject);
-            })
+            socket.on('auth', authCheck(connectionWraped(root, socket), reject));
         });
 }
 

test/client/fileop.js

@@ -228,8 +228,8 @@ test('client: disconnect', async (t) => {
     });
 });
 
-test('client: auth', async (t) => {
-    const authCheck = (username, password, accept, reject) => {
+test('client: auth: reject', async (t) => {
+    const authCheck = (accept, reject) => () => {
         reject();
     };
 
@@ -252,8 +252,8 @@ test('client: auth', async (t) => {
 });
 
 test('client: options', async (t) => {
-    const authCheck = (username, password, accept, reject) => {
-        reject();
+    const authCheck = (accept) => () => {
+       accept();
     };
 
     const prefix = '/hello';
@@ -268,12 +268,12 @@ test('client: options', async (t) => {
     const destroy = getDestroy(operator);
 
     operator.emit('auth');
-    operator.on('reject', () => {
+    operator.on('accept', () => {
         after();
         done();
         destroy();
 
-        t.pass('shoud reject');
+        t.pass('shoud accept');
         t.end();
     });
 });

test/server/fileop.js

@@ -2,6 +2,7 @@
 
 const test = require('tape');
 const tryToCatch = require('try-to-catch');
+const currify = require('currify');
 
 const connect = require('../lib/connect');
 
@@ -33,7 +34,7 @@ test('fileop: options: authCheck not function', async (t) => {
 });
 
 test('fileop: options: authCheck: reject', async (t) => {
-    const authCheck = (username, password, accept, reject) => {
+    const authCheck = (accept, reject) => () => {
         reject();
     };
 
@@ -49,7 +50,7 @@ test('fileop: options: authCheck: reject', async (t) => {
 });
 
 test('fileop: options: authCheck: accept', async (t) => {
-    const authCheck = (username, password, accept) => {
+    const authCheck = (accept) => () => {
         accept();
     };
 
@@ -65,6 +66,23 @@ test('fileop: options: authCheck: accept', async (t) => {
     });
 });
 
+test('fileop: options: authCheck: accept', async (t) => {
+    const user = 'bill';
+    const pass = 'world';
+    
+    const authCheck = currify((accept, reject, username, password) => {
+        done();
+        
+        t.equal(username, user, 'should pass username');
+        t.equal(password, pass, 'should pass password');
+        t.end();
+    });
+    
+    const {socket, done} = await connect({authCheck});
+    
+    socket.emit('auth', user, pass);
+});
+
 test('fileop: listen: wrong operation', async (t) => {
     const {socket, done} = await connect();