Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add support for Digest authorization #4339

Merged
merged 21 commits into from
Oct 29, 2024
Merged

feat: add support for Digest authorization #4339

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
6efa54a
feat: digest auth added to new schema
anwarulislam Sep 10, 2024
96bbc7f
chore: schema update
anwarulislam Sep 10, 2024
59a65be
feat: digest auth added
anwarulislam Sep 11, 2024
0ec64e7
feat: digest auth advanced options
anwarulislam Sep 14, 2024
a9de371
chore: clean ui
anwarulislam Sep 18, 2024
835e0b5
chore: digest auth added
anwarulislam Sep 18, 2024
bfe209c
feat: digest auth method testing
anwarulislam Sep 29, 2024
5db4e37
feat: digest md5 response
anwarulislam Sep 30, 2024
e342dbb
chore: clean up
anwarulislam Sep 30, 2024
3c5ad34
chore: clean up
anwarulislam Sep 30, 2024
ec26240
feat: digest auth added to cli
anwarulislam Oct 22, 2024
f11fe93
fix: digest auth in cli
anwarulislam Oct 23, 2024
a20505f
chore: clean up and fixes
anwarulislam Oct 23, 2024
62f70c7
feat: preserve field values while switching Authorization type
jamesgeorge007 Oct 23, 2024
0c3672e
chore: resolve type errors
jamesgeorge007 Oct 23, 2024
312fe76
feat: add support for disabling request retry
jamesgeorge007 Oct 23, 2024
2b2b4de
chore: enforce usage of Digest Authorization alongside `Agent` interc…
jamesgeorge007 Oct 28, 2024
41b6136
chore: streamline error logs
jamesgeorge007 Oct 28, 2024
df61ac5
fix: account for inherited auth with the inspector warning
jamesgeorge007 Oct 28, 2024
13970a2
chore: only show the inspector in url, padding update
nivedin Oct 28, 2024
ee97231
chore: lint fix
nivedin Oct 28, 2024
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
Prev Previous commit
Next Next commit
fix: digest auth in cli
  • Loading branch information
@anwarulislam @jamesgeorge007
anwarulislam authored and jamesgeorge007 committed Oct 29, 2024
commit f11fe936efe8c5acc62cf90b153666f894f5fc87
1 change: 1 addition & 0 deletions packages/hoppscotch-cli/src/__tests__/e2e/fixtures/collections/digest-auth-coll.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"id": "cm0dm70cw000687bnxi830zz7",
"auth": {
"authType": "digest",
"authActive": true,
"username": "<<username>>",
"password": "<<password>>",
"realm": "",
Expand Down
17 changes: 7 additions & 10 deletions packages/hoppscotch-cli/src/utils/auth/digest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { md5 } from "js-md5";
import * as E from "fp-ts/Either";
import axios from "axios";

export interface DigestAuthParams {
username: string;
Expand Down Expand Up @@ -71,18 +71,15 @@ export async function fetchInitialDigestAuthInfo(
): Promise<DigestAuthInfo> {
console.log("Fetching initial digest auth info...");
try {
const service = getService(InterceptorService);
const initialResponse = await service.runRequest({
const initialResponse = await axios.request({
url,
method,
}).response;

if (E.isLeft(initialResponse))
throw new Error(`Unexpected response: ${initialResponse.left}`);
validateStatus: () => true, // Allow handling of all status codes
});

// Check if the response status is 401 (which is expected in Digest Auth flow)
if (initialResponse.right.status === 401) {
const authHeader = initialResponse.right.headers["www-authenticate"];
if (initialResponse.status === 401) {
const authHeader = initialResponse.headers["www-authenticate"];

if (authHeader) {
const authParams = parseDigestAuthHeader(authHeader);
Expand All @@ -105,7 +102,7 @@ export async function fetchInitialDigestAuthInfo(
"Failed to parse authentication parameters from WWW-Authenticate header"
);
} else {
throw new Error(`Unexpected response: ${initialResponse.right.status}`);
throw new Error(`Unexpected response: ${initialResponse.status}`);
}
} catch (error) {
console.error("Error fetching initial digest auth info:", error);
Expand Down
2 changes: 0 additions & 2 deletions packages/hoppscotch-cli/src/utils/pre-request.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,6 @@ export async function getEffectiveRESTRequest(
// Step 3: Generate the Authorization header
const authHeaderValue = await generateDigestAuthHeader(digestAuthParams);

console.log("Digest Auth Header:", authHeaderValue);

effectiveFinalHeaders.push({
active: true,
key: "Authorization",
Expand Down