mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

tabstabstabstabstabs

Browse source
This commit is contained in:
Matt Corallo 2014-03-22 18:45:01 -04:00
parent 8a2b35b48d
commit 832daf54db
3 changed files with 144 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

249
js/api.js
View file

@ -1,145 +1,142 @@
/************************************************ /************************************************
*** Utilities to communicate with the server *** *** Utilities to communicate with the server ***
************************************************/ ************************************************/
var URL_BASE = "http://textsecure-test.herokuapp.com"; var URL_BASE = "http://sushiforeveryone.bluematt.me";
//var URL_BASE = "https://textsecure-service.whispersystems.org"; //var URL_BASE = "https://textsecure-service.whispersystems.org";
var URL_CALLS = {}; var URL_CALLS = {};
URL_CALLS['accounts'] = "/v1/accounts"; URL_CALLS['accounts'] = "/v1/accounts";
URL_CALLS['devices'] = "/v1/devices"; URL_CALLS['devices'] = "/v1/devices";
URL_CALLS['keys'] = "/v1/keys"; URL_CALLS['keys'] = "/v1/keys";
URL_CALLS['push'] = "/v1/messagesocket"; URL_CALLS['push'] = "/v1/messagesocket";
URL_CALLS['messages'] = "/v1/messages/"; URL_CALLS['messages'] = "/v1/messages/";
var API = new function() { var API = new function() {
/** /**
* REQUIRED PARAMS: * REQUIRED PARAMS:
* call: URL_CALLS entry * call: URL_CALLS entry
* httpType: POST/GET/PUT/etc * httpType: POST/GET/PUT/etc
* OPTIONAL PARAMS: * OPTIONAL PARAMS:
* success_callback: function(response object) called on success * success_callback: function(response object) called on success
* error_callback: function(http status code = -1 or != 200) called on failure * error_callback: function(http status code = -1 or != 200) called on failure
* urlParameters: crap appended to the url (probably including a leading /) * urlParameters: crap appended to the url (probably including a leading /)
* user: user name to be sent in a basic auth header * user: user name to be sent in a basic auth header
* password: password to be sent in a basic auth headerA * password: password to be sent in a basic auth headerA
* do_auth: alternative to user/password where user/password are figured out automagically * do_auth: alternative to user/password where user/password are figured out automagically
* jsonData: JSON data sent in the request body * jsonData: JSON data sent in the request body
*/ */
this.doAjax = function doAjax(param) { this.doAjax = function doAjax(param) {
if (param.urlParameters === undefined) if (param.urlParameters === undefined)
param.urlParameters = ""; param.urlParameters = "";
if (param.do_auth) { if (param.do_auth) {
param.user = storage.getUnencrypted("number_id"); param.user = storage.getUnencrypted("number_id");
param.password = storage.getEncrypted("password"); param.password = storage.getEncrypted("password");
} }
$.ajax(URL_BASE + URL_CALLS[param.call] + param.urlParameters, { $.ajax(URL_BASE + URL_CALLS[param.call] + param.urlParameters, {
type : param.httpType, type : param.httpType,
data : param.jsonData && jsonThing(param.jsonData), data : param.jsonData && jsonThing(param.jsonData),
contentType : 'application/json; charset=utf-8', contentType : 'application/json; charset=utf-8',
dataType : 'json', dataType : 'json',
beforeSend : function(xhr) { beforeSend : function(xhr) {
if (param.user !== undefined && if (param.user !== undefined &&
param.password !== undefined) { param.password !== undefined)
xhr.setRequestHeader("Authorization", "Basic " + btoa(getString(param.user) + ":" + getString(param.password))); xhr.setRequestHeader("Authorization", "Basic " + btoa(getString(param.user) + ":" + getString(param.password)));
} },
},
success : function(response, textStatus, jqXHR) { success : function(response, textStatus, jqXHR) {
if (param.success_callback !== undefined) if (param.success_callback !== undefined)
param.success_callback(response); param.success_callback(response);
}, },
error : function(jqXHR, textStatus, errorThrown) { error : function(jqXHR, textStatus, errorThrown) {
var code = jqXHR.status; var code = jqXHR.status;
if (code == 200) { if (code == 200) {
// happens sometimes when we get no response // happens sometimes when we get no response
// (TODO: Fix server to return 204? instead) // (TODO: Fix server to return 204? instead)
if (param.success_callback !== undefined) if (param.success_callback !== undefined)
param.success_callback(null); param.success_callback(null);
return; return;
} }
if (code > 999 || code < 100) if (code > 999 || code < 100)
code = -1; code = -1;
if (param.error_callback !== undefined) if (param.error_callback !== undefined)
param.error_callback(code); param.error_callback(code);
} }
}); });
}; };
this.requestVerificationCode = function(number, success_callback, error_callback) {
this.doAjax({
call : 'accounts',
httpType : 'GET',
urlParameters : '/sms/code/' + number,
success_callback : success_callback,
error_callback : error_callback
});
};
this.requestVerificationCode = function(number, success_callback, error_callback) { this.confirmCode = function(code, number, password,
this.doAjax({ signaling_key, single_device,
call : 'accounts', success_callback, error_callback) {
httpType : 'GET', var call = single_device ? 'accounts' : 'devices';
urlParameters : '/sms/code/' + number, var urlPrefix = single_device ? '/code/' : '/';
success_callback : success_callback,
error_callback : error_callback
});
};
this.confirmCode = function(code, number, password, API.doAjax({
signaling_key, single_device, call : call,
success_callback, error_callback) { httpType : 'PUT',
var call = single_device ? 'accounts' : 'devices'; urlParameters : urlPrefix + code,
var urlPrefix = single_device ? '/code/' : '/'; user : number,
password : password,
jsonData : { signalingKey : btoa(getString(signaling_key)),
supportsSms : false,
fetchesMessages : true },
success_callback : success_callback,
error_callback : error_callback
});
};
API.doAjax({ this.registerKeys = function(keys, success_callback, error_callback) {
call : call, this.doAjax({
httpType : 'PUT', call : 'keys',
urlParameters : urlPrefix + code, httpType : 'PUT',
user : number, do_auth : true,
password : password, jsonData : keys,
jsonData : { signalingKey : btoa(getString(signaling_key)), success_callback : success_callback,
supportsSms : false, error_callback : error_callback
fetchesMessages : true }, });
success_callback : success_callback, };
error_callback : error_callback
});
};
this.registerKeys = function(keys, success_callback, error_callback) { this.getKeysForNumber = function(number, success_callback, error_callback) {
this.doAjax({ this.doAjax({
call : 'keys', call : 'keys',
httpType : 'PUT', httpType : 'GET',
do_auth : true, do_auth : true,
jsonData : keys, urlParameters : "/" + getNumberFromString(number) + "?multikeys",
success_callback : success_callback, success_callback : success_callback,
error_callback : error_callback error_callback : error_callback
}); });
}; };
this.getKeysForNumber = function(number, success_callback, error_callback) { this.sendMessages = function(jsonData, success_callback, error_callback) {
this.doAjax({ this.doAjax({
call : 'keys', call : 'messages',
httpType : 'GET', httpType : 'POST',
do_auth : true, do_auth : true,
urlParameters : "/" + getNumberFromString(number) + "?multikeys", jsonData : jsonData,
success_callback : success_callback, success_callback : success_callback,
error_callback : error_callback error_callback : error_callback
}); });
}; };
this.sendMessages = function(jsonData, success_callback, error_callback) {
this.doAjax({
call : 'messages',
httpType : 'POST',
do_auth : true,
jsonData : jsonData,
success_callback : success_callback,
error_callback : error_callback
});
};
this.pushMessage = function(messageId) {
this.doAjax({
call : 'push',
httpType : 'PUT',
urlParameters : '/' + message.id,
do_auth : true
});
};
this.pushMessage = function(messageId) {
this.doAjax({
call : 'push',
httpType : 'PUT',
urlParameters : '/' + message.id,
do_auth : true
});
};
}(); // API }(); // API

37
js/fake_api.js
View file

@ -1,25 +1,24 @@
var FakeWhisperAPI = function() { var FakeWhisperAPI = function() {
this.doAjax = function(param) {
if (param.success_callback) {
setTimeout(param.success_callback, 100, param.response);
}
}
this.doAjax = function(param) { this.getKeysForNumber = function(number, success_callback, error_callback) {
if (param.success_callback) { this.doAjax({ success_callback : success_callback,
setTimeout(param.success_callback, 100, param.response); response : [{ identityKey : 1,
} deviceId : 1,
} publicKey : 1,
keyId : 1 }]
});
}
this.getKeysForNumber = function(number, success_callback, error_callback) { this.sendMessages = function(jsonData, success_callback, error_callback) {
this.doAjax({ success_callback: success_callback, this.doAjax({ success_callback : success_callback,
response : [{ identityKey: 1, response : { missingDeviceIds: [] }
deviceId : 1, });
publicKey : 1, }
keyId : 1 }]
});
}
this.sendMessages = function(jsonData, success_callback, error_callback) {
this.doAjax({ success_callback: success_callback,
response : { missingDeviceIds: [] }
});
}
}; };
FakeWhisperAPI.prototype = API; FakeWhisperAPI.prototype = API;

7
js/helpers.js
View file

@ -891,8 +891,7 @@ function subscribeToPush(message_callback) {
var proto = decodeIncomingPushMessageProtobuf(plaintext); var proto = decodeIncomingPushMessageProtobuf(plaintext);
// After this point, a) decoding errors are not the server's fault, and // After this point, a) decoding errors are not the server's fault, and
// b) we should handle them gracefully and tell the user they received an invalid message // b) we should handle them gracefully and tell the user they received an invalid message
API.pushMessage(message.id);
API.pushMessage(message.id);
} catch (e) { } catch (e) {
console.log("Error decoding message: " + e); console.log("Error decoding message: " + e);
return; return;
@ -915,7 +914,7 @@ function subscribeToPush(message_callback) {
// success_callback(identity_key), error_callback(error_msg) // success_callback(identity_key), error_callback(error_msg)
function getKeysForNumber(number, success_callback, error_callback) { function getKeysForNumber(number, success_callback, error_callback) {
API.getKeysForNumber(number, API.getKeysForNumber(number,
function(response) { function(response) {
for (var i = 0; i < response.length; i++) { for (var i = 0; i < response.length; i++) {
try { try {
@ -951,7 +950,7 @@ function sendMessageToDevices(deviceObjectList, message, success_callback, error
}; };
//TODO: need to encrypt with session key? //TODO: need to encrypt with session key?
} }
API.sendMessages(jsonData, API.sendMessages(jsonData,
function(result) { function(result) {
if (result.missingDeviceIds.length > 0) { if (result.missingDeviceIds.length > 0) {
var responsesLeft = result.missingDeviceIds.length; var responsesLeft = result.missingDeviceIds.length;