Browse Source

Fixed authorizer bad network handling

Closes #415
master
Igor Zhukov 11 years ago
parent
commit
98da2bbea4
  1. 16
      app/js/lib/mtproto.js
  2. 1
      app/js/services.js

16
app/js/lib/mtproto.js

@ -199,15 +199,16 @@ angular.module('izhukov.mtproto', ['izhukov.utils'])
return $http.post('http://' + MtpDcConfigurator.chooseServer(dcID) + '/apiw1', resultArray, { return $http.post('http://' + MtpDcConfigurator.chooseServer(dcID) + '/apiw1', resultArray, {
responseType: 'arraybuffer', responseType: 'arraybuffer',
transformRequest: null, transformRequest: null
transformResponse: function (responseBuffer) { }).then(
if (!responseBuffer || !responseBuffer.byteLength) { function (result) {
if (!result.data || !result.data.byteLength) {
return $q.reject({code: 406, type: 'NETWORK_BAD_RESPONSE'}); return $q.reject({code: 406, type: 'NETWORK_BAD_RESPONSE'});
} }
try { try {
var deserializer = new TLDeserialization(responseBuffer, {mtproto: true}); var deserializer = new TLDeserialization(result.data, {mtproto: true});
var auth_key_id = deserializer.fetchLong('auth_key_id'); var auth_key_id = deserializer.fetchLong('auth_key_id');
var msg_id = deserializer.fetchLong('msg_id'); var msg_id = deserializer.fetchLong('msg_id');
var msg_len = deserializer.fetchInt('msg_len'); var msg_len = deserializer.fetchInt('msg_len');
@ -219,13 +220,14 @@ angular.module('izhukov.mtproto', ['izhukov.utils'])
rng_seed_time(); rng_seed_time();
return deserializer; return deserializer;
} },
})['catch'](function (error) { function (error) {
if (!error.message && !error.type) { if (!error.message && !error.type) {
error = {code: 406, type: 'NETWORK_BAD_REQUEST'}; error = {code: 406, type: 'NETWORK_BAD_REQUEST'};
} }
return $q.reject(error); return $q.reject(error);
}); }
);
}; };
function mtpSendReqPQ (auth) { function mtpSendReqPQ (auth) {

1
app/js/services.js

@ -1994,7 +1994,6 @@ angular.module('myApp.services', [])
delete pendingByMessageID[message.id]; delete pendingByMessageID[message.id];
} }
// console.log(11, randomID, pendingMessage);
if (!pendingMessage) { if (!pendingMessage) {
$rootScope.$broadcast('history_append', {peerID: peerID, messageID: message.id}); $rootScope.$broadcast('history_append', {peerID: peerID, messageID: message.id});
} }

Loading…
Cancel
Save