alois/OpenFrontIO
1
0
Fork 0
mirror of https://github.com/openfrontio/OpenFrontIO.git synced 2026-06-27 05:24:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update the discord redirect handle

Browse Source
This commit is contained in:
oleksandr-shysh
2025-06-13 13:31:47 +03:00
parent 303ec08d82
commit 0cfe85ab4b
2 changed files with 19 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/client/discord-redirect.html
+8 -18
View File
@@ -6,26 +6,16 @@
<body>
<p>Please wait while we redirect you back to the application.</p>
<script>
const params = new URLSearchParams(window.location.search);
const code = params.get("code");
const error = params.get("error");
const state = params.get("state");
const appDeepLink = "com.openfront.app://auth";
if (code) {
let url = `com.openfront.app://auth?code=${code}`;
if (state) {
url += `&state=${state}`;
}
window.location = url;
} else if (error) {
let url = `com.openfront.app://auth?error=${error}`;
if (state) {
url += `&state=${state}`;
}
window.location = url;
if (window.location.hash.startsWith("#token=")) {
const token = window.location.hash.substring("#token=".length);
const redirectUrl = `${appDeepLink}?token=${encodeURIComponent(token)}`;
window.location.href = redirectUrl;
} else {
document.body.innerText =
"No code or error found. You can close this window.";
const error = window.location.hash.substring(1);
const redirectUrl = `${appDeepLink}?${error}`;
window.location.href = redirectUrl;
}
</script>
</body>
src/client/jwt.ts
+11 -37
View File
@@ -12,6 +12,7 @@ import {
} from "../core/ApiSchemas";
const isNative = Capacitor.getPlatform() !== "web";
const NATIVE_REDIRECT_URI = `${process.env.API_BASE_URL}/discord-redirect.html`;
function getAudience() {
const hostname =
@@ -57,7 +58,7 @@ export async function discordLogin() {
let redirectUri: string;
if (isNative) {
redirectUri = `${process.env.API_BASE_URL}/discord-redirect.html`;
redirectUri = NATIVE_REDIRECT_URI;
} else {
redirectUri = window.location.href.split("#")[0];
}
@@ -188,48 +189,21 @@ export function initializeAuthListener() {
App.addListener("appUrlOpen", async (data) => {
try {
const url = new URL(data.url);
const code = url.searchParams.get("code");
const state = url.searchParams.get("state");
const error = url.searchParams.get("error");
const token = url.searchParams.get("token");
if (error) {
console.error("Error from auth provider:", error);
if (token) {
localStorage.setItem("token", token);
__isLoggedIn = undefined; // Force re-evaluation
await Browser.close();
window.location.assign(window.location.origin || "/");
return;
}
if (code && state) {
const redirectUri = `${process.env.API_BASE_URL}/discord-redirect.html`;
const response = await fetch(`${getApiBase()}/mobile/callback`, {
method: "POST",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify({
code,
state,
redirect_uri: redirectUri,
}),
});
if (!response.ok) {
throw new Error(
`Failed to exchange code for token: ${response.statusText}`,
);
}
const { token } = await response.json();
if (token) {
localStorage.setItem("token", token);
__isLoggedIn = undefined;
await Browser.close();
window.location.assign(window.location.origin || "/");
} else {
console.error("No token found in response");
await Browser.close();
}
const error = url.search;
if (error) {
console.error(`Error from auth provider: ${error}`);
}
await Browser.close();
} catch (e) {
console.error("Error handling appUrlOpen", e);
await Browser.close();