feature(gritty) add auth

Author: coderaiser

README.md

@@ -52,17 +52,19 @@ gritty('body', {
 
 ### Server API
 
-#### gritty.listen(socket, options)
+#### gritty.listen(socket, [, options])
 
 `Gritty` could be used as middleware:
 
 ```js
 const prefix = '/gritty'; // default
-const authCheck = (socket, success) => {}; // optional
+const authCheck = (accept, reject) => (username, password) => {
+    accept();
+};
 
 gritty.listen(socket, {
     prefix,
-    authCheck,
+    authCheck, // optional
 })
 ```
 

server/gritty.js

@@ -14,7 +14,7 @@ const pty = require('node-pty-prebuilt');
 const Router = express.Router;
 
 const terminalFn = currify(_terminalFn);
-const connection = wraptile(onConnection);
+const connectionWraped = wraptile(connection);
 
 const CMD = process.platform === 'win32' ? 'cmd.exe' : 'bash';
 const isDev = process.env.NODE_ENV === 'development';
@@ -83,12 +83,13 @@ module.exports.listen = (socket, options) => {
     socket
         .of(prefix || '/gritty')
         .on('connection', (socket) => {
-            const connect = connection(options, socket);
+            const connect = connectionWraped(options, socket);
 
             if (!authCheck)
-                return connect();
+                return connection(options, socket);
 
-            authCheck(socket, connect);
+            const reject = () => socket.emit('reject');
+            socket.on('auth', authCheck(connect, reject));
         });
 };
 
@@ -102,7 +103,9 @@ function check(socket, options) {
         throw Error('options.authCheck should be a function!');
 }
 
-function onConnection(options, socket) {
+function connection(options, socket) {
+    socket.emit('accept');
+    
     let term;
 
     socket.on('terminal', onTerminal);

test/before.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const gritty  = require('../');
+const gritty  = require('..');
 const http = require('http');
 
 const express = require('express');

test/server/gritty.js

@@ -2,6 +2,7 @@
 
 const test = require('tape');
 const {promisify} = require('es6-promisify');
+const currify = require('currify');
 const request = require('request');
 const io = require('socket.io-client');
 const diff = require('sinon-called-with-diff');
@@ -158,29 +159,24 @@ test('gritty: server: socket: emit data', (t) => {
 });
 
 test('gritty: server: socket: authCheck', (t) => {
-    const authCheck = (socket, connection) => {
-        socket.on('auth', ({username, password}) => {
-            if (username !== 'hello' || password !== 'world')
-                return socket.emit('reject');
-            
-            connection();
-            socket.emit('accept');
-        });
-    };
+    const authCheck = currify((accept, reject, username, password) => {
+        if (username !== 'hello' || password !== 'world')
+            return reject();
+        
+        accept();
+    });
 
     before({authCheck}, (port, after) => {
         const socket = io(`http://localhost:${port}/gritty`);
 
         socket.once('connect', () => {
-            socket.emit('auth', {
-                username: 'hello',
-                password: 'world',
-            });
+            socket.emit('auth', 'hello', 'world');
 
             socket.on('accept', () => {
-                t.pass('should emit accepet');
                 socket.close();
                 after();
+                
+                t.pass('should emit accepet');
                 t.end();
             });
         });