From 1736d8a7596bbb8aa2a35b3ce47aab5108f3476b Mon Sep 17 00:00:00 2001
From: Juan Cruz Viotti <juanchiviotti@gmail.com>
Date: Wed, 26 Nov 2014 12:42:10 -0400
Subject: [PATCH] Move token to resin module

---
 lib/auth/auth.coffee                    | 9 ++++-----
 lib/resin/index.coffee                  | 1 +
 lib/resin/server/server.coffee          | 2 +-
 lib/resin/server/server.spec.coffee     | 2 +-
 lib/{ => resin}/token/token.coffee      | 2 +-
 lib/{ => resin}/token/token.spec.coffee | 6 +++---
 6 files changed, 11 insertions(+), 11 deletions(-)
 rename lib/{ => resin}/token/token.coffee (92%)
 rename lib/{ => resin}/token/token.spec.coffee (93%)

diff --git a/lib/auth/auth.coffee b/lib/auth/auth.coffee
index d40b0473..c8f58009 100644
--- a/lib/auth/auth.coffee
+++ b/lib/auth/auth.coffee
@@ -2,7 +2,6 @@ async = require('async')
 _ = require('lodash')
 
 resin = require('../resin')
-token = require('../token/token')
 
 exports.authenticate = (credentials, callback) ->
 	resin.server.post '/login_', credentials, (error, response) ->
@@ -15,17 +14,17 @@ exports.login = (credentials, callback) ->
 			exports.authenticate(credentials, callback)
 
 		(authToken, callback) ->
-			token.saveToken(authToken, callback)
+			resin.token.saveToken(authToken, callback)
 
 	], callback)
 
 # Handy aliases
-exports.isLoggedIn = token.hasToken
-exports.getToken = token.getToken
+exports.isLoggedIn = resin.token.hasToken
+exports.getToken = resin.token.getToken
 
 # TODO: Maybe we should post to /logout or something
 # like that to invalidate the token on the server?
-exports.logout = token.clearToken
+exports.logout = resin.token.clearToken
 
 exports.parseCredentials = (credentials, callback) ->
 	result = credentials.split(':')
diff --git a/lib/resin/index.coffee b/lib/resin/index.coffee
index 80eee784..cc70f86f 100644
--- a/lib/resin/index.coffee
+++ b/lib/resin/index.coffee
@@ -3,3 +3,4 @@ module.exports =
 	models: require('./models')
 	log: require('./log/log')
 	errors: require('./errors/errors')
+	token: require('./token/token')
diff --git a/lib/resin/server/server.coffee b/lib/resin/server/server.coffee
index 6e2fb2b8..fd81ff9e 100644
--- a/lib/resin/server/server.coffee
+++ b/lib/resin/server/server.coffee
@@ -4,7 +4,7 @@ urlResolve = require('url').resolve
 async = require('async')
 connection = require('../../connection/connection')
 config = require('../../config')
-token = require('../../token/token')
+token = require('../token/token')
 
 exports.request = (options = {}, callback) ->
 
diff --git a/lib/resin/server/server.spec.coffee b/lib/resin/server/server.spec.coffee
index 71b99f50..beea2c13 100644
--- a/lib/resin/server/server.spec.coffee
+++ b/lib/resin/server/server.spec.coffee
@@ -3,7 +3,7 @@ nock = require('nock')
 url = require('url')
 server = require('./server')
 config = require('../../config')
-token = require('../../token/token')
+token = require('../token/token')
 data = require('../../data/data')
 mock = require('../../../tests/utils/mock')
 johnDoeFixture = require('../../../tests/fixtures/johndoe.json')
diff --git a/lib/token/token.coffee b/lib/resin/token/token.coffee
similarity index 92%
rename from lib/token/token.coffee
rename to lib/resin/token/token.coffee
index 976d657b..9669832f 100644
--- a/lib/token/token.coffee
+++ b/lib/resin/token/token.coffee
@@ -1,4 +1,4 @@
-data = require('../data/data')
+data = require('../../data/data')
 
 TOKEN_KEY = 'token'
 
diff --git a/lib/token/token.spec.coffee b/lib/resin/token/token.spec.coffee
similarity index 93%
rename from lib/token/token.spec.coffee
rename to lib/resin/token/token.spec.coffee
index 4b7b86fc..b3aae7d9 100644
--- a/lib/token/token.spec.coffee
+++ b/lib/resin/token/token.spec.coffee
@@ -1,10 +1,10 @@
 expect = require('chai').expect
 async = require('async')
 token = require('./token')
-mock = require('../../tests/utils/mock')
+mock = require('../../../tests/utils/mock')
 
-johnDoeFixture = require('../../tests/fixtures/johndoe.json')
-janeDoeFixture = require('../../tests/fixtures/janedoe.json')
+johnDoeFixture = require('../../../tests/fixtures/johndoe.json')
+janeDoeFixture = require('../../../tests/fixtures/janedoe.json')
 
 describe 'Token:', ->