gorb/frontend
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

feat: implement checking of /.well-known/gorb.txt for api url, remove old localStorage lines
All checks were successful
ci/woodpecker/push/build-and-publish Pipeline was successful
Details
ci/woodpecker/pr/build-and-publish Pipeline was successful
Details
ci/woodpecker/pull_request_closed/build-and-publish Pipeline was successful
Details

Browse source
This commit is contained in:
SauceyRed 2025-05-31 01:19:31 +02:00
parent f39ff00b3b
commit bc8e84b75d
Signed by: sauceyred
GPG key ID: 2BF92EB6D8A5CCA7
2 changed files with 29 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

31
layouts/auth.vue
View file

@ -48,24 +48,30 @@
<script lang="ts" setup>
import { FetchError } from 'ofetch';
const redirectTo = useRoute().query.redirect_to;
const apiVersion = useRuntimeConfig().public.apiVersion;
const instanceUrl = ref<string | null | undefined>(null);
const instanceUrlInput = ref<string>();
const instanceError = ref<string>();
const requestUrl = useRequestURL();
const apiBase = useCookie("api_base");
const auth = useAuth();
if (auth.accessToken.value) {
//navigateTo(redirectTo ? redirectTo as string : useAppConfig().baseURL as string);
const { status, data: gorbTxt } = await useFetch(`${requestUrl.protocol}//${requestUrl.host}/.well-known/gorb.txt`, { responseType: "text" });
if (status.value == "success" && gorbTxt.value) {
console.log("got gorb.txt:", gorbTxt.value);
const parsed = parseWellKnown(gorbTxt.value as string);
if (parsed.ApiBaseUrl) {
apiBase.value = parsed.ApiBaseUrl;
console.log("set apiBase to:", parsed.ApiBaseUrl);
}
}
onMounted(() => {
const cookie = useCookie("instance_url").value;
instanceUrl.value = cookie;
console.log(cookie);
console.log("set instance url to:", instanceUrl.value);
onMounted(async () => {
const cookie = useCookie("instance_url").value;
instanceUrl.value = cookie;
console.log(cookie);
console.log("set instance url to:", instanceUrl.value);
});
async function selectInstance(e: Event) {
@ -74,14 +80,13 @@ async function selectInstance(e: Event) {
const instanceUrlObj = new URL(`api/v${apiVersion}/stats`, instanceUrlInput.value.endsWith("/") ? instanceUrlInput.value : instanceUrlInput.value + "/");
try {
const res = await $fetch.raw(instanceUrlObj.href);
console.log("instance res:", res);
instanceError.value = "";
const origin = new URL(res.url).origin;
localStorage.setItem("instanceUrl", origin);
instanceUrl.value = origin;
useCookie("instance_url").value = origin;
useCookie("api_base").value = origin + `/api/v${apiVersion}`;
localStorage.setItem("apiBase", origin + `/api/v${apiVersion}`);
if (!apiBase.value) apiBase.value = origin + `/api/v${apiVersion}`;
} catch (error: any) {
if (error instanceof FetchError) {
console.log("Status code:", error.response?.status);