Skip to content

/ ghostery-search-extension

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.

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

Jump to bottom

Fix: Refresh access_token if expired #24

Merged
merged 9 commits into from Nov 5, 2020
+15 −2
Merged

Fix: Refresh access_token if expired #24

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ec1a1e0
try to refresh token if get fails
fcjr Nov 5, 2020
8153363
fix race condition
fcjr Nov 5, 2020
5161065
retry fetch properly if recieved 401
fcjr Nov 5, 2020
e84525c
add early return
fcjr Nov 5, 2020
bffc2e5
move refresh to cookieListener
fcjr Nov 5, 2020
38b17bb
remove extra whitespace
fcjr Nov 5, 2020
86b9395
avoid exponential growth of token pool
fcjr Nov 5, 2020
9d5af50
update comment
fcjr Nov 5, 2020
133de00
add back extra refresh
fcjr Nov 5, 2020
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

Next

try to refresh token if get fails

  • Loading branch information
@fcjr
fcjr committed Nov 5, 2020
Verified
This commit was signed with the committer’s verified signature.
fcjr Frank Chiarulli Jr.
GPG key ID: 262758B51E7A9804 Learn about vigilant mode.
commit ec1a1e0fcfb84b9010a866b76b1d2f6341a44d85
8 src/background.js
View file
Open in desktop
@@ -11,8 +11,12 @@ class AccessToken {
tokenPool.generateTokens();
}

static get() {
return AccessToken.TOKEN;
static async get() {
if (AccessToken.TOKEN) {
return AccessToken.TOKEN
}
await AccessToken.refresh();
return AccessToken.TOKEN
}

static destroy() {
2 src/token-pool.js
View file
Open in desktop
@@ -39,7 +39,7 @@ class TokenPool {
}

async generateTokens() {
const accessToken = AccessToken.get();
const accessToken = await AccessToken.get();
This conversation was marked as resolved by fcjr

This comment has been minimized.

Sign in to view
@sammacbeth

sammacbeth Nov 5, 2020
Contributor

If this calls AccessToken.refresh() and the access token cookie is updated, AccessToken.set will call generateTokens (https://github.com/ghostery/ghostery-search-extension/blob/master/src/background.js#L11) so this will actually end up calling generateTokens twice.
if (!accessToken) {
return;
}
ProTip! Use n and p to navigate between commits in a pull request.