c8osdkvuejs
Advanced tools
{ | ||
"name": "c8osdkvuejs", | ||
"version": "0.0.0-beta3", | ||
"version": "0.0.0-beta4", | ||
"description": "convertigo's MBaaS client API service", | ||
@@ -23,2 +23,3 @@ "main": "bundle/index.umd.js", | ||
}, | ||
"keywords": [ | ||
@@ -45,15 +46,14 @@ "MBaaS", | ||
"@types/pouchdb": "6.3.1", | ||
"axios": "0.18.0", | ||
"c8osdkjscore": "0.0.0-beta13", | ||
"eslint-plugin-standard": "^3.0.1", | ||
"c8osdkjscore": "0.0.0-beta12", | ||
"pouchdb-browser": "6.3.4", | ||
"rxjs": "5.5.2", | ||
"sw-toolbox": "3.6.0", | ||
"vue-resource": "1.5.0", | ||
"zone.js": "0.8.18" | ||
"zone.js": "0.8.18", | ||
"vue-resource":"1.5.0", | ||
"axios":"0.18.0" | ||
}, | ||
"devDependencies": { | ||
"rimraf": "2.6.1", | ||
"@types/jasmine": "2.8.2", | ||
"awesome-typescript-loader": "3.4.1", | ||
"browserify": "16.2.0", | ||
"codelyzer": "4.0.1", | ||
@@ -63,4 +63,2 @@ "commitizen": "2.9.6", | ||
"core-js": "2.5.1", | ||
"eslint": "^4.19.1", | ||
"eslint-plugin-typescript": "^0.11.0", | ||
"istanbul-instrumenter-loader": "3.0.0", | ||
@@ -78,3 +76,2 @@ "jasmine-core": "2.8.0", | ||
"reflect-metadata": "0.1.10", | ||
"rimraf": "2.6.1", | ||
"source-map-loader": "0.2.3", | ||
@@ -86,5 +83,5 @@ "ts-helpers": "1.1.2", | ||
"typedoc": "0.9.0", | ||
"webpack": "3.10.0", | ||
"typescript": "2.4.2", | ||
"typescript-eslint-parser": "^15.0.0", | ||
"webpack": "3.10.0" | ||
"browserify": "16.2.0" | ||
}, | ||
@@ -91,0 +88,0 @@ "peerDependencies": { |
@@ -13,6 +13,6 @@ "use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
var index_1 = require("axios/index"); | ||
var c8osdkjscore_1 = require("c8osdkjscore"); | ||
var Observable_1 = require("rxjs/Observable"); | ||
var c8oHttpInterface_service_1 = require("./c8oHttpInterface.service"); | ||
var index_1 = require("axios/index"); | ||
var C8o = (function (_super) { | ||
@@ -44,3 +44,3 @@ __extends(C8o, _super); | ||
this.promiseConstructor = new Promise(function (resolve) { | ||
if (window.location.href.startsWith("http") && window.location.href.indexOf("/DisplayObjects") !== -1) { | ||
if (window.location.href.startsWith("http") && window.location.href.indexOf("/DisplayObjects") != -1) { | ||
var n = window.location.href.indexOf("/DisplayObjects"); | ||
@@ -53,4 +53,3 @@ _this.endpoint = window.location.href.substring(0, n); | ||
if (window.location.href.startsWith("file://")) { | ||
uri = (window.location.href.substring(0, window.location.href.indexOf("/index.html"))) | ||
+ "/env.json"; | ||
uri = (window.location.href.substring(0, window.location.href.indexOf("/index.html"))) + "/env.json"; | ||
} | ||
@@ -63,6 +62,6 @@ else { | ||
_this.data = data; | ||
var remoteBase = data.remoteBase.toString(); | ||
var remoteBase = data["remoteBase"].toString(); | ||
var n = remoteBase.indexOf("/_private"); | ||
_this.endpoint = remoteBase.substring(0, n); | ||
_this._automaticRemoveSplashsCreen = data.splashScreenRemoveMode !== "manual"; | ||
_this._automaticRemoveSplashsCreen = data["splashScreenRemoveMode"] !== "manual"; | ||
resolve(); | ||
@@ -129,3 +128,3 @@ }).catch(function (error) { | ||
} | ||
if (window["cblite"] !== undefined) { | ||
if (window["cblite"] != undefined) { | ||
window["cblite"].getURL(function (err, url) { | ||
@@ -132,0 +131,0 @@ if (err) { |
@@ -0,16 +1,15 @@ | ||
import {C8oCore, C8oLogger, C8oSettings, C8oException, C8oExceptionMessage, C8oFullSyncCbl, C8oFullSync} from "c8osdkjscore"; | ||
import {Observable} from "rxjs/Observable"; | ||
import {C8oHttpInterface} from "./c8oHttpInterface.service"; | ||
import axios, { | ||
AxiosAdapter, | ||
AxiosRequestConfig, | ||
AxiosResponse, | ||
AxiosError, | ||
AxiosInstance, | ||
AxiosRequestConfig, | ||
AxiosResponse, | ||
AxiosAdapter, | ||
Cancel, | ||
Canceler, | ||
CancelToken, | ||
CancelTokenSource, | ||
Canceler | ||
} from "axios/index"; | ||
import {C8oCore, C8oException, C8oExceptionMessage, | ||
C8oFullSync, C8oFullSyncCbl, C8oLogger, C8oSettings} from "c8osdkjscore"; | ||
import {Observable} from "rxjs/Observable"; | ||
import {C8oHttpInterface} from "./c8oHttpInterface.service"; | ||
@@ -40,24 +39,27 @@ export class C8o extends C8oCore { | ||
// get the url from window.location | ||
if (window.location.href.startsWith("http") && window.location.href.indexOf("/DisplayObjects") !== -1) { | ||
const n = window.location.href.indexOf("/DisplayObjects"); | ||
if (window.location.href.startsWith("http") && window.location.href.indexOf("/DisplayObjects") != -1) { | ||
let n = window.location.href.indexOf("/DisplayObjects"); | ||
this.endpoint = window.location.href.substring(0, n); | ||
resolve(); | ||
} else { | ||
let uri = ""; | ||
if (window.location.href.startsWith("file://")) { | ||
uri = (window.location.href.substring(0, window.location.href.indexOf("/index.html"))) | ||
+ "/env.json"; | ||
} else { | ||
} | ||
// else if project is running on device or serve by ionic serve | ||
// get the uri from env.json | ||
else { | ||
let uri =""; | ||
if(window.location.href.startsWith("file://")){ | ||
uri = (window.location.href.substring(0, window.location.href.indexOf("/index.html"))) + "/env.json" | ||
} | ||
else{ | ||
uri = window.location.origin + "/env.json"; | ||
} | ||
this.httpPublic.get(uri) | ||
.then((data) => { | ||
.then(data => { | ||
this.data = data; | ||
//noinspection TypeScriptUnresolvedVariable | ||
const remoteBase = data.remoteBase.toString(); | ||
const n = remoteBase.indexOf("/_private"); | ||
let remoteBase = data["remoteBase"].toString(); | ||
let n = remoteBase.indexOf("/_private"); | ||
this.endpoint = remoteBase.substring(0, n); | ||
this._automaticRemoveSplashsCreen = data.splashScreenRemoveMode !== "manual"; | ||
this._automaticRemoveSplashsCreen = data["splashScreenRemoveMode"] !== "manual"; | ||
resolve(); | ||
}).catch((error) => { | ||
}).catch(error=>{ | ||
alert("Missing env.json file"); | ||
@@ -76,3 +78,4 @@ let errMsg: string; | ||
}); | ||
} else { | ||
} | ||
else { | ||
this.promiseConstructor = new Promise((resolve) => { | ||
@@ -121,4 +124,4 @@ this.endpoint = c8oSettings.endpoint; | ||
*/ | ||
public finalizeInit(): Promise<any> { | ||
this.promiseFinInit = new Promise((resolve) => { | ||
public finalizeInit(): Promise<any>{ | ||
this.promiseFinInit = new Promise((resolve)=>{ | ||
Promise.all([this.promiseInit]).then(() => { | ||
@@ -136,7 +139,8 @@ /** | ||
*/ | ||
if (window["cblite"] !== undefined) { | ||
if (window["cblite"] != undefined) { | ||
window["cblite"].getURL((err, url) => { | ||
if (err) { | ||
resolve(); | ||
} else { | ||
} | ||
else{ | ||
url = url.replace(new RegExp("/$"), ""); | ||
@@ -147,3 +151,4 @@ this.couchUrl = url; | ||
}); | ||
} else { | ||
} | ||
else { | ||
resolve(); | ||
@@ -155,2 +160,2 @@ } | ||
} | ||
} | ||
} |
@@ -0,17 +1,17 @@ | ||
import { C8o } from "./c8o.service"; | ||
import { C8oHttpInterfaceCore } from "c8osdkjscore/src/c8o/c8oHttpInterfaceCore"; | ||
import { C8oResponseListener } from "c8osdkjscore/src/c8o/c8oResponse"; | ||
import { C8oProgress } from "c8osdkjscore/src/c8o/c8oProgress"; | ||
import { C8oResponseListener } from "c8osdkjscore/src/c8o/c8oResponse"; | ||
import { C8o } from "./c8o.service"; | ||
export declare class C8oHttpInterface extends C8oHttpInterfaceCore { | ||
constructor(c8o: C8o); | ||
checkFile(parameters: any): number; | ||
transformRequest(parameters: any): string; | ||
transformRequestformdata(parameters: any): FormData; | ||
transformRequestfileNative(parameters: any): any; | ||
handleRequest(url: string, parameters: any, c8oResponseListener?: C8oResponseListener): Promise<any>; | ||
uploadFilePluginNative(url: string, parameters: any, c8oResponseListener: C8oResponseListener): Promise<any>; | ||
httpPost(url: string, parameters: any): Promise<any>; | ||
uploadFileHttp(url: string, form: FormData, parameters: any, c8oResponseListener: C8oResponseListener): Promise<any>; | ||
checkFile(parameters: Object): number; | ||
transformRequest(parameters: Object): string; | ||
transformRequestformdata(parameters: Object): FormData; | ||
transformRequestfileNative(parameters: Object): any; | ||
private isCordova(); | ||
handleRequest(url: string, parameters: Object, c8oResponseListener?: C8oResponseListener): Promise<any>; | ||
uploadFilePluginNative(url: string, parameters: Object, c8oResponseListener: C8oResponseListener): Promise<any>; | ||
httpPost(url: string, parameters: Object): Promise<any>; | ||
uploadFileHttp(url: string, form: FormData, parameters: Object, c8oResponseListener: C8oResponseListener): Promise<any>; | ||
handleProgress(event: any, progress: C8oProgress, parameters: any, c8oResponseListener: C8oResponseListener, varNull: JSON): void; | ||
private isCordova(); | ||
} |
@@ -48,7 +48,7 @@ "use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
var c8o_service_1 = require("./c8o.service"); | ||
var c8oHttpInterfaceCore_1 = require("c8osdkjscore/src/c8o/c8oHttpInterfaceCore"); | ||
var c8oProgress_1 = require("c8osdkjscore/src/c8o/c8oProgress"); | ||
var c8oHttpRequestException_1 = require("c8osdkjscore/src/c8o/Exception/c8oHttpRequestException"); | ||
var c8oExceptionMessage_1 = require("c8osdkjscore/src/c8o/Exception/c8oExceptionMessage"); | ||
var c8oHttpRequestException_1 = require("c8osdkjscore/src/c8o/Exception/c8oHttpRequestException"); | ||
var c8o_service_1 = require("./c8o.service"); | ||
var C8oHttpInterface = (function (_super) { | ||
@@ -89,17 +89,13 @@ __extends(C8oHttpInterface, _super); | ||
for (var p in parameters) { | ||
if (parameters.hasOwnProperty(p)) { | ||
if (parameters[p] instanceof Array) { | ||
for (var p1 in parameters[p]) { | ||
if (parameters[p] instanceof Array) { | ||
str.push(encodeURIComponent(p) + "=" + encodeURIComponent(parameters[p][p1])); | ||
} | ||
} | ||
if (parameters[p] instanceof Array) { | ||
for (var p1 in parameters[p]) { | ||
str.push(encodeURIComponent(p) + "=" + encodeURIComponent(parameters[p][p1])); | ||
} | ||
else { | ||
str.push(encodeURIComponent(p) + "=" + encodeURIComponent(parameters[p])); | ||
} | ||
var query = str.join("&"); | ||
return (query + "&__removeNamespaces=true"); | ||
} | ||
else { | ||
str.push(encodeURIComponent(p) + "=" + encodeURIComponent(parameters[p])); | ||
} | ||
} | ||
var query = str.join("&"); | ||
return (query + "&__removeNamespaces=true"); | ||
}; | ||
@@ -112,4 +108,3 @@ C8oHttpInterface.prototype.transformRequestformdata = function (parameters) { | ||
if (parameters[p][p1] instanceof FileList) { | ||
for (var _i = 0, _a = parameters[p][p1]; _i < _a.length; _i++) { | ||
var i = _a[_i]; | ||
for (var i = 0; i < parameters[p][p1].length; i++) { | ||
formdata.append(p, parameters[p][p1][i], parameters[p][p1][i].name); | ||
@@ -125,4 +120,3 @@ } | ||
if (parameters[p] instanceof FileList) { | ||
for (var _b = 0, _c = parameters[p]; _b < _c.length; _b++) { | ||
var j = _c[_b]; | ||
for (var j = 0; j < parameters[p].length; j++) { | ||
formdata.append(p, parameters[p][j], parameters[p][j].name); | ||
@@ -148,3 +142,3 @@ } | ||
else { | ||
params[p1] = parameters[p][p1].href; | ||
params[p1] = parameters[p][p1]["href"]; | ||
} | ||
@@ -155,3 +149,3 @@ } | ||
if (parameters[p] instanceof URL) { | ||
file.push([p, parameters[p].href]); | ||
file.push([p, parameters[p]["href"]]); | ||
} | ||
@@ -165,2 +159,13 @@ else { | ||
}; | ||
C8oHttpInterface.prototype.isCordova = function () { | ||
if (this._isCordova == null) { | ||
if (window["cordova"] != undefined) { | ||
this._isCordova = true; | ||
} | ||
else { | ||
this._isCordova = false; | ||
} | ||
} | ||
return this._isCordova; | ||
}; | ||
C8oHttpInterface.prototype.handleRequest = function (url, parameters, c8oResponseListener) { | ||
@@ -170,5 +175,5 @@ return __awaiter(this, void 0, void 0, function () { | ||
return __generator(this, function (_a) { | ||
if (parameters.__sequence !== undefined) { | ||
if (parameters.__sequence.indexOf("#") !== -1) { | ||
parameters.__sequence = parameters.__sequence.substring(0, parameters.__sequence.indexOf("#")); | ||
if (parameters["__sequence"] !== undefined) { | ||
if (parameters["__sequence"].indexOf("#") !== -1) { | ||
parameters["__sequence"] = parameters["__sequence"].substring(0, parameters["__sequence"].indexOf("#")); | ||
} | ||
@@ -201,7 +206,7 @@ } | ||
options.fileKey = files[0][0]; | ||
options.fileName = files[0][1].substr(files[0][1].lastIndexOf("/") + 1); | ||
options.fileName = files[0][1].substr(files[0][1].lastIndexOf('/') + 1); | ||
options.params = data[1]; | ||
var headersobject = { "Accept": "application/json", "x-convertigo-sdk": this.c8o.sdkVersion }; | ||
Object.assign(headersobject, this.c8o.headers); | ||
options.headers = headersobject; | ||
var headersObject = { 'Accept': 'application/json', 'x-convertigo-sdk': this.c8o.sdkVersion }; | ||
Object.assign(headersObject, this.c8o.headers); | ||
options.headers = headersObject; | ||
return new Promise(function (resolve, reject) { | ||
@@ -226,5 +231,5 @@ Promise.all([_this.p1]).then(function () { | ||
parameters = this.transformRequest(parameters); | ||
var headersobject = { "Content-Type": "application/x-www-form-urlencoded", | ||
"x-convertigo-sdk": this.c8o.sdkVersion }; | ||
Object.assign(headersobject, this.c8o.headers); | ||
var headersObject = { "Content-Type": "application/x-www-form-urlencoded", "x-convertigo-sdk": this.c8o.sdkVersion }; | ||
Object.assign(headersObject, this.c8o.headers); | ||
var headers = { headers: (headersObject) }; | ||
if (this.firstCall) { | ||
@@ -234,8 +239,8 @@ this.p1 = new Promise(function (resolve, reject) { | ||
_this.c8o.httpPublic.post(url, parameters, { | ||
headers: headersobject, | ||
withCredentials: true, | ||
headers: headers, | ||
withCredentials: true | ||
}).then(function (response) { | ||
return resolve(response.data); | ||
}).catch(function (error) { | ||
resolve({ error: (new c8oHttpRequestException_1.C8oHttpRequestException(c8oExceptionMessage_1.C8oExceptionMessage.runHttpRequest(), error)), | ||
resolve({ "error": (new c8oHttpRequestException_1.C8oHttpRequestException(c8oExceptionMessage_1.C8oExceptionMessage.runHttpRequest(), error)) | ||
}); | ||
@@ -250,8 +255,8 @@ }); | ||
_this.c8o.httpPublic.post(url, parameters, { | ||
headers: headersobject, | ||
withCredentials: true, | ||
headers: headers, | ||
withCredentials: true | ||
}).then(function (response) { | ||
return resolve(response.data); | ||
}).catch(function (error) { | ||
resolve({ error: (new c8oHttpRequestException_1.C8oHttpRequestException(c8oExceptionMessage_1.C8oExceptionMessage.runHttpRequest(), error)), | ||
resolve({ "error": (new c8oHttpRequestException_1.C8oHttpRequestException(c8oExceptionMessage_1.C8oExceptionMessage.runHttpRequest(), error)) | ||
}); | ||
@@ -267,5 +272,5 @@ }); | ||
var _this = this; | ||
var headersobject = { "Accept": "application/json", "x-convertigo-sdk": this.c8o.sdkVersion }; | ||
Object.assign(headersobject, this.c8o.headers); | ||
var headers = { headers: headersobject }; | ||
var headersObject = { 'Accept': 'application/json', 'x-convertigo-sdk': this.c8o.sdkVersion }; | ||
Object.assign(headersObject, this.c8o.headers); | ||
var headers = { headers: headersObject }; | ||
var progress = new c8oProgress_1.C8oProgress(); | ||
@@ -277,11 +282,11 @@ progress.pull = false; | ||
_this.firstCall = false; | ||
_this.c8o.httpPublic.post({ data: form, headers: headers, url: url, withCredentials: true, onUploadProgress: function (event) { | ||
_this.c8o.httpPublic.post({ url: url, data: form, withCredentials: true, headers: headers, onUploadProgress: function (event) { | ||
this.handleProgress(event, progress, parameters, c8oResponseListener, varNull); | ||
} }, { | ||
headers: headers, | ||
withCredentials: true, | ||
withCredentials: true | ||
}).then(function (response) { | ||
return resolve(response.data); | ||
}).catch(function (error) { | ||
resolve({ error: (new c8oHttpRequestException_1.C8oHttpRequestException(c8oExceptionMessage_1.C8oExceptionMessage.runHttpRequest(), error)), | ||
resolve({ "error": (new c8oHttpRequestException_1.C8oHttpRequestException(c8oExceptionMessage_1.C8oExceptionMessage.runHttpRequest(), error)) | ||
}); | ||
@@ -295,11 +300,11 @@ }); | ||
Promise.all([_this.p1]).then(function () { | ||
_this.c8o.httpPublic.post({ data: form, headers: headers, url: url, withCredentials: true, onUploadProgress: function (event) { | ||
_this.c8o.httpPublic.post({ url: url, data: form, withCredentials: true, headers: headers, onUploadProgress: function (event) { | ||
this.handleProgress(event, progress, parameters, c8oResponseListener, varNull); | ||
} }, { | ||
headers: headers, | ||
withCredentials: true, | ||
withCredentials: true | ||
}).then(function (response) { | ||
return resolve(response.data); | ||
}).catch(function (error) { | ||
resolve({ error: (new c8oHttpRequestException_1.C8oHttpRequestException(c8oExceptionMessage_1.C8oExceptionMessage.runHttpRequest(), error)), | ||
resolve({ "error": (new c8oHttpRequestException_1.C8oHttpRequestException(c8oExceptionMessage_1.C8oExceptionMessage.runHttpRequest(), error)) | ||
}); | ||
@@ -314,3 +319,3 @@ }); | ||
progress.total = event.total; | ||
if (event.loaded !== event.total) { | ||
if (event.loaded != event.total) { | ||
progress.finished = false; | ||
@@ -324,13 +329,2 @@ } | ||
}; | ||
C8oHttpInterface.prototype.isCordova = function () { | ||
if (this._isCordova == null) { | ||
if (window["cordova"] !== undefined || window["cordova"] !== null) { | ||
this._isCordova = true; | ||
} | ||
else { | ||
this._isCordova = false; | ||
} | ||
} | ||
return this._isCordova; | ||
}; | ||
return C8oHttpInterface; | ||
@@ -337,0 +331,0 @@ }(c8oHttpInterfaceCore_1.C8oHttpInterfaceCore)); |
@@ -0,9 +1,10 @@ | ||
import {C8o} from "./c8o.service"; | ||
import {C8oHttpInterfaceCore} from "c8osdkjscore/src/c8o/c8oHttpInterfaceCore"; | ||
import {C8oResponseJsonListener, C8oResponseListener} from "c8osdkjscore/src/c8o/c8oResponse"; | ||
import {C8oProgress} from "c8osdkjscore/src/c8o/c8oProgress"; | ||
import {C8oResponseJsonListener, C8oResponseListener} from "c8osdkjscore/src/c8o/c8oResponse"; | ||
import {C8oHttpRequestException} from "c8osdkjscore/src/c8o/Exception/c8oHttpRequestException"; | ||
import {C8oExceptionMessage} from "c8osdkjscore/src/c8o/Exception/c8oExceptionMessage"; | ||
import {C8oHttpRequestException} from "c8osdkjscore/src/c8o/Exception/c8oHttpRequestException"; | ||
import {C8o} from "./c8o.service"; | ||
export class C8oHttpInterface extends C8oHttpInterfaceCore { | ||
export class C8oHttpInterface extends C8oHttpInterfaceCore{ | ||
constructor(c8o: C8o) { | ||
@@ -18,14 +19,15 @@ super(c8o); | ||
* 2 : url when running in cordova | ||
* @param {object} parameters | ||
* @param {Object} parameters | ||
* @return {number} | ||
*/ | ||
public checkFile(parameters: any): number { | ||
for (const p in parameters) { | ||
checkFile(parameters: Object): number{ | ||
for (let p in parameters) { | ||
if (parameters[p] instanceof Array) { | ||
for (const p1 in parameters[p]) { | ||
for (let p1 in parameters[p]) { | ||
//noinspection JSUnfilteredForInLoop | ||
if (parameters[p][p1] instanceof FileList) { | ||
if(parameters[p][p1] instanceof FileList){ | ||
return 1; | ||
} else if (this.isCordova()) { | ||
if (parameters[p][p1] instanceof URL) { | ||
} | ||
else if(this.isCordova()){ | ||
if(parameters[p][p1] instanceof URL){ | ||
return 2; | ||
@@ -35,7 +37,9 @@ } | ||
} | ||
} else { | ||
if (parameters[p] instanceof FileList) { | ||
} | ||
else { | ||
if(parameters[p] instanceof FileList){ | ||
return 1; | ||
} else if (this.isCordova()) { | ||
if (parameters[p] instanceof URL) { | ||
} | ||
else if(this.isCordova()){ | ||
if(parameters[p]instanceof URL){ | ||
return 2; | ||
@@ -51,26 +55,22 @@ } | ||
* Url encode parameters | ||
* @param {object} parameters | ||
* @param {Object} parameters | ||
* @return {string} | ||
*/ | ||
public transformRequest(parameters: any): string { | ||
const str = []; | ||
for (const p in parameters) { | ||
if (parameters.hasOwnProperty(p)) { | ||
if (parameters[p] instanceof Array) { | ||
for (const p1 in parameters[p]) { | ||
if (parameters[p] instanceof Array) { | ||
//noinspection JSUnfilteredForInLoop | ||
str.push(encodeURIComponent(p) + "=" + encodeURIComponent(parameters[p][p1])); | ||
}} | ||
} else { | ||
str.push(encodeURIComponent(p) + "=" + encodeURIComponent(parameters[p])); | ||
transformRequest(parameters: Object): string { | ||
let str = []; | ||
for (let p in parameters) { | ||
if (parameters[p] instanceof Array) { | ||
for (let p1 in parameters[p]) { | ||
//noinspection JSUnfilteredForInLoop | ||
str.push(encodeURIComponent(p) + "=" + encodeURIComponent(parameters[p][p1])); | ||
} | ||
const query = str.join("&"); | ||
// Add this to instruct Convertigo server to remove any name space in the jSON keys | ||
// to prevent keys like this: 'namespace:key' | ||
return (query + "&__removeNamespaces=true"); | ||
} | ||
else { | ||
str.push(encodeURIComponent(p) + "=" + encodeURIComponent(parameters[p])); | ||
} | ||
} | ||
let query = str.join("&"); | ||
// Add this to instruct Convertigo server to remove any name space in the jSON keys | ||
// to prevent keys like this: 'namespace:key' | ||
return (query + "&__removeNamespaces=true"); | ||
} | ||
@@ -80,24 +80,27 @@ | ||
* Transform FormData parameters | ||
* @param {object} parameters | ||
* @param {Object} parameters | ||
* @return {FormData} | ||
*/ | ||
public transformRequestformdata(parameters: any): FormData { | ||
const formdata: FormData = new FormData(); | ||
for (const p in parameters) { | ||
transformRequestformdata(parameters: Object): FormData { | ||
let formdata : FormData= new FormData(); | ||
for (let p in parameters) { | ||
if (parameters[p] instanceof Array) { | ||
for (const p1 in parameters[p]) { | ||
if (parameters[p][p1] instanceof FileList) { | ||
for (const i of parameters[p][p1]) { | ||
for (let p1 in parameters[p]) { | ||
if(parameters[p][p1] instanceof FileList){ | ||
for (var i = 0; i < parameters[p][p1].length; i++) { | ||
formdata.append(p, parameters[p][p1][i], parameters[p][p1][i].name); | ||
} | ||
} else { | ||
formdata.append(p, parameters[p][p1]); | ||
} | ||
else{ | ||
formdata.append(p, parameters[p][p1]) | ||
} | ||
} | ||
} else { | ||
if (parameters[p] instanceof FileList) { | ||
for (const j of parameters[p]) { | ||
} | ||
else { | ||
if(parameters[p] instanceof FileList) { | ||
for (var j = 0; j < parameters[p].length; j++) { | ||
formdata.append(p, parameters[p][j], parameters[p][j].name); | ||
} | ||
} else { | ||
} | ||
else{ | ||
formdata.append(p, parameters[p]); | ||
@@ -110,23 +113,28 @@ } | ||
/** | ||
* Extract file from parameters and return and array containing a file and params | ||
* @param {object} parameters | ||
* @param {Object} parameters | ||
* @return {any} | ||
*/ | ||
public transformRequestfileNative(parameters: any): any { | ||
const file: any[] = new Array(); | ||
const params: any = new Object(); | ||
for (const p in parameters) { | ||
transformRequestfileNative(parameters: Object): any{ | ||
let file: Array<any> = new Array(); | ||
let params: Object = new Object(); | ||
for (let p in parameters) { | ||
if (parameters[p] instanceof Array) { | ||
for (const p1 in parameters[p]) { | ||
if (parameters[p][p1] instanceof URL) { | ||
for (let p1 in parameters[p]) { | ||
if(parameters[p][p1] instanceof URL){ | ||
file.push([p1, parameters[p][p1]]); | ||
} else { | ||
params[p1] = parameters[p][p1].href; | ||
} | ||
else{ | ||
params[p1] = parameters[p][p1]["href"]; | ||
} | ||
} | ||
} else { | ||
if (parameters[p] instanceof URL) { | ||
file.push([p, parameters[p].href]); | ||
} else { | ||
} | ||
else { | ||
if(parameters[p] instanceof URL) { | ||
file.push([p, parameters[p]["href"]]); | ||
} | ||
else{ | ||
params[p] = parameters[p]; | ||
@@ -140,16 +148,33 @@ } | ||
/** | ||
* Check if we are in cordova environment | ||
* @return {boolean} | ||
*/ | ||
private isCordova():boolean{ | ||
if(this._isCordova == null){ | ||
if(window["cordova"]!= undefined){ | ||
this._isCordova = true; | ||
} | ||
else{ | ||
this._isCordova = false; | ||
} | ||
} | ||
return this._isCordova; | ||
} | ||
/** | ||
* Handle the request | ||
* @param {string} url | ||
* @param {object} parameters | ||
* @param {Object} parameters | ||
* @param {C8oResponseListener} c8oResponseListener | ||
* @return {Promise<any>} | ||
*/ | ||
public async handleRequest(url: string, parameters: any, | ||
c8oResponseListener?: C8oResponseListener): Promise<any> { | ||
if (parameters.__sequence !== undefined) { | ||
if (parameters.__sequence.indexOf("#") !== -1) { | ||
parameters.__sequence = parameters.__sequence.substring(0, parameters.__sequence.indexOf("#")); | ||
async handleRequest(url: string, parameters: Object, c8oResponseListener?: C8oResponseListener): Promise<any> { | ||
if (parameters["__sequence"] !== undefined) { | ||
if (parameters["__sequence"].indexOf("#") !== -1) { | ||
parameters["__sequence"] = parameters["__sequence"].substring(0, parameters["__sequence"].indexOf("#")); | ||
} | ||
} | ||
switch (this.checkFile(parameters)) { | ||
switch (this.checkFile(parameters)){ | ||
case 0: { | ||
@@ -159,4 +184,4 @@ return this.httpPost(url, parameters); | ||
case 1: { | ||
const form = this.transformRequestformdata(parameters); | ||
return this.uploadFileHttp(url, form, parameters, c8oResponseListener); | ||
let form = this.transformRequestformdata(parameters); | ||
return this.uploadFileHttp(url,form,parameters,c8oResponseListener); | ||
} | ||
@@ -170,26 +195,26 @@ case 2: { | ||
/** | ||
* Upload file with native plugin | ||
* @param {string} url | ||
* @param {object} parameters | ||
* @param {Object} parameters | ||
* @param {C8oResponseListener} c8oResponseListener | ||
* @return {Promise<any>} | ||
*/ | ||
public uploadFilePluginNative(url: string, parameters: any, | ||
c8oResponseListener: C8oResponseListener): Promise<any> { | ||
const progress: C8oProgress = new C8oProgress(); | ||
uploadFilePluginNative(url: string, parameters: Object, c8oResponseListener: C8oResponseListener):Promise<any>{ | ||
let progress: C8oProgress = new C8oProgress(); | ||
progress.pull = false; | ||
const varNull: JSON = null; | ||
const data = this.transformRequestfileNative(parameters); | ||
const files = data[0]; | ||
const options = new window["FileUploadOptions"](); | ||
let varNull: JSON = null; | ||
let data = this.transformRequestfileNative(parameters); | ||
let files = data[0]; | ||
let options = new window["FileUploadOptions"](); | ||
options.fileKey = files[0][0]; | ||
options.fileName = files[0][1].substr(files[0][1].lastIndexOf("/") + 1); | ||
options.fileName = files[0][1].substr(files[0][1].lastIndexOf('/') + 1); | ||
options.params = data[1]; | ||
const headersobject = {"Accept": "application/json", "x-convertigo-sdk": this.c8o.sdkVersion}; | ||
Object.assign(headersobject, this.c8o.headers); | ||
options.headers = headersobject; | ||
return new Promise((resolve, reject) => { | ||
let headersObject = {'Accept':'application/json', 'x-convertigo-sdk': this.c8o.sdkVersion}; | ||
Object.assign(headersObject, this.c8o.headers); | ||
options.headers = headersObject; | ||
return new Promise((resolve,reject)=>{ | ||
Promise.all([this.p1]).then(() => { | ||
const ft = new window["FileTransfer"](); | ||
var ft = new window["FileTransfer"](); | ||
ft.onprogress = (progressEvent) => { | ||
@@ -200,3 +225,3 @@ if (progressEvent.lengthComputable) { | ||
}; | ||
ft.upload(files[0][1], encodeURI(url), (((resp) => { | ||
ft.upload(files[0][1], encodeURI(url), ((resp => { | ||
resolve(resp); | ||
@@ -213,11 +238,10 @@ })), ((err) => { | ||
* @param {string} url | ||
* @param {object} parameters | ||
* @param {Object} parameters | ||
* @return {Promise<any>} | ||
*/ | ||
public httpPost(url: string, parameters: any): Promise<any> { | ||
httpPost(url: string, parameters: Object): Promise<any>{ | ||
parameters = this.transformRequest(parameters); | ||
const headersobject = {"Content-Type": "application/x-www-form-urlencoded", | ||
"x-convertigo-sdk": this.c8o.sdkVersion}; | ||
Object.assign(headersobject, this.c8o.headers); | ||
// const headers = {headers: (headersobject)}; | ||
let headersObject = {"Content-Type": "application/x-www-form-urlencoded", "x-convertigo-sdk": this.c8o.sdkVersion}; | ||
Object.assign(headersObject, this.c8o.headers); | ||
let headers = {headers: (headersObject)}; | ||
if (this.firstCall) { | ||
@@ -227,8 +251,8 @@ this.p1 = new Promise((resolve, reject) => { | ||
this.c8o.httpPublic.post(url, parameters, { | ||
headers: headersobject, | ||
withCredentials: true, | ||
}).then((response) => | ||
resolve(response.data), | ||
).catch((error) => { | ||
resolve({error : (new C8oHttpRequestException(C8oExceptionMessage.runHttpRequest(), error)), | ||
headers: headers, | ||
withCredentials: true | ||
}).then(response => | ||
resolve(response.data) | ||
).catch(error => { | ||
resolve({"error" : (new C8oHttpRequestException(C8oExceptionMessage.runHttpRequest(), error)) | ||
}); | ||
@@ -238,12 +262,13 @@ }); | ||
return this.p1; | ||
} else { | ||
} | ||
else { | ||
return new Promise((resolve, reject) => { | ||
Promise.all([this.p1]).then(() => { | ||
this.c8o.httpPublic.post(url, parameters, { | ||
headers: headersobject, | ||
withCredentials: true, | ||
}).then((response) => | ||
resolve(response.data), | ||
).catch((error) => { | ||
resolve({error : (new C8oHttpRequestException(C8oExceptionMessage.runHttpRequest(), error)), | ||
headers: headers, | ||
withCredentials: true | ||
}).then(response => | ||
resolve(response.data) | ||
).catch(error => { | ||
resolve({"error" : (new C8oHttpRequestException(C8oExceptionMessage.runHttpRequest(), error)) | ||
}); | ||
@@ -263,15 +288,15 @@ }); | ||
* @param {FormData} form | ||
* @param {object} parameters | ||
* @param {Object} parameters | ||
* @param {C8oResponseListener} c8oResponseListener | ||
* @return {Promise<any>} | ||
*/ | ||
public uploadFileHttp(url: string, form: FormData, | ||
parameters: any, c8oResponseListener: C8oResponseListener): Promise<any> { | ||
const headersobject = {"Accept": "application/json", "x-convertigo-sdk": this.c8o.sdkVersion}; | ||
Object.assign(headersobject, this.c8o.headers); | ||
const headers = {headers: headersobject}; | ||
const progress: C8oProgress = new C8oProgress(); | ||
uploadFileHttp(url: string, form: FormData, parameters: Object, c8oResponseListener: C8oResponseListener): Promise<any>{ | ||
let headersObject = {'Accept':'application/json', 'x-convertigo-sdk': this.c8o.sdkVersion}; | ||
Object.assign(headersObject, this.c8o.headers); | ||
let headers = {headers: headersObject}; | ||
let progress: C8oProgress = new C8oProgress(); | ||
progress.pull = false; | ||
const varNull: JSON = null; | ||
let varNull: JSON = null; | ||
if (this.firstCall) { | ||
@@ -281,11 +306,11 @@ this.p1 = new Promise((resolve) => { | ||
this.c8o.httpPublic.post({data: form, headers, url, withCredentials: true, onUploadProgress(event) { | ||
this.c8o.httpPublic.post({url: url, data: form, withCredentials: true, headers: headers, onUploadProgress: function (event) { | ||
this.handleProgress(event, progress, parameters, c8oResponseListener, varNull); | ||
}}, { | ||
headers, | ||
withCredentials: true, | ||
}).then((response) => | ||
resolve(response.data), | ||
).catch((error) => { | ||
resolve({error : (new C8oHttpRequestException(C8oExceptionMessage.runHttpRequest(), error)), | ||
headers: headers, | ||
withCredentials: true | ||
}).then(response => | ||
resolve(response.data) | ||
).catch(error => { | ||
resolve({"error" : (new C8oHttpRequestException(C8oExceptionMessage.runHttpRequest(), error)) | ||
}); | ||
@@ -295,14 +320,15 @@ }); | ||
return this.p1; | ||
} else { | ||
} | ||
else { | ||
return new Promise((resolve, reject) => { | ||
Promise.all([this.p1]).then(() => { | ||
this.c8o.httpPublic.post({data: form, headers, url, withCredentials: true, onUploadProgress(event) { | ||
this.c8o.httpPublic.post({url: url, data: form, withCredentials: true, headers: headers, onUploadProgress: function (event) { | ||
this.handleProgress(event, progress, parameters, c8oResponseListener, varNull); | ||
}}, { | ||
headers, | ||
withCredentials: true, | ||
}).then((response) => | ||
resolve(response.data), | ||
).catch((error) => { | ||
resolve({error : (new C8oHttpRequestException(C8oExceptionMessage.runHttpRequest(), error)), | ||
headers: headers, | ||
withCredentials: true | ||
}).then(response => | ||
resolve(response.data) | ||
).catch(error => { | ||
resolve({"error" : (new C8oHttpRequestException(C8oExceptionMessage.runHttpRequest(), error)) | ||
}); | ||
@@ -315,2 +341,3 @@ }); | ||
/** | ||
@@ -324,9 +351,9 @@ * Handle progress | ||
*/ | ||
public handleProgress(event: any, progress: C8oProgress, | ||
parameters: any, c8oResponseListener: C8oResponseListener, varNull: JSON): void { | ||
handleProgress(event: any, progress: C8oProgress, parameters: any, c8oResponseListener: C8oResponseListener, varNull: JSON): void{ | ||
progress.current = event.loaded; | ||
progress.total = event.total; | ||
if (event.loaded !== event.total) { | ||
if(event.loaded != event.total){ | ||
progress.finished = false; | ||
} else { | ||
} | ||
else{ | ||
progress.finished = true; | ||
@@ -338,17 +365,2 @@ } | ||
} | ||
/** | ||
* Check if we are in cordova environment | ||
* @return {boolean} | ||
*/ | ||
private isCordova(): boolean { | ||
if (this._isCordova == null) { | ||
if (window["cordova"] !== undefined || window["cordova"] !== null) { | ||
this._isCordova = true; | ||
} else { | ||
this._isCordova = false; | ||
} | ||
} | ||
return this._isCordova; | ||
} | ||
} | ||
} |
import {C8oUtilsCore} from "c8osdkjscore"; | ||
export class C8oUtils extends C8oUtilsCore { | ||
export class C8oUtils extends C8oUtilsCore{ | ||
@@ -9,2 +9,2 @@ public constructor() { | ||
} | ||
} |
@@ -0,3 +1,45 @@ | ||
import {C8oSettings} from "c8osdkjscore/src/c8o/c8oSettings"; | ||
export * from "./c8o/c8o.service"; | ||
export * from "./c8o/c8oUtils.service"; | ||
export * from "c8osdkjscore"; | ||
//export * from "../node_modules/c8osdkjscore/src/c8o/c8oSettings"; | ||
/*export * from "./c8o/c8oBase"; | ||
export * from "./c8o/c8oCallTask"; | ||
export * from "./c8o/fullsyncpolicy"; | ||
export * from "./c8o/c8oFullSyncChangeListener"; | ||
export * from "./c8o/c8oFullSyncCbl"; | ||
export * from "./c8o/fullsyncpostdocumentparameter"; | ||
export * from "./c8o/c8oFullSync"; | ||
export * from "./c8o/c8oFullSyncTranslator"; | ||
export * from "./c8o/c8oHttpInterface"; | ||
export * from "./c8o/c8oLocalCache"; | ||
export * from "./c8o/c8oLocalCacheResponse"; | ||
export * from "./c8o/c8oLogger"; | ||
export * from "./c8o/c8oLogLevel"; | ||
export * from "./c8o/c8oProgress"; | ||
export * from "./c8o/c8oPromise"; | ||
export * from "./c8o/c8oResponse"; | ||
export * from "./c8o/c8oSettings"; | ||
export * from "./c8o/c8oTranslator"; | ||
export * from "./c8o/c8oUtilsCore"; | ||
export * from "./c8o/fullSyncAttachmentParameter"; | ||
export * from "./c8o/fullSyncDatabase"; | ||
export * from "./c8o/fullSyncDeleteDocumentParameter"; | ||
export * from "./c8o/fullSyncGetDocumentParameter"; | ||
export * from "./c8o/fullSyncGetViewParameter"; | ||
export * from "./c8o/fullSyncreplication"; | ||
export * from "./c8o/fullSyncRequestable"; | ||
export * from "./c8o/fullSyncResponse"; | ||
export * from "./c8o/priority.service"; | ||
export * from "./c8o/Exception/c8oCouchBaseLiteException"; | ||
export * from "./c8o/Exception/c8oException"; | ||
export * from "./c8o/Exception/c8oExceptionListener"; | ||
export * from "./c8o/Exception/c8oExceptionMessage"; | ||
export * from "./c8o/Exception/c8oHttpRequestException"; | ||
export * from "./c8o/Exception/c8oRessourceNotFoundException"; | ||
export * from "./c8o/Exception/c8oUnavailableLocalCacheException";*/ | ||
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
77679
1.46%12
-7.69%28
-9.68%1064
3.7%