Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 6 additions & 7 deletions src/https.ios.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ function AFSuccess(resolve, task: NSURLSessionDataTask, data: NSDictionary<strin
let content: any;
if (data && data.class) {
// console.log('data.class().name', data.class().name)
if (data.enumerateKeysAndObjectsUsingBlock || data.class().name === 'NSArray') {
if (data.enumerateKeysAndObjectsUsingBlock || (<any>data) instanceof NSArray) {
// content = {}
// data.enumerateKeysAndObjectsUsingBlock(function(k, v) {
// console.log('v.description', v.description)
Expand All @@ -53,7 +53,7 @@ function AFSuccess(resolve, task: NSURLSessionDataTask, data: NSDictionary<strin
let serial = NSJSONSerialization.dataWithJSONObjectOptionsError(data, NSJSONWritingOptions.PrettyPrinted);
content = NSString.alloc().initWithDataEncoding(serial, NSUTF8StringEncoding).toString();
// console.log('content', content)
} else if (data.class().name === 'NSData') {
} else if ((<any>data) instanceof NSData) {
content = NSString.alloc().initWithDataEncoding(data, NSASCIIStringEncoding).toString();
// } else if (data.class().name == 'NSArray') {
// content = []
Expand Down Expand Up @@ -136,12 +136,11 @@ function AFFailure(resolve, reject, task: NSURLSessionDataTask, error: NSError)
export function request(opts: Https.HttpsRequestOptions): Promise<Https.HttpsResponse> {
return new Promise((resolve, reject) => {
try {

const manager = AFHTTPSessionManager.alloc().initWithBaseURL(NSURL.URLWithString(opts.url));

if (opts.headers && opts.headers['Content-Type'] === 'application/json') {
manager.requestSerializer = AFJSONRequestSerializer.serializer();
manager.responseSerializer = AFJSONResponseSerializer.serializerWithReadingOptions(NSJSONReadingOptions.AllowFragments);
const contentType = (<string>opts.headers['Content-Type']).substring(0, 16);
if (opts.headers && contentType === 'application/json') {
manager.requestSerializer = AFJSONRequestSerializer.serializer();
manager.responseSerializer = AFJSONResponseSerializer.serializerWithReadingOptions(NSJSONReadingOptions.AllowFragments);
} else {
manager.requestSerializer = AFHTTPRequestSerializer.serializer();
// manager.responseSerializer = AFXMLParserResponseSerializer.serializer()
Expand Down
6 changes: 6 additions & 0 deletions src/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,13 @@
"name": "Robert Laverty",
"email": "roblav96@gmail.com",
"url": "https://github.com/roblav96"
},
{
"name": "Kefah BADER ALDIN",
"email": "kefah.bader@gmail.com",
"url": "https://github.com/kefahB"
}

],
"repository": "github:gethuman/nativescript-https",
"homepage": "https://github.com/gethuman/nativescript-https",
Expand Down