Move functions from init.js to init/

lib/handlers/init.js → lib/handlers/init/callback.js

@@ -9,49 +9,8 @@ var Anyfetch = require('anyfetch');
 var async = require('async');
 var restify = require('restify');
 
-var TempToken = require('../models/temp-token.js');
-var Token = require('../models/token.js');
-
-/**
- * This handler starts providing a new account onto AnyFetch.
- * We check the request is valid, create a new tempToken and call the handler for new account.
- * The tempToken is then saved.
- *
- * @param {Object} req Request object from the client
- * @param {Object} res Response we want to return
- * @param {Function} next Callback to call once res has been populated.
- */
-module.exports.connect = function(redirectToService, config) {
-  return function (req, res, next) {
-    if(!req.params.code) {
-      return next(new restify.MissingParameterError("Missing code parameter."));
-    }
-
-    // Hold temporary state
-    var tempToken = new TempToken({
-      anyfetchCode: req.params.code,
-      returnTo: (req.params.returnTo) ? req.params.returnTo : "https://manager.anyfetch.com"
-    });
-
-    redirectToService(config.providerUrl + '/init/callback?code=' + req.params.code, function(err, redirectUrl, preData) {
-      if(err) {
-        return next(err);
-      }
-
-      tempToken.data = preData;
-      tempToken.save(function(err) {
-        if(err) {
-          return next(err);
-        }
-
-        res.send(302, null, {
-          Location: redirectUrl
-        });
-        next();
-      });
-    });
-  };
-};
+var TempToken = require('../../models/temp-token.js');
+var Token = require('../../models/token.js');
 
 /**
  * The user is redirected to this handler after getting access to his provider.
@@ -60,7 +19,7 @@ module.exports.connect = function(redirectToService, config) {
  * @param {Object} res Response we want to return
  * @param {Function} next Callback to call once res has been populated.
  */
-exports.callback = function(retrieveTokens, config) {
+module.exports = function(retrieveTokens, config) {
   return function (req, res, next) {
     if(!req.params.code) {
       return next(new restify.MissingParameterError("Missing code parameter."));

lib/handlers/init/connect.js

@@ -0,0 +1,51 @@
+'use strict';
+/**
+ * @file Define initial handlers,
+ *
+ * Trade grant_tokens for access_tokens.
+ *
+ */
+var restify = require('restify');
+
+var TempToken = require('../../models/temp-token.js');
+
+/**
+ * This handler starts providing a new account onto AnyFetch.
+ * We check the request is valid, create a new tempToken and call the handler for new account.
+ * The tempToken is then saved.
+ *
+ * @param {Object} req Request object from the client
+ * @param {Object} res Response we want to return
+ * @param {Function} next Callback to call once res has been populated.
+ */
+module.exports = function(redirectToService, config) {
+  return function (req, res, next) {
+    if(!req.params.code) {
+      return next(new restify.MissingParameterError("Missing code parameter."));
+    }
+
+    // Hold temporary state
+    var tempToken = new TempToken({
+      anyfetchCode: req.params.code,
+      returnTo: (req.params.returnTo) ? req.params.returnTo : "https://manager.anyfetch.com"
+    });
+
+    redirectToService(config.providerUrl + '/init/callback?code=' + req.params.code, function(err, redirectUrl, preData) {
+      if(err) {
+        return next(err);
+      }
+
+      tempToken.data = preData;
+      tempToken.save(function(err) {
+        if(err) {
+          return next(err);
+        }
+
+        res.send(302, null, {
+          Location: redirectUrl
+        });
+        next();
+      });
+    });
+  };
+};

lib/index.js

@@ -55,7 +55,8 @@ module.exports.createServer = function createServer(connectFunctions, updateAcco
 
   // Load endpoints generators
   var indexEndpoint = require('./handlers/index.js');
-  var initEndpoints = require('./handlers/init.js');
+  var initConnectEndpoints = require('./handlers/init/connect.js');
+  var initCallbackEndpoints = require('./handlers/init/callback.js');
   var updateEndpoint = require('./handlers/update.js');
   var statusEndpoint = require('./handlers/status.js');
   var resetEndpoint = require('./handlers/reset.js');
@@ -112,8 +113,8 @@ module.exports.createServer = function createServer(connectFunctions, updateAcco
 
   // Load routes and generate endpoints using closures
   server.get('/', indexEndpoint);
-  server.get('/init/connect', initEndpoints.connect(connectFunctions.redirectToService, config));
-  server.get('/init/callback', initEndpoints.callback(connectFunctions.retrieveTokens, config));
+  server.get('/init/connect', initConnectEndpoints(connectFunctions.redirectToService, config));
+  server.get('/init/callback', initCallbackEndpoints(connectFunctions.retrieveTokens, config));
 
   server.post('/update', updateEndpoint(updateAccount, server.queue, workers));