Skip to content

Commit 1751cac

Browse files
committed
Fixing a couple of issues with authentication
Signed-off-by: Dave Shanley <[email protected]>
1 parent 79e79e7 commit 1751cac

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

daemon/wiretap_utils.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func cloneRequest(request CloneRequest) *http.Request {
8080

8181
// if the auth value is set, we need to base64 encode it and add it to the header.
8282
if request.Auth != "" {
83-
encoded := base64.StdEncoding.EncodeToString([]byte(request.Auth))
83+
encoded := base64.StdEncoding.EncodeToString([]byte(ReplaceWithVariables(request.Variables, request.Auth)))
8484
// this will overwrite any existing auth header.
8585
newReq.Header.Set("Authorization", fmt.Sprintf("Basic %s", encoded))
8686
}

ui/src/components/transaction/transaction-item.ts

+7-2
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,10 @@ export class HttpTransactionItemComponent extends LitElement {
139139
reqTime = req.timestamp;
140140
}
141141

142-
const totalTime = respTime - reqTime;
142+
let totalTime = respTime - reqTime;
143+
if (totalTime < 0) {
144+
totalTime = 0;
145+
}
143146

144147
return html`
145148
<div class="${tClass}" @click="${this.setActive}">
@@ -150,7 +153,9 @@ export class HttpTransactionItemComponent extends LitElement {
150153
</header>
151154
${delay}
152155
<div class="request-time">
153-
${totalTime}ms <sl-icon name="arrow-left-right"></sl-icon>
156+
${(totalTime > 10000) ? html`${(totalTime/1000).toFixed(1)}s` :
157+
html`${totalTime>0 ? totalTime : null}${totalTime>0 ? 'ms' : null}`}
158+
<sl-icon name="arrow-left-right"></sl-icon>
154159
</div>
155160
<div class="transaction-status">
156161
${this.hideControls? '' : chainLink}

ui/src/model/extract_status.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
import {HttpResponse} from "@/model/http_transaction";
22

33
export function ExtractStatusStyleFromCode(response: HttpResponse): string {
4-
if (response.statusCode >= 200 && response.statusCode < 400) {
4+
if (response?.statusCode >= 200 && response?.statusCode < 400) {
55
return "http200"
66
}
7-
if (response.statusCode >= 400 && response.statusCode < 500) {
7+
if (response?.statusCode >= 400 && response?.statusCode < 500) {
88
return "http400"
99
}
10-
if (response.statusCode >= 500) {
10+
if (response?.statusCode >= 500) {
1111
return "http500"
1212
}
13+
return "pending"
1314
}
1415

1516
export function ExtractHTTPCodeDefinition(response: HttpResponse): string {

0 commit comments

Comments
 (0)