Skip to content

Commit 62cac5f

Browse files
committed
fix: cn.overleaf.com
1 parent aa8a311 commit 62cac5f

8 files changed

Lines changed: 14 additions & 15 deletions

File tree

webapp/_webapp/src/background.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,11 @@ export type Handler<A, T> = {
2626
// eslint-disable-next-line @typescript-eslint/no-explicit-any
2727
export type HandlerAny = Handler<any, any>;
2828

29-
export const getCookiesHandler: Handler<void, { session?: string; gclb?: string }> = {
29+
export const getCookiesHandler: Handler<string, { session?: string; gclb?: string }> = {
3030
name: HANDLER_NAMES.GET_COOKIES,
31-
handler: async (_, sendResponse) => {
32-
const currentDomain = window.location.hostname;
33-
const cookies = await getAllCookies("overleaf_session2", "https://" + currentDomain);
34-
const gclb = await getAllCookies("GCLB", "https://" + currentDomain);
31+
handler: async (domain: string, sendResponse) => {
32+
const cookies = await getAllCookies("overleaf_session2", "https://" + domain);
33+
const gclb = await getAllCookies("GCLB", "https://" + domain);
3534
sendResponse({ session: cookies[0]?.value, gclb: gclb[0]?.value });
3635
},
3736
};

webapp/_webapp/src/components/message-entry-container/tools/paper-score-comment/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export const PaperScoreCommentCard = ({ messageId, message, preparing, animated
2828
const [showFilters, setShowFilters] = useState(false);
2929

3030
useEffect(() => {
31-
getCookies().then((cookies) => {
31+
getCookies(window.location.hostname).then((cookies) => {
3232
setOverleafSession(cookies.session);
3333
setGclb(cookies.gclb);
3434
});

webapp/_webapp/src/devtool/app.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const App = () => {
1111
const [gclb, setGclb] = useState(localStorage.getItem("pd.auth.gclb") ?? "");
1212

1313
useEffect(() => {
14-
getCookies().then((cookies) => {
14+
getCookies(window.location.hostname).then((cookies) => {
1515
setOverleafSession(cookies.session ?? localStorage.getItem("pd.auth.overleafSession") ?? "");
1616
setGclb(cookies.gclb ?? localStorage.getItem("pd.auth.gclb") ?? "");
1717
});

webapp/_webapp/src/hooks/useSendMessageStream.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ export function useSendMessageStream() {
9797
}));
9898

9999
if (import.meta.env.DEV && alwaysSyncProject) {
100-
const { session, gclb } = await getCookies();
100+
const { session, gclb } = await getCookies(window.location.hostname);
101101
await sync(
102102
user?.id || "",
103103
getProjectId(),
@@ -157,7 +157,7 @@ export function useSendMessageStream() {
157157
{
158158
sync: async () => {
159159
try {
160-
const { session, gclb } = await getCookies();
160+
const { session, gclb } = await getCookies(window.location.hostname);
161161
await sync(
162162
user?.id || "",
163163
getProjectId(),

webapp/_webapp/src/intermediate.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,16 @@ function makeFunction<A, T>(handlerName: string, opts?: MakeFunctionOpts): (args
8888
return fn;
8989
}
9090

91-
let getCookies: () => Promise<{ session: string; gclb: string }>;
91+
let getCookies: (domain: string) => Promise<{ session: string; gclb: string }>;
9292
if (import.meta.env.DEV) {
93-
getCookies = async () => {
93+
getCookies = async (_: string) => {
9494
return {
9595
session: localStorage.getItem("pd.auth.overleafSession") ?? "",
9696
gclb: localStorage.getItem("pd.auth.gclb") ?? "",
9797
};
9898
};
9999
} else {
100-
getCookies = makeFunction<void, { session: string; gclb: string }>(HANDLER_NAMES.GET_COOKIES);
100+
getCookies = makeFunction<string, { session: string; gclb: string }>(HANDLER_NAMES.GET_COOKIES);
101101
}
102102

103103
export { getCookies };

webapp/_webapp/src/stores/conversation/handlers/handleStreamError.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export async function handleStreamError(
1818
sendMessageStream: (message: string, selectedText: string) => Promise<void>,
1919
) {
2020
try {
21-
const { session, gclb } = await getCookies();
21+
const { session, gclb } = await getCookies(window.location.hostname);
2222
if (streamError.errorMessage.includes("project is out of date")) {
2323
await sync(
2424
userId,

webapp/_webapp/src/views/login/login-with-overleaf.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export default function LoginWithOverleaf({
2929
setLoginLoadingMessage("Please wait while we log you in...");
3030
setIsLoginLoading(true);
3131

32-
const { session } = await getCookies();
32+
const { session } = await getCookies(window.location.hostname);
3333
const resp = await loginByOverleaf({ overleafToken: session });
3434

3535
setToken(resp.token);

webapp/_webapp/src/views/settings/sections/account-settings.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export const AccountSettings = () => {
1313
const [gclb, setGclb] = useState("");
1414

1515
useEffect(() => {
16-
getCookies().then((cookies) => {
16+
getCookies(window.location.hostname).then((cookies) => {
1717
setOverleafSession(cookies.session);
1818
setGclb(cookies.gclb);
1919
});

0 commit comments

Comments
 (0)