diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts index 4db45ecdbf..278a2e166c 100644 --- a/cypress/support/commands.ts +++ b/cypress/support/commands.ts @@ -35,7 +35,7 @@ Cypress.Commands.add("login", (username, password) => { password ||= "admin123#"; cy.request("POST", "/api/v1/fleet/login", { username, password }).then( (resp) => { - window.localStorage.setItem("KOLIDE::auth_token", resp.body.token); + window.localStorage.setItem("FLEET::auth_token", resp.body.token); } ); }); @@ -46,10 +46,10 @@ Cypress.Commands.add("logout", () => { method: "POST", body: {}, auth: { - bearer: window.localStorage.getItem("KOLIDE::auth_token"), + bearer: window.localStorage.getItem("FLEET::auth_token"), }, }).then(() => { - window.localStorage.removeItem("KOLIDE::auth_token"); + window.localStorage.removeItem("FLEET::auth_token"); }); }); @@ -69,7 +69,7 @@ Cypress.Commands.add("setupSMTP", () => { method: "PATCH", body, auth: { - bearer: window.localStorage.getItem("KOLIDE::auth_token"), + bearer: window.localStorage.getItem("FLEET::auth_token"), }, }); }); @@ -91,7 +91,7 @@ Cypress.Commands.add("setupSSO", (enable_idp_login = false) => { method: "PATCH", body, auth: { - bearer: window.localStorage.getItem("KOLIDE::auth_token"), + bearer: window.localStorage.getItem("FLEET::auth_token"), }, }); }); diff --git a/frontend/components/queries/QueryPageWrapper/QueryPageWrapper.tests.jsx b/frontend/components/queries/QueryPageWrapper/QueryPageWrapper.tests.jsx index 96afe1d3e7..bd049e7636 100644 --- a/frontend/components/queries/QueryPageWrapper/QueryPageWrapper.tests.jsx +++ b/frontend/components/queries/QueryPageWrapper/QueryPageWrapper.tests.jsx @@ -18,7 +18,7 @@ const storeWithoutQuery = { describe("QueryPageWrapper - component", () => { beforeEach(() => { - global.localStorage.setItem("KOLIDE::auth_token", bearerToken); + global.localStorage.setItem("FLEET::auth_token", bearerToken); }); afterEach(() => { diff --git a/frontend/components/queries/QueryPageWrapper/helpers.tests.js b/frontend/components/queries/QueryPageWrapper/helpers.tests.js index ee7888919f..e8b218b523 100644 --- a/frontend/components/queries/QueryPageWrapper/helpers.tests.js +++ b/frontend/components/queries/QueryPageWrapper/helpers.tests.js @@ -19,7 +19,7 @@ describe("QueryPageWrapper - helpers", () => { const bearerToken = "abc123"; beforeEach(() => { - global.localStorage.setItem("KOLIDE::auth_token", bearerToken); + global.localStorage.setItem("FLEET::auth_token", bearerToken); }); describe("when the API call is successful", () => { diff --git a/frontend/utilities/local.js b/frontend/utilities/local.js index c7486dd35d..77688147ba 100644 --- a/frontend/utilities/local.js +++ b/frontend/utilities/local.js @@ -9,12 +9,12 @@ const local = { getItem: (itemName) => { const { localStorage } = window; - return localStorage.getItem(`KOLIDE::${itemName}`); + return localStorage.getItem(`FLEET::${itemName}`); }, setItem: (itemName, value) => { const { localStorage } = window; - return localStorage.setItem(`KOLIDE::${itemName}`, value); + return localStorage.setItem(`FLEET::${itemName}`, value); }, }; diff --git a/server/service/endpoint_sessions.go b/server/service/endpoint_sessions.go index 79ba8b595e..e8a89d5a73 100644 --- a/server/service/endpoint_sessions.go +++ b/server/service/endpoint_sessions.go @@ -224,7 +224,7 @@ func makeCallbackSSOEndpoint(svc fleet.Service, urlPrefix string) endpoint.Endpo relayStateLoadPage := ` diff --git a/tools/app/authtest.html b/tools/app/authtest.html index 6e7bfadc56..daeeefcf17 100644 --- a/tools/app/authtest.html +++ b/tools/app/authtest.html @@ -23,7 +23,7 @@ // we always delete the token in the user agent. We use the session token // to keep track of state from the user agent (Kolide SPA), the service provider // (Kolide back end), to the identity provider (IDP) and back. - var sessionToken = localStorage.getItem("KOLIDE::auth_token") + var sessionToken = localStorage.getItem("FLEET::auth_token") if( sessionToken != null ) { console.log("user should be authenticated, fetching user with token " + sessionToken); $.ajax({ @@ -39,7 +39,7 @@ $("#displayarea").empty(); $("#displayarea").append( "

Authentication Succeeded

" + - "

Token: " + localStorage.getItem("KOLIDE::auth_token").substring(0, 16) + "..." + "

" + + "

Token: " + localStorage.getItem("FLEET::auth_token").substring(0, 16) + "..." + "

" + "

User: " + data.user.email + "

" ); // print user stuff