diff --git a/LICENCE b/LICENCE
index 954fd0a..1cadf6a 100644
--- a/LICENCE
+++ b/LICENCE
@@ -1,31 +1,57 @@
-“Commons Clause” License Condition v1.0
-
-The Software is provided to you by the Licensor under the
-License, as defined below, subject to the following condition.
-
-Without limiting other conditions in the License, the grant
-of rights under the License will not include, and the License
-does not grant to you, the right to Sell the Software.
-
-For purposes of the foregoing, “Sell” means practicing any or
-all of the rights granted to you under the License to provide
-to third parties, for a fee or other consideration (including
-without limitation fees for hosting or consulting/ support
-services related to the Software), a product or service whose
-value derives, entirely or substantially, from the functionality
-of the Software. Any license notice or attribution required by
-the License must also include this Commons Clause License
-Condition notice.
-
Software: Cosmos-Server
-License: Apache 2.0 with Commons Clause
+License: Apache 2.0 with Commons Clause and Anti Tampering Clause
Licensor: Yann Stepienik
+---------------------------------------------------------------------
+
+ “Commons Clause” License Condition v1.0
+
+ The Software is provided to you by the Licensor under the
+ License, as defined below, subject to the following condition.
+
+ Without limiting other conditions in the License, the grant
+ of rights under the License will not include, and the License
+ does not grant to you, the right to Sell the Software.
+
+ For purposes of the foregoing, “Sell” means practicing any or
+ all of the rights granted to you under the License to provide
+ to third parties, for a fee or other consideration (including
+ without limitation fees for hosting or consulting/ support
+ services related to the Software), a product or service whose
+ value derives, entirely or substantially, from the functionality
+ of the Software. Any license notice or attribution required by
+ the License must also include this Commons Clause License
+ Condition notice.
---------------------------------------------------------------------
+ "Anti Tampering Clause” License Condition v1.0
+
+ Notwithstanding any provision of the Apache License 2.0, if the User
+ (or any party receiving or distributing derivative works, services,
+ or anything of value from the User related to the Software), directly
+ or indirectly, seeks to tamper with, alter, circumvent, or avoid
+ compliance with any subscription, paywall, feature restriction, or any
+ other licensing mechanism built into the Software or its usage, the
+ License granted under the Apache License 2.0 shall automatically and
+ immediately terminate, and access to the Software shall be withdrawn
+ with immediate effect. Upon such termination, any and all rights
+ established under the Apache License 2.0 shall be null and void.
+
+ Tampering includes but is not limited to: (a) removing, disabling,
+ or circumventing any license key or other copy protection mechanism,
+ (b) redistributing parts or all of a feature that was intended
+ to be a paid feature, without keeping the restrictions, limitations,
+ or other licensing mechanisms with it(c) disabling, circumventing, or
+ avoiding any feature of the Software that is intended to enforce usage or
+ copy restrictions, or (d) providing or distributing any information
+ or code that enables disabling, circumvention, or avoidance of any
+ feature of the Software that is intended to enforce usage or copy
+ restrictions.
+
+---------------------------------------------------------------------
Apache License
Version 2.0, January 2004
diff --git a/changelog.md b/changelog.md
index 1f51c44..ad8ed2b 100644
--- a/changelog.md
+++ b/changelog.md
@@ -7,6 +7,8 @@
- Added Constellation
- DNS Challenge is now used for all certificates when enabled
- Rework headers for better compatibility
+ - Improve experience for non-admin users
+ - Fix bug with redirect on logout
## Version 0.9.20 - 0.9.21
- Add option to disable CORS hardening (with empty value)
diff --git a/cla.md b/cla.md
index 147f9d2..22a970d 100644
--- a/cla.md
+++ b/cla.md
@@ -2,7 +2,7 @@ Cosmos Software Grant and Contributor License Agreement (“Agreement”)
This agreement is based on the Apache Software Foundation Contributor License Agreement. (v r190612)
-Thank you for your interest in software projects stewarded by Raintank, Inc. dba Cosmos (“Cosmos”). In order to clarify the intellectual property license granted with Contributions from any person or entity, Cosmos must have a Contributor License Agreement (CLA) on file that has been agreed to by each Contributor, indicating agreement to the license terms below. This license is for your protection as a Contributor as well as the protection of Cosmos and its users; it does not change your rights to use your own Contributions for any other purpose. This Agreement allows an individual to contribute to Cosmos on that individual’s own behalf, or an entity (the “Corporation”) to submit Contributions to Cosmos, to authorize Contributions submitted by its designated employees to Cosmos, and to grant copyright and patent licenses thereto.
+Thank you for your interest in dba Cosmos (“Cosmos”). In order to clarify the intellectual property license granted with Contributions from any person or entity, Cosmos must have a Contributor License Agreement (CLA) on file that has been agreed to by each Contributor, indicating agreement to the license terms below. This license is for your protection as a Contributor as well as the protection of Cosmos and its users; it does not change your rights to use your own Contributions for any other purpose. This Agreement allows an individual to contribute to Cosmos on that individual’s own behalf, or an entity (the “Corporation”) to submit Contributions to Cosmos, to authorize Contributions submitted by its designated employees to Cosmos, and to grant copyright and patent licenses thereto.
You accept and agree to the following terms and conditions for Your present and future Contributions submitted to Cosmos. Except for the license granted herein to Cosmos and recipients of software distributed by Cosmos, You reserve all right, title, and interest in and to Your Contributions.
diff --git a/client/src/layout/MainLayout/Drawer/DrawerContent/Navigation/NavGroup.jsx b/client/src/layout/MainLayout/Drawer/DrawerContent/Navigation/NavGroup.jsx
index 9c001af..77a1365 100644
--- a/client/src/layout/MainLayout/Drawer/DrawerContent/Navigation/NavGroup.jsx
+++ b/client/src/layout/MainLayout/Drawer/DrawerContent/Navigation/NavGroup.jsx
@@ -47,7 +47,7 @@ const NavGroup = ({ item }) => {
}
sx={{ mb: drawerOpen ? 1.5 : 0, py: 0, zIndex: 0 }}
>
- {navCollapse}
+ {navCollapse}
);
};
diff --git a/client/src/layout/MainLayout/Drawer/DrawerContent/Navigation/NavItem.jsx b/client/src/layout/MainLayout/Drawer/DrawerContent/Navigation/NavItem.jsx
index 77a3df0..deb2ddf 100644
--- a/client/src/layout/MainLayout/Drawer/DrawerContent/Navigation/NavItem.jsx
+++ b/client/src/layout/MainLayout/Drawer/DrawerContent/Navigation/NavItem.jsx
@@ -9,6 +9,7 @@ import { Avatar, Chip, ListItemButton, ListItemIcon, ListItemText, Typography }
// project import
import { activeItem } from '../../../../../store/reducers/menu';
+import { useClientInfos } from '../../../../../utils/hooks';
// ==============================|| NAVIGATION - LIST ITEM ||============================== //
@@ -17,6 +18,12 @@ const NavItem = ({ item, level }) => {
const dispatch = useDispatch();
const menu = useSelector((state) => state.menu);
const { drawerOpen, openItem } = menu;
+ const {role} = useClientInfos();
+ const isAdmin = role === 1;
+
+ if (item.adminOnly && !isAdmin) {
+ return null;
+ }
let itemTarget = '_self';
if (item.target) {
diff --git a/client/src/menu-items/pages.jsx b/client/src/menu-items/pages.jsx
index a2e4068..171c841 100644
--- a/client/src/menu-items/pages.jsx
+++ b/client/src/menu-items/pages.jsx
@@ -20,7 +20,8 @@ const pages = {
title: 'ServApps',
type: 'item',
url: '/cosmos-ui/servapps',
- icon: AppstoreOutlined
+ icon: AppstoreOutlined,
+ adminOnly: true
},
{
id: 'url',
@@ -43,6 +44,7 @@ const pages = {
type: 'item',
url: '/cosmos-ui/config-users',
icon: icons.ProfileOutlined,
+ adminOnly: true
},
{
id: 'openid',
@@ -50,6 +52,7 @@ const pages = {
type: 'item',
url: '/cosmos-ui/openid-manage',
icon: PicLeftOutlined,
+ adminOnly: true
},
{
id: 'config',
diff --git a/client/src/pages/authentication/Logoff.jsx b/client/src/pages/authentication/Logoff.jsx
index 635efc0..3e7924f 100644
--- a/client/src/pages/authentication/Logoff.jsx
+++ b/client/src/pages/authentication/Logoff.jsx
@@ -9,7 +9,7 @@ import AuthWrapper from './AuthWrapper';
import { useEffect } from 'react';
import * as API from '../../api';
-import { redirectTo } from '../../utils/indexs';
+import { redirectTo, redirectToLocal } from '../../utils/indexs';
// ================================|| REGISTER ||================================ //
diff --git a/client/src/pages/config/users/configman.jsx b/client/src/pages/config/users/configman.jsx
index 20e90bf..e3a57af 100644
--- a/client/src/pages/config/users/configman.jsx
+++ b/client/src/pages/config/users/configman.jsx
@@ -31,6 +31,7 @@ import { TwitterPicker
// TODO: Remove circular deps
import {SetPrimaryColor, SetSecondaryColor} from '../../../App';
+import { useClientInfos } from '../../../utils/hooks';
const ConfigManagement = () => {
const [config, setConfig] = React.useState(null);
@@ -38,6 +39,8 @@ const ConfigManagement = () => {
const [openResartModal, setOpenRestartModal] = React.useState(false);
const [uploadingBackground, setUploadingBackground] = React.useState(false);
const [saveLabel, setSaveLabel] = React.useState("Save");
+ const {role} = useClientInfos();
+ const isAdmin = role === 1;
function refresh() {
API.config.get().then((res) => {
@@ -62,9 +65,9 @@ const ConfigManagement = () => {
refresh();
}}>Refresh
- } onClick={() => {
+ {isAdmin && } onClick={() => {
setOpenRestartModal(true);
- }}>Restart Server
+ }}>Restart Server}
{config && <>
@@ -186,7 +189,7 @@ const ConfigManagement = () => {
{(formik) => (
)}
diff --git a/client/src/pages/constellation/addDevice.jsx b/client/src/pages/constellation/addDevice.jsx
index ea2aea8..1000dbc 100644
--- a/client/src/pages/constellation/addDevice.jsx
+++ b/client/src/pages/constellation/addDevice.jsx
@@ -1,5 +1,5 @@
// material-ui
-import { Alert, Button, Stack, TextField } from '@mui/material';
+import { Alert, Button, InputLabel, OutlinedInput, Stack, TextField } from '@mui/material';
import Dialog from '@mui/material/Dialog';
import DialogActions from '@mui/material/DialogActions';
import DialogContent from '@mui/material/DialogContent';
@@ -15,6 +15,7 @@ import * as API from '../../api';
import { CosmosCheckbox, CosmosFormDivider, CosmosInputText, CosmosSelect } from '../config/users/formShortcuts';
import { DownloadFile } from '../../api/downloadButton';
import QRCode from 'qrcode';
+import { useClientInfos } from '../../utils/hooks';
const getDocker = (data, isCompose) => {
let lighthouses = '';
@@ -73,10 +74,12 @@ docker run -d \\
}
-const AddDeviceModal = ({ users, config, isAdmin, refreshConfig, devices }) => {
+const AddDeviceModal = ({ users, config, refreshConfig, devices }) => {
const [openModal, setOpenModal] = useState(false);
const [isDone, setIsDone] = useState(null);
const canvasRef = React.useRef(null);
+ const {role, nickname} = useClientInfos();
+ const isAdmin = role === 1;
let firstIP = "192.168.201.2/24";
if (devices && devices.length > 0) {
@@ -116,7 +119,7 @@ const AddDeviceModal = ({ users, config, isAdmin, refreshConfig, devices }) => {