Skip to content

Fix Google Sign-In email cache issue on sign-out #1627

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
chen-ye wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Google Sign-In email cache issue on sign-out #1627

Show file tree
Hide file tree
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
44 changes: 26 additions & 18 deletions src/background/cloudAuth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@ export const signInGoogle = async () => {
const authCode = await getAuthCode();
const { accessToken, expiresIn, refreshToken } = await getRefreshTokens(authCode);
const email = await getEmail(accessToken);
setSettings("signedInEmail", email);
setSettings("accessToken", accessToken);
setSettings("refreshToken", refreshToken);
setTokenExpiration(expiresIn);
setSettings("lastSyncTime", 0);
setSettings("removedQueue", []);
await Promise.all([
setSettings("signedInEmail", email),
setSettings("accessToken", accessToken),
setSettings("refreshToken", refreshToken),
setTokenExpiration(expiresIn),
setSettings("lastSyncTime", 0),
setSettings("removedQueue", [])
]);
return true;
} catch {
return false;
Expand All @@ -30,11 +32,13 @@ export const signOutGoogle = async () => {
const refreshToken = getSettings("refreshToken");
revokeToken(accessToken);
revokeToken(refreshToken);
setSettings("signedInEmail", "");
setSettings("accessToken", "");
setSettings("refreshToken", "");
setSettings("lastSyncTime", 0);
setSettings("removedQueue", []);
await Promise.all([
setSettings("signedInEmail", ""),
setSettings("accessToken", ""),
setSettings("refreshToken", ""),
setSettings("lastSyncTime", 0),
setSettings("removedQueue", [])
]);
return true;
} catch {
return false;
Expand Down Expand Up @@ -144,7 +148,7 @@ const getEmail = async accessToken => {

const setTokenExpiration = async expirationSec => {
const currentTimeMs = Date.now();
setSettings("tokenExpiration", currentTimeMs + expirationSec * 1000);
await setSettings("tokenExpiration", currentTimeMs + expirationSec * 1000);
};

export const refreshAccessToken = async (shouldShowLogin = true) => {
Expand All @@ -157,8 +161,10 @@ export const refreshAccessToken = async (shouldShowLogin = true) => {

try {
const { accessToken, expiresIn } = await getAccessToken(refreshToken);
setSettings("accessToken", accessToken);
setTokenExpiration(expiresIn);
await Promise.all([
setSettings("accessToken", accessToken),
setTokenExpiration(expiresIn)
]);
return accessToken;
} catch (e) {
const currentEmail = getSettings("signedInEmail");
Expand All @@ -167,10 +173,12 @@ export const refreshAccessToken = async (shouldShowLogin = true) => {
});
const { accessToken, expiresIn, refreshToken } = await getRefreshTokens(authCode);
const email = await getEmail(accessToken);
setSettings("signedInEmail", email);
setSettings("accessToken", accessToken);
setSettings("refreshToken", refreshToken);
setTokenExpiration(expiresIn);
await Promise.all([
setSettings("signedInEmail", email),
setSettings("accessToken", accessToken),
setSettings("refreshToken", refreshToken),
setTokenExpiration(expiresIn)
]);
return accessToken;
}
};
Expand Down
8 changes: 6 additions & 2 deletions src/options/components/SignInButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,18 @@ export default class SignInButton extends Component {
const isSucceeded = await browser.runtime.sendMessage({
message: "signInGoogle"
});
if (isSucceeded) this.setState({ shouldSignIn: !this.state.shouldSignIn });
if (isSucceeded) {
const response = await browser.storage.local.get("Settings");
const signedInEmail = response.Settings?.signedInEmail || "";
this.setState({ shouldSignIn: false, signedInEmail });
}
};

handleSignOutClick = async () => {
const isSucceeded = await browser.runtime.sendMessage({
message: "signOutGoogle"
});
if (isSucceeded) this.setState({ shouldSignIn: !this.state.shouldSignIn });
if (isSucceeded) this.setState({ shouldSignIn: true, signedInEmail: "" });
};

render() {
Expand Down