Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-09 07:45:22 +02:00
Code Issues Releases Activity

fix(app): skip authorizations in CE [EE-2423] (#6431)

Browse source 
* feat(app): check auth on ee only

* refactor(features): load edition from env var

* fix(containers): show empty message if no containers
This commit is contained in:
Chaim Lev-Ari 2022-01-24 08:02:23 +02:00 • committed by GitHub
parent 2c4c638f46
commit b588d901cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 35 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/portainer/feature-flags/feature-flags.service.ts
View file

@ -10,7 +10,7 @@ const state: ServiceState = {
features: <Record<FeatureId, Edition>>{},
};
export async function init(edition: Edition = Edition.CE) {
export async function init(edition: Edition) {
// will be loaded on runtime
const currentEdition = edition;
const features = {

13
app/portainer/hooks/useUser.tsx
View file

@ -33,13 +33,20 @@ export function useUser() {
return context;
}
export function useAuthorizations(authorizations: string | string[]) {
export function useAuthorizations(
authorizations: string | string[],
adminOnlyCE = false
) {
const authorizationsArray =
typeof authorizations === 'string' ? [authorizations] : authorizations;
const { user } = useUser();
const { params } = useCurrentStateAndParams();
if (process.env.PORTAINER_EDITION === 'CE') {
return !adminOnlyCE || isAdmin(user);
}
const { endpointId } = params;
if (!endpointId) {
return false;
@ -118,6 +125,6 @@ export function UserProvider({ children }: UserProviderProps) {
}
}
function isAdmin(user: UserViewModel): boolean {
return user.Role === 1;
function isAdmin(user?: UserViewModel | null) {
return !!user && user.Role === 1;
}