jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Move API_ORIGIN into constants.js

Browse Source
This commit is contained in:
Johannes Zellner
2025-03-03 11:22:56 +01:00
parent 6c674e86e5
commit ef0a9a4a1e
37 changed files with 196 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dashboard/src/models/AppsModel.js
+20 -21
View File
@@ -1,5 +1,5 @@
import { APP_TYPES, PROXY_APP_ID, HSTATES, ISTATES, RSTATES } from '../constants.js';
import { API_ORIGIN, APP_TYPES, PROXY_APP_ID, HSTATES, ISTATES, RSTATES } from '../constants.js';
import { fetcher } from 'pankow';
import { sleep } from 'pankow/utils';
import moment from 'moment';
@@ -66,12 +66,11 @@ function appProgressMessage(app) {
function create() {
const accessToken = localStorage.token;
const origin = import.meta.env.VITE_API_ORIGIN || window.location.origin;
async function getTask(appId) {
let error, result;
try {
result = await fetcher.get(`${origin}/api/v1/apps/${appId}/task`, { access_token: accessToken });
result = await fetcher.get(`${API_ORIGIN}/api/v1/apps/${appId}/task`, { access_token: accessToken });
} catch (e) {
error = e;
}
@@ -112,7 +111,7 @@ function create() {
let error, result;
try {
result = await fetcher.post(`${origin}/api/v1/apps`, data, { access_token: accessToken });
result = await fetcher.post(`${API_ORIGIN}/api/v1/apps`, data, { access_token: accessToken });
} catch (e) {
error = e;
}
@@ -127,7 +126,7 @@ function create() {
async list() {
let error, result;
try {
result = await fetcher.get(`${origin}/api/v1/apps`, { access_token: accessToken });
result = await fetcher.get(`${API_ORIGIN}/api/v1/apps`, { access_token: accessToken });
} catch (e) {
error = e;
}
@@ -137,7 +136,7 @@ function create() {
for (const app of result.body.apps) {
app.ssoAuth = app.sso && (app.manifest.addons['ldap'] || app.manifest.addons['oidc'] || app.manifest.addons['proxyAuth']); // checking app.sso first ensures app.manifest.addons is not null
app.type = app.manifest.id === PROXY_APP_ID ? APP_TYPES.PROXIED : APP_TYPES.APP;
app.iconUrl = app.iconUrl ? (origin + app.iconUrl + '?ts=' + (new Date(app.ts).getTime())) : `${origin}/img/appicon_fallback.png`; // calculate full icon url with cache busting
app.iconUrl = app.iconUrl ? `${API_ORIGIN}${app.iconUrl}?ts=${new Date(app.ts).getTime()}` : `${API_ORIGIN}/img/appicon_fallback.png`; // calculate full icon url with cache busting
// only fetch if we have permissions and a taskId is set/active
if (!app.taskId || (app.accessLevel !== 'operator' && app.accessLevel !== 'admin')) {
@@ -164,7 +163,7 @@ function create() {
async get(id) {
let error, result;
try {
result = await fetcher.get(`${origin}/api/v1/apps/${id}`, { access_token: accessToken });
result = await fetcher.get(`${API_ORIGIN}/api/v1/apps/${id}`, { access_token: accessToken });
} catch (e) {
error = e;
}
@@ -175,7 +174,7 @@ function create() {
app.ssoAuth = app.sso && (app.manifest.addons['ldap'] || app.manifest.addons['oidc'] || app.manifest.addons['proxyAuth']); // checking app.sso first ensures app.manifest.addons is not null
app.type = app.manifest.id === PROXY_APP_ID ? APP_TYPES.PROXIED : APP_TYPES.APP;
app.iconUrl = app.iconUrl ? (origin + app.iconUrl + '?ts=' + (new Date(app.ts).getTime())) : null; // calculate full icon url with cache busting
app.iconUrl = app.iconUrl ? `${API_ORIGIN}${app.iconUrl}?ts=${new Date(app.ts).getTime()}` : `${API_ORIGIN}/img/appicon_fallback.png`; // calculate full icon url with cache busting
// only fetch if we have permissions and a taskId is set/active
if (!app.taskId || (app.accessLevel !== 'operator' && app.accessLevel !== 'admin')) {
@@ -200,7 +199,7 @@ function create() {
async restart(id) {
let result;
try {
result = await fetcher.post(`${origin}/api/v1/apps/${id}/restart`, null, { access_token: accessToken });
result = await fetcher.post(`${API_ORIGIN}/api/v1/apps/${id}/restart`, null, { access_token: accessToken });
} catch (e) {
return [e];
}
@@ -210,7 +209,7 @@ function create() {
while(true) {
let result;
try {
result = await fetcher.get(`${origin}/api/v1/apps/${id}`, { access_token: accessToken });
result = await fetcher.get(`${API_ORIGIN}/api/v1/apps/${id}`, { access_token: accessToken });
} catch (e) {
return [e];
}
@@ -225,7 +224,7 @@ function create() {
async start(id) {
let result;
try {
result = await fetcher.post(`${origin}/api/v1/apps/${id}/start`, {}, { access_token: accessToken });
result = await fetcher.post(`${API_ORIGIN}/api/v1/apps/${id}/start`, {}, { access_token: accessToken });
} catch (e) {
return [e];
}
@@ -237,7 +236,7 @@ function create() {
async stop(id) {
let result;
try {
result = await fetcher.post(`${origin}/api/v1/apps/${id}/stop`, {}, { access_token: accessToken });
result = await fetcher.post(`${API_ORIGIN}/api/v1/apps/${id}/stop`, {}, { access_token: accessToken });
} catch (e) {
return [e];
}
@@ -249,7 +248,7 @@ function create() {
async configure(id, setting, data) {
let result;
try {
result = await fetcher.post(`${origin}/api/v1/apps/${id}/configure/${setting}`, data, { access_token: accessToken });
result = await fetcher.post(`${API_ORIGIN}/api/v1/apps/${id}/configure/${setting}`, data, { access_token: accessToken });
} catch (e) {
return [e];
}
@@ -260,7 +259,7 @@ function create() {
async uninstall(id) {
let result;
try {
result = await fetcher.post(`${origin}/api/v1/apps/${id}/uninstall`, {}, { access_token: accessToken });
result = await fetcher.post(`${API_ORIGIN}/api/v1/apps/${id}/uninstall`, {}, { access_token: accessToken });
} catch (e) {
return [e];
}
@@ -271,7 +270,7 @@ function create() {
async getEvents(id) {
let result;
try {
result = await fetcher.get(`${origin}/api/v1/apps/${id}/eventlog`, { page: 1, per_page: 100, access_token: accessToken });
result = await fetcher.get(`${API_ORIGIN}/api/v1/apps/${id}/eventlog`, { page: 1, per_page: 100, access_token: accessToken });
} catch (e) {
return [e];
}
@@ -282,7 +281,7 @@ function create() {
async checkForUpdates(id) {
let result;
try {
result = await fetcher.post(`${origin}/api/v1/apps/${id}/check_for_updates`, {}, { access_token: accessToken });
result = await fetcher.post(`${API_ORIGIN}/api/v1/apps/${id}/check_for_updates`, {}, { access_token: accessToken });
} catch (e) {
return [e];
}
@@ -298,7 +297,7 @@ function create() {
let result;
try {
result = await fetcher.post(`${origin}/api/v1/apps/${id}/update`, data, { access_token: accessToken });
result = await fetcher.post(`${API_ORIGIN}/api/v1/apps/${id}/update`, data, { access_token: accessToken });
} catch (e) {
return [e];
}
@@ -310,7 +309,7 @@ function create() {
// we fetch probably enough to avoid pagination
let result;
try {
result = await fetcher.get(`${origin}/api/v1/apps/${id}/backups`, { page: 1, per_page: 100, access_token: accessToken });
result = await fetcher.get(`${API_ORIGIN}/api/v1/apps/${id}/backups`, { page: 1, per_page: 100, access_token: accessToken });
} catch (e) {
return [e];
}
@@ -321,7 +320,7 @@ function create() {
async backup(id) {
let result;
try {
result = await fetcher.post(`${origin}/api/v1/apps/${id}/backup`, {}, { access_token: accessToken });
result = await fetcher.post(`${API_ORIGIN}/api/v1/apps/${id}/backup`, {}, { access_token: accessToken });
} catch (e) {
return [e];
}
@@ -332,7 +331,7 @@ function create() {
async updateBackup(id, backupId, label, preserveSecs) {
let result;
try {
result = await fetcher.post(`${origin}/api/v1/apps/${id}/backups/${backupId}`, { label, preserveSecs }, { access_token: accessToken });
result = await fetcher.post(`${API_ORIGIN}/api/v1/apps/${id}/backups/${backupId}`, { label, preserveSecs }, { access_token: accessToken });
} catch (e) {
return [e];
}
@@ -343,7 +342,7 @@ function create() {
async restore(id, backupId) {
let result;
try {
result = await fetcher.post(`${origin}/api/v1/apps/${id}/restore`, { backupId }, { access_token: accessToken });
result = await fetcher.post(`${API_ORIGIN}/api/v1/apps/${id}/restore`, { backupId }, { access_token: accessToken });
} catch (e) {
return [e];
}