matlab-proxy 0.15.1__tar.gz → 0.16.0__tar.gz

{matlab-proxy-0.15.1/matlab_proxy.egg-info → matlab-proxy-0.16.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: matlab-proxy
-Version: 0.15.1
+Version: 0.16.0
 Summary: Python® package enables you to launch MATLAB® and access it from a web browser.
 Home-page: https://github.com/mathworks/matlab-proxy/
 Author: The MathWorks, Inc.

{matlab-proxy-0.15.1 → matlab-proxy-0.16.0}/gui/src/actionCreators/index.js

@@ -35,6 +35,7 @@ import {
     selectIsAuthenticated
 } from '../selectors';
 import sha256 from 'crypto-js/sha256';
+import { MWI_AUTH_TOKEN_NAME_FOR_HTTP } from '../constants';
 
 export function setAuthStatus (authentication) {
     return {
@@ -296,7 +297,7 @@ export function updateAuthStatus (token) {
         const options = {
             method: 'POST',
             headers: {
-                mwi_auth_token: tokenHash
+                [MWI_AUTH_TOKEN_NAME_FOR_HTTP]: tokenHash
             }
         };
         const response = await fetchWithTimeout(dispatch, './authenticate', options, 15000);

{matlab-proxy-0.15.1 → matlab-proxy-0.16.0}/gui/src/components/App/App.spec.js

@@ -7,6 +7,7 @@ import App from './index';
 import * as actionCreators from '../../actionCreators';
 import state from '../../test/utils/state';
 import { MAX_REQUEST_FAIL_COUNT } from '../../constants';
+import { MWI_AUTH_TOKEN_NAME_FOR_HTTP } from '../../constants';
 
 const _ = require('lodash');
 
@@ -47,7 +48,7 @@ describe('App Component', () => {
     });
 
     it('should render overlayTrigger (after closing the tutorial)', () => {
-    // Hide the tutorial before rendering the component.
+        // Hide the tutorial before rendering the component.
         initialState.tutorialHidden = true;
         initialState.overlayVisibility = false;
 
@@ -64,7 +65,7 @@ describe('App Component', () => {
     });
 
     it('should render LicensingGatherer component within the App component when no licensing is provided and user is authenticated', () => {
-    // Set lincensingInfo to empty object.
+        // Set licensingInfo to empty object.
         initialState.overlayVisibility = true;
         initialState.serverStatus.licensingInfo = {};
         initialState.authentication.enabled = true;
@@ -79,7 +80,7 @@ describe('App Component', () => {
     });
 
     it('should render LicensingGatherer component within the App component when no licensing is provided and authentication is disabled', () => {
-    // Set lincensingInfo to empty object.
+        // Set licensingInfo to empty object.
         initialState.overlayVisibility = true;
         initialState.serverStatus.licensingInfo = {};
         initialState.authentication.enabled = false;
@@ -93,7 +94,7 @@ describe('App Component', () => {
     });
 
     it('should render Information Component within App Component after licensing is provided and user is authenticated', () => {
-    // Hide the tutorial and make the overlay visible.
+        // Hide the tutorial and make the overlay visible.
         initialState.tutorialHidden = true;
         initialState.overlayVisibility = true;
 
@@ -112,7 +113,7 @@ describe('App Component', () => {
     });
 
     it('should render Information Component within App Component after licensing is provided and auth is not enabled', () => {
-    // Hide the tutorial and make the overlay visible.
+        // Hide the tutorial and make the overlay visible.
         initialState.tutorialHidden = true;
         initialState.overlayVisibility = true;
 
@@ -131,7 +132,7 @@ describe('App Component', () => {
     });
 
     it('should display integration terminated error', () => {
-    // Hide the tutorial, make the overlay visible and set fetchFailCount to MAX_REQUEST_FAIL_COUNT
+        // Hide the tutorial, make the overlay visible and set fetchFailCount to MAX_REQUEST_FAIL_COUNT
         initialState.tutorialHidden = true;
         initialState.overlayVisibility = true;
         initialState.serverStatus.fetchFailCount = MAX_REQUEST_FAIL_COUNT;
@@ -173,7 +174,7 @@ describe('App Component', () => {
     });
 
     it('should display Confirmation component ', () => {
-    // Hide the tutorial and make the overlay visible
+        // Hide the tutorial and make the overlay visible
         initialState.tutorialHidden = true;
         initialState.overlayVisibility = true;
 
@@ -196,7 +197,7 @@ describe('App Component', () => {
     });
 
     it('should display Help Component', () => {
-    // Hide the tutorial and make the overlay visible
+        // Hide the tutorial and make the overlay visible
         initialState.tutorialHidden = true;
         initialState.overlayVisibility = true;
 
@@ -230,9 +231,9 @@ describe('App Component', () => {
 
     const tokenInQuery = '12345';
     it.each([
-        [`?mwi_auth_token=${tokenInQuery}&test1=1&test2=2`, tokenInQuery],
-        [`?test1=1&mwi_auth_token=${tokenInQuery}&test2=2`, tokenInQuery],
-        [`?test1=1&test2=2&mwi_auth_token=${tokenInQuery}`, tokenInQuery]
+        [`?${MWI_AUTH_TOKEN_NAME_FOR_HTTP}=${tokenInQuery}&test1=1&test2=2`, tokenInQuery],
+        [`?test1=1&${MWI_AUTH_TOKEN_NAME_FOR_HTTP}=${tokenInQuery}&test2=2`, tokenInQuery],
+        [`?test1=1&test2=2&${MWI_AUTH_TOKEN_NAME_FOR_HTTP}=${tokenInQuery}`, tokenInQuery]
     ])("should pick the token correctly when the query parameters are '%s'", (queryParams, expectedToken) => {
         const url = 'http://localhost.com:5555';
         const mockUpdateAuthStatus = jest.spyOn(actionCreators, 'updateAuthStatus');

{matlab-proxy-0.15.1 → matlab-proxy-0.16.0}/gui/src/components/App/index.js

@@ -43,6 +43,7 @@ import {
 } from '../../actionCreators';
 import blurredBackground from './MATLAB-env-blur.png';
 import EntitlementSelector from '../EntitlementSelector';
+import { MWI_AUTH_TOKEN_NAME_FOR_HTTP } from '../../constants';
 
 function App () {
     const dispatch = useDispatch();
@@ -165,10 +166,10 @@ function App () {
                     cancel={endSession}
                     title='MATLAB is currently open in another window'
                     cancelButton={wasEverActive ? ('Cancel') : ('Continue in existing window')}
-                    confirmButton = {wasEverActive ? ('Confirm') : ('Continue in this window')}>
+                    confirmButton={wasEverActive ? ('Confirm') : ('Continue in this window')}>
                     {wasEverActive
                         ? 'You have been disconnected because MATLAB is open in another window. Click on Confirm to continue using MATLAB here.'
-                        : <div>MATLAB is open in another window and cannot be opened in a second window or tab at the same time.<br></br>Would you like to continue in this window?</div> }
+                        : <div>MATLAB is open in another window and cannot be opened in a second window or tab at the same time.<br></br>Would you like to continue in this window?</div>}
                 </Confirmation>
             );
         }
@@ -204,7 +205,7 @@ function App () {
 
     useEffect(() => {
         const queryParams = parseQueryParams(window.location);
-        const token = queryParams.get('mwi_auth_token');
+        const token = queryParams.get(MWI_AUTH_TOKEN_NAME_FOR_HTTP);
 
         if (token) {
             dispatch(updateAuthStatus(token));

{matlab-proxy-0.15.1 → matlab-proxy-0.16.0}/gui/src/constants.js

@@ -4,3 +4,4 @@
 export const STATUS_REQUEST_INTERVAL_MS = 1000;
 // Maximum number of consecutive failed requests allowed before triggering a connection error
 export const MAX_REQUEST_FAIL_COUNT = 60;
+export const MWI_AUTH_TOKEN_NAME_FOR_HTTP = 'mwi-auth-token';

{matlab-proxy-0.15.1 → matlab-proxy-0.16.0}/matlab_proxy/app_state.py

@@ -11,13 +11,13 @@ from datetime import datetime, timedelta, timezone
 from typing import Final, Optional
 
 from matlab_proxy import util
-from matlab_proxy.settings import (
-    get_process_startup_timeout,
-)
 from matlab_proxy.constants import (
     CONNECTOR_SECUREPORT_FILENAME,
     MATLAB_LOGS_FILE_NAME,
 )
+from matlab_proxy.settings import (
+    get_process_startup_timeout,
+)
 from matlab_proxy.util import mw, mwi, system, windows
 from matlab_proxy.util.mwi import environment_variables as mwi_env
 from matlab_proxy.util.mwi import token_auth
@@ -28,12 +28,11 @@ from matlab_proxy.util.mwi.exceptions import (
     LicensingError,
     MatlabError,
     OnlineLicensingError,
-    XvfbError,
     UIVisibleFatalError,
+    XvfbError,
     log_error,
 )
 
-
 logger = mwi.logger.get()
 
 
@@ -314,7 +313,11 @@ class AppState:
             [Dict | None]: Returns token authentication headers if any.
         """
         return (
-            {self.settings["mwi_auth_token_name"]: self.settings["mwi_auth_token_hash"]}
+            {
+                self.settings["mwi_auth_token_name_for_http"]: self.settings[
+                    "mwi_auth_token_hash"
+                ]
+            }
             if self.settings["mwi_is_token_auth_enabled"]
             else None
         )

{matlab-proxy-0.15.1 → matlab-proxy-0.16.0}/matlab_proxy/constants.py

@@ -26,3 +26,4 @@ SUPPORTED_MATLAB_VERSIONS: Final[List[str]] = [
 
 # This constant when set to True restricts the number of active sessions to one
 IS_CONCURRENCY_CHECK_ENABLED: Final[bool] = True
+MWI_AUTH_TOKEN_NAME_FOR_HTTP = "mwi-auth-token"

{matlab-proxy-0.15.1 → matlab-proxy-0.16.0}/matlab_proxy/settings.py

@@ -17,6 +17,7 @@ from cryptography.x509.oid import NameOID
 
 import matlab_proxy
 from matlab_proxy import constants
+from matlab_proxy.constants import MWI_AUTH_TOKEN_NAME_FOR_HTTP
 from matlab_proxy.util import mwi, system
 from matlab_proxy.util.mwi import environment_variables as mwi_env
 from matlab_proxy.util.mwi import token_auth
@@ -197,11 +198,12 @@ def get_dev_settings(config):
         "mwi_logs_root_dir": get_mwi_logs_root_dir(dev=True),
         "mw_context_tags": get_mw_context_tags(matlab_proxy.get_default_config_name()),
         "mwi_server_url": None,
-        "mwi_is_token_auth_enabled": mwi_auth_token != None,
+        "mwi_is_token_auth_enabled": mwi_auth_token is not None,
         "mwi_auth_status": False,
         "mwi_auth_token": mwi_auth_token,
         "mwi_auth_token_hash": mwi_auth_token_hash,
-        "mwi_auth_token_name": mwi_env.get_env_name_mwi_auth_token().lower(),
+        "mwi_auth_token_name_for_http": MWI_AUTH_TOKEN_NAME_FOR_HTTP,
+        "mwi_auth_token_name_for_env": mwi_env.get_env_name_mwi_auth_token().lower(),
         "mwi_use_existing_license": mwi.validators.validate_use_existing_licensing(
             os.getenv(mwi_env.get_env_name_mwi_use_existing_license(), "")
         ),
@@ -322,11 +324,12 @@ def get_server_settings(config_name):
         "mw_context_tags": get_mw_context_tags(config_name),
         # The url where the matlab-proxy server is accessible at
         "mwi_server_url": None,
-        "mwi_is_token_auth_enabled": mwi_auth_token != None,
+        "mwi_is_token_auth_enabled": mwi_auth_token is not None,
         "mwi_auth_status": False,
         "mwi_auth_token": mwi_auth_token,
         "mwi_auth_token_hash": mwi_auth_token_hash,
-        "mwi_auth_token_name": mwi_env.get_env_name_mwi_auth_token().lower(),
+        "mwi_auth_token_name_for_http": MWI_AUTH_TOKEN_NAME_FOR_HTTP,
+        "mwi_auth_token_name_for_env": mwi_env.get_env_name_mwi_auth_token().lower(),
         "mwi_use_existing_license": mwi.validators.validate_use_existing_licensing(
             os.getenv(mwi_env.get_env_name_mwi_use_existing_license(), "")
         ),

{matlab-proxy-0.15.1 → matlab-proxy-0.16.0}/matlab_proxy/util/mwi/token_auth.py

@@ -59,7 +59,7 @@ def generate_mwi_auth_token_and_hash():
 def get_mwi_auth_token_access_str(app_settings):
     """Returns formatted string with mwi token for use with server URL"""
     if app_settings["mwi_is_token_auth_enabled"]:
-        mwi_auth_token_name = app_settings["mwi_auth_token_name"]
+        mwi_auth_token_name = app_settings["mwi_auth_token_name_for_http"]
         mwi_auth_token = app_settings["mwi_auth_token"]
         return f"?{mwi_auth_token_name}={mwi_auth_token}"
 
@@ -134,7 +134,20 @@ async def _get_token_name(request):
         str : token name
     """
     app_settings = request.app["settings"]
-    return app_settings["mwi_auth_token_name"]
+    return app_settings["mwi_auth_token_name_for_env"]
+
+
+def _get_token_name_for_http(request):
+    """Gets the name of the token from settings.
+
+    Args:
+        request (HTTPRequest) : Used to get to app settings
+
+    Returns:
+        str : token name
+    """
+    app_settings = request.app["settings"]
+    return app_settings["mwi_auth_token_name_for_http"]
 
 
 async def _get_token(request):
@@ -238,11 +251,11 @@ async def _is_valid_token_in_url_query(request):
     query_string = request.query_string
     logger.debug(f"url query parameters found:{query_string}")
     if query_string:
-        token_name = await _get_token_name(request)
+        token_name = _get_token_name_for_http(request)
         parsed_token = parse_qs(request.query_string).get(token_name)
         if parsed_token:
             parsed_token = parsed_token[0]
-            logger.debug(f"parsed_token from url query string.")
+            logger.debug("parsed_token from url query string.")
             return await _is_valid_token(parsed_token, request)
 
     logger.debug("Token not found in url query.")
@@ -262,8 +275,9 @@ async def _is_valid_token_in_headers(request):
     """
     logger.debug("Checking for token in request headers...")
     headers = request.headers
-    token_name = await _get_token_name(request)
+    token_name = _get_token_name_for_http(request)
     if token_name in headers:
+        logger.debug(f"Token found in headers: {token_name}")
         is_valid_token = await _is_valid_token(headers[token_name], request)
         if is_valid_token:
             await _store_token_hash_into_session(request)

{matlab-proxy-0.15.1 → matlab-proxy-0.16.0/matlab_proxy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: matlab-proxy
-Version: 0.15.1
+Version: 0.16.0
 Summary: Python® package enables you to launch MATLAB® and access it from a web browser.
 Home-page: https://github.com/mathworks/matlab-proxy/
 Author: The MathWorks, Inc.

{matlab-proxy-0.15.1 → matlab-proxy-0.16.0}/setup.py

@@ -70,7 +70,7 @@ long_description = (HERE / "README.md").read_text()
 
 setuptools.setup(
     name="matlab-proxy",
-    version="0.15.1",
+    version="0.16.0",
     url=config["doc_url"],
     author="The MathWorks, Inc.",
     author_email="cloud@mathworks.com",

{matlab-proxy-0.15.1 → matlab-proxy-0.16.0}/tests/integration/integration_tests_with_license/test_http_end_points.py

@@ -12,7 +12,7 @@ import re
 from requests.adapters import HTTPAdapter, Retry
 from urllib.parse import urlparse, parse_qs
 from tests.utils.logging_util import create_integ_test_logger
-from logging import DEBUG
+from matlab_proxy.constants import MWI_AUTH_TOKEN_NAME_FOR_HTTP
 
 _logger = create_integ_test_logger(__name__)
 
@@ -64,9 +64,9 @@ class RealMATLABServer:
         parsed_url = urlparse(utils.get_connection_string(self.mwi_app_port))
 
         self.headers = {
-            "mwi_auth_token": (
-                parse_qs(parsed_url.query)["mwi_auth_token"][0]
-                if "mwi_auth_token" in parse_qs(parsed_url.query)
+            MWI_AUTH_TOKEN_NAME_FOR_HTTP: (
+                parse_qs(parsed_url.query)[MWI_AUTH_TOKEN_NAME_FOR_HTTP][0]
+                if MWI_AUTH_TOKEN_NAME_FOR_HTTP in parse_qs(parsed_url.query)
                 else ""
             )
         }

{matlab-proxy-0.15.1 → matlab-proxy-0.16.0}/tests/integration/integration_tests_without_license/conftest.py

@@ -6,6 +6,7 @@ import requests
 from tests.utils.logging_util import create_integ_test_logger
 import os
 from urllib.parse import urlparse, parse_qs
+from matlab_proxy.constants import MWI_AUTH_TOKEN_NAME_FOR_HTTP
 
 _logger = create_integ_test_logger(__name__)
 
@@ -34,9 +35,9 @@ def parse_matlab_proxy_url():
     parsed_url = urlparse(utils.get_connection_string(mwi_app_port))
 
     headers = {
-        "mwi_auth_token": (
-            parse_qs(parsed_url.query)["mwi_auth_token"][0]
-            if "mwi_auth_token" in parse_qs(parsed_url.query)
+        MWI_AUTH_TOKEN_NAME_FOR_HTTP: (
+            parse_qs(parsed_url.query)[MWI_AUTH_TOKEN_NAME_FOR_HTTP][0]
+            if MWI_AUTH_TOKEN_NAME_FOR_HTTP in parse_qs(parsed_url.query)
             else ""
         )
     }

{matlab-proxy-0.15.1 → matlab-proxy-0.16.0}/tests/unit/test_app.py

@@ -1031,7 +1031,7 @@ async def test_update_entitlement_with_correct_entitlement(set_licensing_info):
     assert resp.status == HTTPStatus.OK
 
 
-async def test_get_auth_token_route(test_server, monkeypatch):
+async def test_get_auth_token_route(test_server):
     """Test to check endpoint : "/get_auth_token"
 
     Args:

{matlab-proxy-0.15.1 → matlab-proxy-0.16.0}/tests/unit/test_app_state.py

@@ -1,4 +1,4 @@
-# Copyright 2023 The MathWorks, Inc.
+# Copyright 2023-2024 The MathWorks, Inc.
 
 import json
 import os
@@ -7,9 +7,10 @@ from pathlib import Path
 from typing import Optional
 
 import pytest
-from matlab_proxy import settings
 
+from matlab_proxy import settings
 from matlab_proxy.app_state import AppState
+from matlab_proxy.constants import MWI_AUTH_TOKEN_NAME_FOR_HTTP
 from matlab_proxy.util.mwi.exceptions import LicensingError, MatlabError
 from tests.unit.util import MockResponse
 
@@ -55,7 +56,7 @@ def app_state_fixture(sample_settings_fixture):
 
 @pytest.fixture
 def sample_token_headers_fixture():
-    return {"mwi_auth_token_name": "asdf"}
+    return {MWI_AUTH_TOKEN_NAME_FOR_HTTP: "asdf"}
 
 
 @pytest.fixture
@@ -76,7 +77,10 @@ def app_state_with_token_auth_fixture(
     ((mwi_auth_token_name, mwi_auth_token_hash),) = sample_token_headers_fixture.items()
     app_state_fixture.matlab_session_files["matlab_ready_file"] = tmp_matlab_ready_file
     app_state_fixture.settings["mwi_is_token_auth_enabled"] = True
-    app_state_fixture.settings["mwi_auth_token_name"] = mwi_auth_token_name
+    app_state_fixture.settings["mwi_auth_token_name_for_env"] = mwi_auth_token_name
+    app_state_fixture.settings["mwi_auth_token_name_for_http"] = (
+        MWI_AUTH_TOKEN_NAME_FOR_HTTP
+    )
     app_state_fixture.settings["mwi_auth_token_hash"] = mwi_auth_token_hash
     app_state_fixture.settings["mwi_server_url"] = "http://localhost:8888"
 

{matlab-proxy-0.15.1 → matlab-proxy-0.16.0}/tests/unit/test_constants.py

@@ -1,4 +1,5 @@
-# Copyright 2020-2023 The MathWorks, Inc.
+# Copyright 2023-2024 The MathWorks, Inc.
+
 TWO_MAX_TRIES = 2
 FIVE_MAX_TRIES = 5
 HALF_SECOND_DELAY = 0.5

{matlab-proxy-0.15.1 → matlab-proxy-0.16.0}/tests/unit/util/mwi/test_token_auth.py

@@ -6,6 +6,7 @@ from aiohttp_session import setup as aiohttp_session_setup
 from aiohttp_session.cookie_storage import EncryptedCookieStorage
 from cryptography import fernet
 
+from matlab_proxy.constants import MWI_AUTH_TOKEN_NAME_FOR_HTTP
 from matlab_proxy.util.mwi import environment_variables as mwi_env
 from matlab_proxy.util.mwi import token_auth
 
@@ -105,10 +106,11 @@ def fake_server_with_auth_enabled(
 
     app = web.Application()
     app["settings"] = {
-        "mwi_is_token_auth_enabled": mwi_auth_token != None,
+        "mwi_is_token_auth_enabled": mwi_auth_token is not None,
         "mwi_auth_token": mwi_auth_token,
         "mwi_auth_token_hash": mwi_auth_token_hash,
-        "mwi_auth_token_name": mwi_env.get_env_name_mwi_auth_token().lower(),
+        "mwi_auth_token_name_for_http": MWI_AUTH_TOKEN_NAME_FOR_HTTP,
+        "mwi_auth_token_name_for_env": mwi_env.get_env_name_mwi_auth_token().lower(),
     }
     app.router.add_get("/", fake_endpoint)
     app.router.add_post("/", fake_endpoint)
@@ -127,7 +129,7 @@ async def test_set_value_with_token(
     resp = await fake_server_with_auth_enabled.post(
         "/",
         data={"value": "foo"},
-        headers={"mwi_auth_token": get_custom_auth_token_str},
+        headers={MWI_AUTH_TOKEN_NAME_FOR_HTTP: get_custom_auth_token_str},
     )
     assert resp.status == web.HTTPOk.status_code
     assert await resp.text() == "thanks for the data"
@@ -158,7 +160,9 @@ async def test_set_value_with_token_hash(
         "/",
         data={"value": "foo"},
         headers={
-            "mwi_auth_token": token_auth._generate_hash(get_custom_auth_token_str)
+            MWI_AUTH_TOKEN_NAME_FOR_HTTP: token_auth._generate_hash(
+                get_custom_auth_token_str
+            )
         },
     )
     assert resp.status == web.HTTPOk.status_code
@@ -193,7 +197,9 @@ async def test_set_value_without_token(fake_server_with_auth_enabled):
 
 async def test_set_value_with_invalid_token(fake_server_with_auth_enabled):
     resp2 = await fake_server_with_auth_enabled.post(
-        "/", data={"value": "foobar"}, headers={"mwi_auth_token": "invalid-token"}
+        "/",
+        data={"value": "foobar"},
+        headers={MWI_AUTH_TOKEN_NAME_FOR_HTTP: "invalid-token"},
     )
     assert resp2.status == web.HTTPForbidden.status_code
 
@@ -205,7 +211,11 @@ async def test_set_value_with_token_in_params(
     resp = await fake_server_with_auth_enabled.post(
         "/",
         data={"value": "foofoo"},
-        params={"mwi_auth_token": token_auth._generate_hash(get_custom_auth_token_str)},
+        params={
+            MWI_AUTH_TOKEN_NAME_FOR_HTTP: token_auth._generate_hash(
+                get_custom_auth_token_str
+            )
+        },
     )
     assert resp.status == web.HTTPOk.status_code
     assert await resp.text() == "thanks for the data"
@@ -232,7 +242,11 @@ async def test_get_value_with_token_in_query_params(
     fake_server_with_auth_enabled.server.app["value"] = "bar"
     resp = await fake_server_with_auth_enabled.get(
         "/",
-        params={"mwi_auth_token": token_auth._generate_hash(get_custom_auth_token_str)},
+        params={
+            MWI_AUTH_TOKEN_NAME_FOR_HTTP: token_auth._generate_hash(
+                get_custom_auth_token_str
+            )
+        },
     )
     assert resp.status == web.HTTPOk.status_code
     assert await resp.text() == "value: bar"
@@ -257,7 +271,7 @@ def fake_server_without_auth_enabled(loop, aiohttp_client, monkeypatch):
         "mwi_is_token_auth_enabled": mwi_auth_token != None,
         "mwi_auth_token": mwi_auth_token,
         "mwi_auth_token_hash": mwi_auth_token_hash,
-        "mwi_auth_token_name": mwi_env.get_env_name_mwi_auth_token().lower(),
+        "mwi_auth_token_name_for_env": mwi_env.get_env_name_mwi_auth_token().lower(),
     }
     app.router.add_get("/", fake_endpoint)
     app.router.add_post("/", fake_endpoint)
@@ -283,7 +297,7 @@ async def test_get_value_in_query_params(
     # Server should respond even if token is provided when not needed.
     fake_server_without_auth_enabled.server.app["value"] = "bar2"
     resp = await fake_server_without_auth_enabled.get(
-        "/", params={"mwi_auth_token": get_custom_auth_token_str}
+        "/", params={"mwi-auth-token": get_custom_auth_token_str}
     )
     assert resp.status == web.HTTPOk.status_code
     assert await resp.text() == "value: bar2"