Move token to resin module

This commit is contained in:
Juan Cruz Viotti 2014-11-26 12:42:10 -04:00
parent edcee1c9cf
commit 1736d8a759
6 changed files with 11 additions and 11 deletions

View File

@ -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(':')

View File

@ -3,3 +3,4 @@ module.exports =
models: require('./models')
log: require('./log/log')
errors: require('./errors/errors')
token: require('./token/token')

View File

@ -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) ->

View File

@ -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')

View File

@ -1,4 +1,4 @@
data = require('../data/data')
data = require('../../data/data')
TOKEN_KEY = 'token'

View File

@ -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:', ->