mirror/api
1
0
Fork 0
mirror of https://github.com/unraid/api.git synced 2026-01-06 00:30:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

feat(web): finalize api cors error & settings field

Browse Source
This commit is contained in:
Zack Spear
2023-09-11 13:05:11 -07:00
parent 46626a58e4
commit 5e67b3ac98
2 changed files with 25 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
web/store/unraidApi.ts
View File

@@ -11,7 +11,7 @@ import { defineStore, createPinia, setActivePinia } from 'pinia';
import { UserProfileLink } from 'types/userProfile';
import { WebguiUnraidApiCommand } from '~/composables/services/webgui';
import { GRAPHQL, PLUGIN_SETTINGS } from '~/helpers/urls';
import { GRAPHQL, SETTINGS_MANAGMENT_ACCESS } from '~/helpers/urls';
import { useErrorsStore } from '~/store/errors';
import { useServerStore } from '~/store/server';
@@ -38,24 +38,6 @@ export const useUnraidApiStore = defineStore('unraidApi', () => {
if (apiResponse) {
// we have a response, so we're online
unraidApiStatus.value = 'online';
/**
* @todo remove TEMPORARILY FORCING THIS ERROR
*/
const msg = `<p>The CORS policy for this site does not allow access from the specified Origin'./p><p>If you are using a reverse proxy, you need to copy your origin <strong class="font-mono"><em>${window.location.origin}</em></strong> and paste it into the "Extra Origins" list in the Connect settings.</p>`;
errorsStore.setError({
heading: 'Unraid API • CORS Error',
message: msg,
level: 'error',
ref: 'unraidApiCorsError',
type: 'unraidApiGQL',
actions: [
{
href: `${PLUGIN_SETTINGS.toString()}#extraOriginsSettings`,
icon: CogIcon,
text: 'Go to Connect Settings',
}
],
});
}
}
});
@@ -113,7 +95,7 @@ export const useUnraidApiStore = defineStore('unraidApi', () => {
}
if (error.error.message && error.error.message.includes(ERROR_CORS_403)) {
prioritizeCorsError = true;
const msg = `<p>${error.error.message}</p><p>If you are using a reverse proxy, you need to copy your origin <strong class="font-mono"><em>${window.location.origin}</em></strong> and paste it into the "Extra Origins" list in the Connect settings.</p>`;
const msg = `<p>The CORS policy for this site does not allow access from the specified Origin.</p><p>If you are using a reverse proxy, you need to copy your origin <strong class="font-mono"><em>${window.location.origin}</em></strong> and paste it into the "Extra Origins" list in the Connect settings.</p>`;
errorsStore.setError({
heading: 'Unraid API • CORS Error',
message: msg,
@@ -122,7 +104,7 @@ export const useUnraidApiStore = defineStore('unraidApi', () => {
type: 'unraidApiGQL',
actions: [
{
href: `${PLUGIN_SETTINGS.toString()}#extraOriginsSettings`,
href: `${SETTINGS_MANAGMENT_ACCESS.toString()}#extraOriginsSettings`,
icon: CogIcon,
text: 'Go to Connect Settings',
}