Skip to content

Issue #68 - Cookies for Server #75

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Issue #68 - Cookies for Server #75

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 20 additions & 13 deletions src/api/js-api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,14 @@ const domainsElement = document.querySelector(`meta[name="${domainsMeta}"]`);

const externalOverrideMapPromises = {};

const setCookieForImport = (key, url) => {
document.cookie = `${key}=${url}; path=/`;
};

const removeCookieForImport = (key) => {
document.cookie = `${key}=; path=/; expires=Thu, 01 Jan 1970 00:00:01 GMT;`;
};

export const importMapType = importMapMetaElement
? importMapMetaElement.getAttribute("content")
: "importmap";
Expand Down Expand Up @@ -82,7 +90,7 @@ function init() {
const key = localStoragePrefix + moduleName;
localStorage.setItem(key, url);
if (serverOverrides) {
document.cookie = `${key}=${url}`;
setCookieForImport(key, url);
}
fireChangedEvent();
return imo.getOverrideMap();
Expand Down Expand Up @@ -137,7 +145,7 @@ function init() {
const hasItem = localStorage.getItem(key) !== null;
localStorage.removeItem(key);
if (serverOverrides) {
document.cookie = `${key}=; expires=Thu, 01 Jan 1970 00:00:01 GMT;`;
removeCookieForImport(key);
}
imo.enableOverride(moduleName);
fireChangedEvent();
Expand Down Expand Up @@ -210,11 +218,9 @@ function init() {
nextPromise = Promise.resolve(JSON.parse(scriptEl.textContent));
}

return Promise.all([
promise,
nextPromise,
]).then(([originalMap, newMap]) =>
imo.mergeImportMap(originalMap, newMap)
return Promise.all([promise, nextPromise]).then(
([originalMap, newMap]) =>
imo.mergeImportMap(originalMap, newMap)
);
}
},
Expand Down Expand Up @@ -262,6 +268,9 @@ function init() {
disabledOverridesLocalStorageKey,
JSON.stringify(disabledOverrides.concat(moduleName))
);
if (serverOverrides) {
removeCookieForImport(localStoragePrefix + moduleName);
}
fireChangedEvent();
return true;
} else {
Expand Down Expand Up @@ -329,9 +338,8 @@ function init() {
return externalOverrides.reduce((result, externalOverride) => {
const fetchPromise =
externalOverrideMapPromises[externalOverride] ||
(externalOverrideMapPromises[externalOverride] = fetchExternalMap(
externalOverride
));
(externalOverrideMapPromises[externalOverride] =
fetchExternalMap(externalOverride));
return Promise.all([result, fetchPromise]).then(
([firstMap, secondMap]) => {
return imo.mergeImportMap(firstMap, secondMap);
Expand All @@ -342,9 +350,8 @@ function init() {
isExternalMapValid(importMapUrl) {
const promise =
externalOverrideMapPromises[importMapUrl] ||
(externalOverrideMapPromises[importMapUrl] = fetchExternalMap(
importMapUrl
));
(externalOverrideMapPromises[importMapUrl] =
fetchExternalMap(importMapUrl));
return promise.then(() =>
includes(imo.invalidExternalMaps, importMapUrl)
);
Expand Down