diff options
| author | bptato <nincsnevem662@gmail.com> | 2025-03-28 17:33:30 +0100 |
|---|---|---|
| committer | bptato <nincsnevem662@gmail.com> | 2025-03-28 17:33:30 +0100 |
| commit | 470e32e3b056d2226967aed0fa8cdb24cebd9401 (patch) | |
| tree | d32b4120da31ccea7501b9950a48db0141a7ed50 /src/html | |
| parent | e42565a5a9243d09beec9b89491e50d7032b294c (diff) | |
| download | chawan-470e32e3b056d2226967aed0fa8cdb24cebd9401.tar.gz | |
loader: respect credentials mode
Diffstat (limited to 'src/html')
| -rw-r--r-- | src/html/script.nim | 4 | ||||
| -rw-r--r-- | src/html/xmlhttprequest.nim | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/html/script.nim b/src/html/script.nim index 568c072f..07bbcaa7 100644 --- a/src/html/script.nim +++ b/src/html/script.nim @@ -90,6 +90,7 @@ type # Forward declaration hack # set in html/dom var errorImpl*: proc(ctx: JSContext; ss: varargs[string]) {.nimcall.} +var getEnvSettingsImpl*: proc(ctx: JSContext): EnvironmentSettings {.nimcall.} proc find*(moduleMap: ModuleMap; url: URL; moduleType: string): int = let surl = $url @@ -194,3 +195,6 @@ proc identity(ctx: JSContext; this_val: JSValueConst; argc: cint; #TODO move to javascript.nim? proc identityFunction*(ctx: JSContext; val: JSValueConst): JSValue = return JS_NewCFunctionData(ctx, identity, 0, 0, 1, val.toJSValueArray()) + +proc getEnvSettings*(ctx: JSContext): EnvironmentSettings = + return ctx.getEnvSettingsImpl() diff --git a/src/html/xmlhttprequest.nim b/src/html/xmlhttprequest.nim index e48b858c..0d0c49f6 100644 --- a/src/html/xmlhttprequest.nim +++ b/src/html/xmlhttprequest.nim @@ -288,7 +288,9 @@ proc send(ctx: JSContext; this: XMLHttpRequest; body: JSValueConst = JS_NULL): var body = body if this.requestMethod in {hmGet, hmHead}: body = JS_NULL - let request = newRequest(this.requestURL, this.requestMethod, this.headers) + let credentialsMode = if this.withCredentials: cmInclude else: cmSameOrigin + let request = newRequest(this.requestURL, this.requestMethod, this.headers, + credentialsMode = credentialsMode) if not JS_IsNull(body): var document: Document = nil if ctx.fromJS(body, document).isSome: @@ -304,8 +306,7 @@ proc send(ctx: JSContext; this: XMLHttpRequest; body: JSValueConst = JS_NULL): let jsRequest = JSRequest( #TODO unsafe request flag, client, use-url-credentials, initiator type request: request, - mode: rmCors, - credentialsMode: if this.withCredentials: cmInclude else: cmSameOrigin, + mode: rmCors ) if JS_IsNull(body): this.flags.incl(xhrfUploadComplete) |