Commit0d97271

authored

Avoid using undefined token header (#466)

1 parentd696922 commit0d97271Copy full SHA for 0d97271

File tree

+17

-13

lines changed

+17

-13

lines changed

Lines changed: 9 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@ import { getProxyForUrl } from "./proxy"`
`13`	`13`	`import{Storage}from"./storage"`
`14`	`14`	`import{expandPath}from"./util"`
`15`	`15`
	`16`	`+exportconstcoderSessionTokenHeader="Coder-Session-Token"`
	`17`	`+`
`16`	`18`	`/**`
`17`	`19`	`* Return whether the API will need a token for authorization.`
`18`	`20`	`* If mTLS is in use (as specified by the cert or key files being set) then`
`@@ -242,14 +244,15 @@ export async function waitForBuild(`
`242`	`244`	`constbaseUrl=newURL(baseUrlRaw)`
`243`	`245`	`constproto=baseUrl.protocol==="https:" ?"wss:" :"ws:"`
`244`	`246`	constsocketUrlRaw=`${proto}//${baseUrl.host}${path}`
	`247`	`+consttoken=restClient.getAxiosInstance().defaults.headers.common[coderSessionTokenHeader]asstring\|undefined`
`245`	`248`	`constsocket=newws.WebSocket(newURL(socketUrlRaw),{`
`246`		`-headers:{`
`247`		`-"Coder-Session-Token":restClient.getAxiosInstance().defaults.headers.common["Coder-Session-Token"]as`
`248`		`-\|string`
`249`		`-\|undefined,`
`250`		`-},`
`251`		`-followRedirects:true,`
`252`	`249`	`agent:agent,`
	`250`	`+followRedirects:true,`
	`251`	`+headers:token`
	`252`	`+ ?{`
	`253`	`+[coderSessionTokenHeader]:token,`
	`254`	`+}`
	`255`	`+ :undefined,`
`253`	`256`	`})`
`254`	`257`	`socket.binaryType="nodebuffer"`
`255`	`258`	`socket.on("message",(data)=>{`

Lines changed: 8 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ import { Workspace, GetInboxNotificationResponse } from "coder/site/src/api/type`
`3`	`3`	`import{ProxyAgent}from"proxy-agent"`
`4`	`4`	`import*asvscodefrom"vscode"`
`5`	`5`	`import{WebSocket}from"ws"`
	`6`	`+import{coderSessionTokenHeader}from"./api"`
`6`	`7`	`import{errToStr}from"./api-helper"`
`7`	`8`	`import{typeStorage}from"./storage"`
`8`	`9`
`@@ -37,15 +38,15 @@ export class Inbox implements vscode.Disposable {`
`37`	`38`	`constsocketProto=baseUrl.protocol==="https:" ?"wss:" :"ws:"`
`38`	`39`	constsocketUrl=`${socketProto}//${baseUrl.host}/api/v2/notifications/inbox/watch?format=plaintext&templates=${watchTemplatesParam}&targets=${watchTargetsParam}`
`39`	`40`
`40`		`-constcoderSessionTokenHeader="Coder-Session-Token"`
	`41`	`+consttoken=restClient.getAxiosInstance().defaults.headers.common[coderSessionTokenHeader]asstring\|undefined`
`41`	`42`	`this.#socket=newWebSocket(newURL(socketUrl),{`
`42`		`-followRedirects:true,`
`43`	`43`	`agent:httpAgent,`
`44`		`-headers:{`
`45`		`-[coderSessionTokenHeader]:restClient.getAxiosInstance().defaults.headers.common[coderSessionTokenHeader]as`
`46`		`-\|string`
`47`		`-\|undefined,`
`48`		`-},`
	`44`	`+followRedirects:true,`
	`45`	`+headers:token`
	`46`	`+ ?{`
	`47`	`+[coderSessionTokenHeader]:token,`
	`48`	`+}`
	`49`	`+ :undefined,`
`49`	`50`	`})`
`50`	`51`
`51`	`52`	`this.#socket.on("open",()=>{`

Comments

(0)