Skip to content

Commit e60fe2b

Browse files
committed
use identity.getRedirectUrl() instead of setting it manually
1 parent ec2959a commit e60fe2b

File tree

4 files changed

+6
-19
lines changed

4 files changed

+6
-19
lines changed

entrypoints/background.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,6 @@ export default defineBackground(() => {
2525
return [...Array(num)].map(() => Math.random().toString(36)[2]).join("");
2626
}
2727

28-
function getRedirectUrl() {
29-
const extensionId = browser.runtime.id;
30-
if (navigator.userAgent.includes("Firefox")) {
31-
return `https://${extensionId}.extensions.allizom.org/`;
32-
}
33-
return `https://${extensionId}.chromiumapp.org/`;
34-
}
35-
3628
// Listen for messages from popup or content scripts
3729
browser.runtime.onMessage.addListener((message, sender, sendResponse) => {
3830
if (message.type === "START_OAUTH_FLOW") {
@@ -47,7 +39,7 @@ export default defineBackground(() => {
4739
const hashed = await sha256(oauthVerifier);
4840
oauthChallenge = base64urlencode(hashed);
4941

50-
const redirectUrl = getRedirectUrl();
42+
const redirectUrl = browser.identity.getRedirectURL();
5143
const loginUrl =
5244
endpoint +
5345
"/oauth/authorize?client_id=" +

entrypoints/utils/oauth.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,8 @@ browser.storage.onChanged.addListener((changes, area) => {
3939
// Initialize
4040
loadTokens();
4141

42-
export const getRedirectUrl = () => {
43-
const extensionId = browser.runtime.id;
44-
if (navigator.userAgent.includes("Firefox")) {
45-
return `https://${extensionId}.extensions.allizom.org/`;
46-
}
47-
return `https://${extensionId}.chromiumapp.org/`;
48-
};
42+
// Use browser.identity.getRedirectURL() which works for both Firefox and Chrome
43+
export const getRedirectUrl = () => browser.identity.getRedirectURL();
4944

5045
export const isLoggedIn = computed(() => !!accessToken.value);
5146

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "solidtime-browser-extension",
33
"description": "Official Browser Extension for solidtime",
44
"private": true,
5-
"version": "0.0.6",
5+
"version": "0.0.7",
66
"type": "module",
77
"scripts": {
88
"dev": "wxt",

0 commit comments

Comments
 (0)