Merge pull request #778 from NHSDigital/make-basic-auth-optional

jf-x-dev · web-flow · commit 7b751a23fa6b · 2025-11-21T09:30:53.000Z
Make providing a basic auth username/password or token optional
diff --git a/.env.generic b/.env.generic
@@ -1,6 +1,7 @@
 PROGRAMMES_ENABLED=FLU,HPV,MENACWY,MMR,TD_IPV
 BASE_URL=https://qa.mavistesting.com
 
+# if running tests against an environment behind basic auth (e.g. qa)
 # provide either a token or a username/password pair
 BASIC_AUTH_USERNAME=
 BASIC_AUTH_PASSWORD=
diff --git a/mavis/test/fixtures/playwright.py b/mavis/test/fixtures/playwright.py
@@ -40,5 +40,7 @@ def browser_context_args(
             **browser_context_args,
             "extra_http_headers": {"Authorization": f"Basic {basic_auth_token}"},
         }
+    if basic_auth_credentials["username"] and basic_auth_credentials["password"]:
+        return {**browser_context_args, "http_credentials": basic_auth_credentials}
 
-    return {**browser_context_args, "http_credentials": basic_auth_credentials}
+    return browser_context_args

Original file line number	Diff line number	Diff line change
`@@ -40,5 +40,7 @@ def browser_context_args(`
`40`	`40`	`**browser_context_args,`
`41`	`41`	`"extra_http_headers": {"Authorization": f"Basic {basic_auth_token}"},`
`42`	`42`	`}`
	`43`	`+ if basic_auth_credentials["username"] and basic_auth_credentials["password"]:`
	`44`	`+ return {**browser_context_args, "http_credentials": basic_auth_credentials}`
`43`	`45`
`44`		`- return {**browser_context_args, "http_credentials": basic_auth_credentials}`
	`46`	`+ return browser_context_args`