EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-4608 core: Fix FileTransferMock responses 

FileTransferMock was ignoring server response on errors, differing from
the Cordova plugin. Also, it was not correctly returning response
headers. Private function parseResponse has been removed as it is no
longer needed.
main
Albert Gasset 2024-08-13 15:23:40 +02:00
parent 071eee20bb
commit 5c4da9a5b1
1 changed files with 17 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/core/features/emulator/services/file-transfer.ts
View File

@ -12,7 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
import { CoreTextUtils } from '@services/utils/text';
import { CoreFile } from '@services/file';
/**
@ -117,25 +116,24 @@ export class FileTransferMock {
};
xhr.onerror = (): void => {
const error = new FileTransferErrorMock(-1, source, target, xhr.status, xhr.statusText, '');
const error = new FileTransferErrorMock(-1, source, target, xhr.status, '', '');
errorCallback(error);
};
xhr.onload = async (): Promise<void> => {
// Finished dowloading the file.
let response = xhr.response || xhr.responseText;
const status = Math.max(xhr.status === 1223 ? 204 : xhr.status, 0);
if (status < 200 || status >= 300) {
// Request failed. Try to get the error message.
response = await this.parseResponse(response);
const error = new FileTransferErrorMock(-1, source, target, xhr.status, response || xhr.statusText, '');
// Request failed. Try to get the respnse.
const body = xhr.response ? await this.blobToText(xhr.response) : '';
const error = new FileTransferErrorMock(-1, source, target, xhr.status, body, '');
return errorCallback(error);
}
if (!response) {
const error = new FileTransferErrorMock(-1, source, target, xhr.status, xhr.statusText, 'No response obtained');
if (!xhr.response) {
const error = new FileTransferErrorMock(-1, source, target, xhr.status, '', 'No response obtained');
return errorCallback(error);
}
@ -143,10 +141,16 @@ export class FileTransferMock {
const basePath = CoreFile.getBasePathInstant();
target = target.replace(basePath, ''); // Remove basePath from the target.
target = target.replace(/%20/g, ' '); // Replace all %20 with spaces.
CoreFile.writeFile(target, response)
.then(entry =>
successCallback({ entry: entry as unknown as globalThis.FileEntry, headers: response.headers }))
.catch(error => errorCallback(error));
try {
const entry = await CoreFile.writeFile(target, xhr.response) ;
successCallback({
entry: entry as unknown as globalThis.FileEntry,
headers: this.getHeadersAsObject(xhr),
});
} catch (error) {
errorCallback(error);
}
};
xhr.send();
@ -214,34 +218,6 @@ export class FileTransferMock {
return credentials && credentials[1];
}
/**
* Parse a response, converting it into text and the into an object if needed.
*
* @param response The response to parse.
* @returns Promise resolved with the parsed response.
*/
protected async parseResponse(response: Blob | ArrayBuffer | string | null): Promise<unknown> {
if (!response) {
return '';
}
let responseText = '';
if (response instanceof Blob) {
responseText = await this.blobToText(response);
} else if (response instanceof ArrayBuffer) {
// Convert the ArrayBuffer into text.
responseText = String.fromCharCode.apply(null, new Uint8Array(response));
} else {
responseText = response;
}
return CoreTextUtils.parseJSON(responseText, '');
}
/**
* Convert a Blob to text.
*
@ -336,7 +312,7 @@ export class FileTransferMock {
this.errorCallback = errorCallback;
xhr.onerror = (): void => {
const error = new FileTransferErrorMock(-1, fileUrl, url, xhr.status, xhr.statusText, '');
const error = new FileTransferErrorMock(-1, fileUrl, url, xhr.status, '', '');
errorCallback(error);
};