From be08a837658eac4de6ee4c880732d59b0f7940d8 Mon Sep 17 00:00:00 2001
From: Juan Cruz Viotti <juanchiviotti@gmail.com>
Date: Mon, 22 Dec 2014 14:43:38 -0400
Subject: [PATCH] Move token as an auth submodule

---
 lib/resin/auth/auth.coffee                   |  2 +-
 lib/resin/{ => auth}/token/token.coffee      |  2 +-
 lib/resin/{ => auth}/token/token.spec.coffee | 10 +++++-----
 lib/resin/index.coffee                       |  1 -
 lib/resin/server/server.coffee               |  4 ++--
 lib/resin/server/server.spec.coffee          | 10 +++++++---
 6 files changed, 16 insertions(+), 13 deletions(-)
 rename lib/resin/{ => auth}/token/token.coffee (97%)
 rename lib/resin/{ => auth}/token/token.spec.coffee (91%)

diff --git a/lib/resin/auth/auth.coffee b/lib/resin/auth/auth.coffee
index 0ed3a84a..6a49823b 100644
--- a/lib/resin/auth/auth.coffee
+++ b/lib/resin/auth/auth.coffee
@@ -1,7 +1,7 @@
 async = require('async')
 _ = require('lodash-contrib')
 
-token = require('../token/token')
+token = require('./token/token')
 server = require('../server/server')
 data = require('../data/data')
 errors = require('../errors/errors')
diff --git a/lib/resin/token/token.coffee b/lib/resin/auth/token/token.coffee
similarity index 97%
rename from lib/resin/token/token.coffee
rename to lib/resin/auth/token/token.coffee
index 1e797d9a..7f2151ed 100644
--- a/lib/resin/token/token.coffee
+++ b/lib/resin/auth/token/token.coffee
@@ -1,4 +1,4 @@
-data = require('../data/data')
+data = require('../../data/data')
 
 # @nodoc
 # TODO: Move to settings
diff --git a/lib/resin/token/token.spec.coffee b/lib/resin/auth/token/token.spec.coffee
similarity index 91%
rename from lib/resin/token/token.spec.coffee
rename to lib/resin/auth/token/token.spec.coffee
index 0dfe23af..dc887ed6 100644
--- a/lib/resin/token/token.spec.coffee
+++ b/lib/resin/auth/token/token.spec.coffee
@@ -1,12 +1,12 @@
 expect = require('chai').expect
 async = require('async')
 token = require('./token')
-settings = require('../settings')
-data = require('../data/data')
-mock = require('../../../tests/utils/mock')
+settings = require('../../settings')
+data = require('../../data/data')
+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:', ->
 
diff --git a/lib/resin/index.coffee b/lib/resin/index.coffee
index a4d7a850..880c1b54 100644
--- a/lib/resin/index.coffee
+++ b/lib/resin/index.coffee
@@ -2,7 +2,6 @@ module.exports =
 	server: require('./server/server')
 	models: require('./models')
 	errors: require('./errors/errors')
-	token: require('./token/token')
 	data: require('./data/data')
 	auth: require('./auth/auth')
 	device: require('./device/device')
diff --git a/lib/resin/server/server.coffee b/lib/resin/server/server.coffee
index dc31983b..01f67a58 100644
--- a/lib/resin/server/server.coffee
+++ b/lib/resin/server/server.coffee
@@ -4,7 +4,7 @@ progress = require('request-progress')
 async = require('async')
 connection = require('../../connection/connection')
 settings = require('../settings')
-token = require('../token/token')
+auth = require('../auth/auth')
 
 # @nodoc
 urlResolve = require('url').resolve
@@ -72,7 +72,7 @@ exports.request = (options = {}, outerCallback, onProgress) ->
 			if not isOnline
 				return callback(new Error('You need internet connection to perform this task'))
 
-			token.getToken(callback)
+			auth.getToken(callback)
 
 		(savedToken, callback) ->
 			options.url = urlResolve(settings.get('remoteUrl'), options.url)
diff --git a/lib/resin/server/server.spec.coffee b/lib/resin/server/server.spec.coffee
index 49734847..d33812f4 100644
--- a/lib/resin/server/server.spec.coffee
+++ b/lib/resin/server/server.spec.coffee
@@ -5,7 +5,7 @@ url = require('url')
 sinon = require('sinon')
 server = require('./server')
 settings = require('../settings')
-token = require('../token/token')
+auth = require('../auth/auth')
 data = require('../data/data')
 mock = require('../../../tests/utils/mock')
 johnDoeFixture = require('../../../tests/fixtures/johndoe.json')
@@ -200,7 +200,11 @@ describe 'Server:', ->
 	describe 'given there is a token', ->
 
 		beforeEach (done) ->
-			token.saveToken(johnDoeFixture.token, done)
+			nock(settings.get('remoteUrl'))
+				.post('/login_', johnDoeFixture.credentials)
+				.reply(200, johnDoeFixture.token)
+
+			auth.login(johnDoeFixture.credentials, done)
 
 		describe '#request()', ->
 
@@ -220,7 +224,7 @@ describe 'Server:', ->
 	describe 'given there is not a token', ->
 
 		beforeEach (done) ->
-			token.clearToken(done)
+			auth.logout(done)
 
 		describe '#request()', ->