Skip to content
This repository has been archived by the owner on Apr 3, 2019. It is now read-only.

Make ClientApi an EventEmitter, to allow tracking of APi requests. #149

Merged
merged 1 commit into from
Aug 20, 2013
Merged

Make ClientApi an EventEmitter, to allow tracking of APi requests. #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 40 additions & 35 deletions client/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
var EventEmitter = require('events').EventEmitter;
var util = require('util');

var hawk = require('hawk')
var P = require('p-promise')
var request = require('request')

var models = require('../models')({}, {}, {})
var tokens = models.tokens

util.inherits(ClientApi, EventEmitter);
function ClientApi(origin) {
EventEmitter.call(this);
this.origin = origin
}

Expand All @@ -20,28 +25,28 @@ function hawkHeader(token, method, url, payload) {
return hawk.client.header(url, method, verify).field
}

function doRequest(method, url, token, payload) {
ClientApi.prototype.doRequest = function (method, url, token, payload) {
var d = P.defer()
var headers = {}
if (token) {
headers.Authorization = hawkHeader(token, method, url, payload)
}
request(
{
url: url,
method: method,
headers: headers,
json: payload || true
},
function (err, res, body) {
if (err || body.error) {
d.reject(err || body)
}
else {
d.resolve(body)
}
var options = {
url: url,
method: method,
headers: headers,
json: payload || true
};
this.emit('startRequest', options);
request(options, function (err, res, body) {
this.emit('endRequest', options, err, res);
if (err || body.error) {
d.reject(err || body)
}
)
else {
d.resolve(body)
}
}.bind(this));
return d.promise
}

Expand All @@ -65,7 +70,7 @@ function doRequest(method, url, token, payload) {
*
*/
ClientApi.prototype.accountCreate = function (email, verifier, salt, passwordStretching) {
return doRequest(
return this.doRequest(
'POST',
this.origin + '/account/create',
null,
Expand All @@ -85,7 +90,7 @@ ClientApi.prototype.accountDevices = function (sessionTokenHex) {
return tokens.SessionToken.fromHex(sessionTokenHex)
.then(
function (token) {
return doRequest(
return this.doRequest(
'GET',
this.origin + '/account/devices',
token
Expand All @@ -98,7 +103,7 @@ ClientApi.prototype.accountKeys = function (keyFetchTokenHex) {
return tokens.KeyFetchToken.fromHex(keyFetchTokenHex)
.then(
function (token) {
return doRequest(
return this.doRequest(
'GET',
this.origin + '/account/keys',
token
Expand All @@ -111,7 +116,7 @@ ClientApi.prototype.accountReset = function (accountResetTokenHex, bundle, srp,
return tokens.AccountResetToken.fromHex(accountResetTokenHex)
.then(
function (token) {
return doRequest(
return this.doRequest(
'POST',
this.origin + '/account/reset',
token,
Expand All @@ -129,7 +134,7 @@ ClientApi.prototype.accountDestroy = function (authTokenHex) {
return tokens.AuthToken.fromHex(authTokenHex)
.then(
function (token) {
return doRequest(
return this.doRequest(
'POST',
this.origin + '/account/destroy',
token
Expand All @@ -142,7 +147,7 @@ ClientApi.prototype.recoveryEmailStatus = function (sessionTokenHex) {
return tokens.SessionToken.fromHex(sessionTokenHex)
.then(
function (token) {
return doRequest(
return this.doRequest(
'GET',
this.origin + '/recovery_email/status',
token
Expand All @@ -155,7 +160,7 @@ ClientApi.prototype.recoveryEmailResendCode = function (sessionTokenHex, email)
return tokens.SessionToken.fromHex(sessionTokenHex)
.then(
function (token) {
return doRequest(
return this.doRequest(
'POST',
this.origin + '/recovery_email/resend_code',
token,
Expand All @@ -168,7 +173,7 @@ ClientApi.prototype.recoveryEmailResendCode = function (sessionTokenHex, email)
}

ClientApi.prototype.recoveryEmailVerifyCode = function (uid, code) {
return doRequest(
return this.doRequest(
'POST',
this.origin + '/recovery_email/verify_code',
null,
Expand All @@ -183,7 +188,7 @@ ClientApi.prototype.certificateSign = function (sessionTokenHex, publicKey, dura
return tokens.SessionToken.fromHex(sessionTokenHex)
.then(
function (token) {
return doRequest(
return this.doRequest(
'POST',
this.origin + '/certificate/sign',
token,
Expand All @@ -197,7 +202,7 @@ ClientApi.prototype.certificateSign = function (sessionTokenHex, publicKey, dura
}

ClientApi.prototype.getRandomBytes = function () {
return doRequest(
return this.doRequest(
'POST',
this.origin + '/get_random_bytes'
)
Expand All @@ -207,7 +212,7 @@ ClientApi.prototype.passwordChangeStart = function (authTokenHex) {
return tokens.AuthToken.fromHex(authTokenHex)
.then(
function (token) {
return doRequest(
return this.doRequest(
'POST',
this.origin + '/password/change/start',
token
Expand All @@ -217,7 +222,7 @@ ClientApi.prototype.passwordChangeStart = function (authTokenHex) {
}

ClientApi.prototype.passwordForgotSendCode = function (email) {
return doRequest(
return this.doRequest(
'POST',
this.origin + '/password/forgot/send_code',
null,
Expand All @@ -231,7 +236,7 @@ ClientApi.prototype.passwordForgotResendCode = function (forgotPasswordTokenHex,
return tokens.ForgotPasswordToken.fromHex(forgotPasswordTokenHex)
.then(
function (token) {
return doRequest(
return this.doRequest(
'POST',
this.origin + '/password/forgot/resend_code',
token,
Expand All @@ -247,7 +252,7 @@ ClientApi.prototype.passwordForgotVerifyCode = function (forgotPasswordTokenHex,
return tokens.ForgotPasswordToken.fromHex(forgotPasswordTokenHex)
.then(
function (token) {
return doRequest(
return this.doRequest(
'POST',
this.origin + '/password/forgot/verify_code',
token,
Expand All @@ -260,7 +265,7 @@ ClientApi.prototype.passwordForgotVerifyCode = function (forgotPasswordTokenHex,
}

ClientApi.prototype.authStart = function (email) {
return doRequest(
return this.doRequest(
'POST',
this.origin + '/auth/start',
null,
Expand All @@ -271,7 +276,7 @@ ClientApi.prototype.authStart = function (email) {
}

ClientApi.prototype.authFinish = function (srpToken, A, M) {
return doRequest(
return this.doRequest(
'POST',
this.origin + '/auth/finish',
null,
Expand All @@ -287,7 +292,7 @@ ClientApi.prototype.sessionCreate = function (authTokenHex) {
return tokens.AuthToken.fromHex(authTokenHex)
.then(
function (token) {
return doRequest(
return this.doRequest(
'POST',
this.origin + '/session/create',
token
Expand All @@ -300,7 +305,7 @@ ClientApi.prototype.sessionDestroy = function (sessionTokenHex) {
return tokens.SessionToken.fromHex(sessionTokenHex)
.then(
function (token) {
return doRequest(
return this.doRequest(
'POST',
this.origin + '/session/destroy',
token
Expand All @@ -310,7 +315,7 @@ ClientApi.prototype.sessionDestroy = function (sessionTokenHex) {
}

ClientApi.heartbeat = function (origin) {
return doRequest('GET', origin + '/__heartbeat__')
return (new ClientApi(origin)).doRequest('GET', origin + '/__heartbeat__');
}

module.exports = ClientApi
27 changes: 13 additions & 14 deletions client/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,23 +68,22 @@ function verifier(salt, email, password, algorithm) {
).toString('hex')
}

function setupCredentials (c, email, password) {
Client.prototype.setupCredentials = function (email, password) {
// TODO: password stretching
c.email = Buffer(email).toString('hex')
c.password = password
c.srp = {}
c.srp.type = 'SRP-6a/SHA256/2048/v1'
c.srp.salt = crypto.randomBytes(32).toString('hex')
c.srp.algorithm = 'sha256'
c.srp.verifier = verifier(c.srp.salt, c.email, c.password, c.srp.algorithm)
c.passwordSalt = crypto.randomBytes(32).toString('hex')

return c;
this.email = Buffer(email).toString('hex')
this.password = password
this.srp = {}
this.srp.type = 'SRP-6a/SHA256/2048/v1'
this.srp.salt = crypto.randomBytes(32).toString('hex')
this.srp.algorithm = 'sha256'
this.srp.verifier = verifier(this.srp.salt, this.email, this.password,
this.srp.algorithm);
this.passwordSalt = crypto.randomBytes(32).toString('hex')
}

Client.create = function (origin, email, password, callback) {
var c = new Client(origin)
setupCredentials(c, email, password)
c.setupCredentials(email, password)
var p = c.create()
if (callback) {
p.done(callback.bind(null, null), callback)
Expand All @@ -96,7 +95,7 @@ Client.create = function (origin, email, password, callback) {

Client.login = function (origin, email, password, callback) {
var c = new Client(origin)
setupCredentials(c, email, password)
c.setupCredentials(email, password)
var p = c.login()
.then(
function () {
Expand Down Expand Up @@ -486,7 +485,7 @@ Client.prototype.reforgotPassword = function (callback) {
Client.prototype.resetPassword = function (code, password, callback) {
// this will generate a new wrapKb on the server
var wrapKb = '0000000000000000000000000000000000000000000000000000000000000000'
setupCredentials(this, Buffer(this.email, 'hex').toString(), password)
this.setupCredentials(Buffer(this.email, 'hex').toString(), password)
var p = this.api.passwordForgotVerifyCode(this.forgotPasswordToken, code)
.then(
function (json) {
Expand Down