Discharge7443/fleet
1
0
Fork 0
Code Issues Pull Requests Actions 19 Packages Projects Releases Wiki Activity

Change name of localstorage auth token (#980)

Browse Source
This commit is contained in:
Zach Wasserman
2021-06-06 18:28:37 -07:00
committed by GitHub
parent 0356115b03
commit 229a9afed2
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cypress/support/commands.ts
+5 -5
View File
@@ -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"),
},
});
});
frontend/components/queries/QueryPageWrapper/QueryPageWrapper.tests.jsx
+1 -1
View File
@@ -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(() => {
frontend/components/queries/QueryPageWrapper/helpers.tests.js
+1 -1
View File
@@ -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", () => {
frontend/utilities/local.js
+2 -2
View File
@@ -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);
},
};
server/service/endpoint_sessions.go
+1 -1
View File
@@ -224,7 +224,7 @@ func makeCallbackSSOEndpoint(svc fleet.Service, urlPrefix string) endpoint.Endpo
relayStateLoadPage := ` <html>
<script type='text/javascript'>
var redirectURL = {{ .RedirectURL }};
window.localStorage.setItem('KOLIDE::auth_token', '{{ .Token }}');
window.localStorage.setItem('FLEET::auth_token', '{{ .Token }}');
window.location = redirectURL;
</script>
<body>
tools/app/authtest.html
+2 -2
View File
@@ -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(
"<h3>Authentication Succeeded</h3>" +
"<p>Token: " + localStorage.getItem("KOLIDE::auth_token").substring(0, 16) + "..." + "</p>" +
"<p>Token: " + localStorage.getItem("FLEET::auth_token").substring(0, 16) + "..." + "</p>" +
"<p>User: " + data.user.email + "</p>"
);
// print user stuff