ske087
1f6217d347
Portal: - Replace is_admin boolean with role column (admin/advanced/standard) - Settings UI: 3-tier portal role select + per-app role dropdowns - /portal-return endpoint: re-establishes session from JWT for sub-app back-links - /api/internal/nv-users: internal endpoint for NetworkView user sync - portal/migrate_roles.py: one-time DB migration script - Role badges (admin/advanced/standard) in topbar and settings table DigiServer: - Add editor and viewer roles (portal advanced->editor, standard->viewer) - PlaylistPermission model: grant viewer users edit access to specific playlists - app/utils/access.py: shared editor_required, admin_required, can_edit_playlist helpers - Content routes: editor_required on create/delete, per-playlist permission check on mutations - Admin: playlist_permissions route + template to manage viewer playlist grants - Base template: hide Admin nav for viewers, Portal button (⬡) returns to portal - content_list_new: hide create/delete for viewers; Manage vs View button per permission - manage_playlist_content: view-only mode when user lacks edit permission NetworkView: - backend/src/middleware/rbac.js: requireRole + requireWriteAccess helpers - site_permissions table: one site per advanced user - All mutating routes guarded (admin=all, advanced=assigned site, viewer=read-only) - Portal SSO auto-upsert: user row synced from X-Auth-Role on every request - GET /api/users: merges portal users list with local NV data (all 4 portal users visible) - GET/PUT /api/users/:id/site-permission: assign site to advanced user - Settings Users tab: role badges, site dropdown for advanced, (portal only) indicator - Sidebar: ⬡ Portal button between Settings and Logout - Frontend build: VITE_API_BASE=/networkview/api now set in start-dev.sh IT Assets / Server Monitor: - portal_sso.py updated: map advanced->editor/viewer, standard->readonly - AdminUser model: add editor role + is_editor property
57 lines
2.2 KiB
Python
57 lines
2.2 KiB
Python
from datetime import datetime
|
|
from flask_login import UserMixin
|
|
from app.extensions import db, login_manager
|
|
|
|
|
|
# Valid portal-level roles
|
|
PORTAL_ROLES = ('admin', 'advanced', 'standard')
|
|
# Valid per-app role overrides (same tier names)
|
|
APP_ROLES = ('admin', 'advanced', 'standard')
|
|
|
|
|
|
class PortalUser(UserMixin, db.Model):
|
|
__tablename__ = 'portal_users'
|
|
|
|
id = db.Column(db.Integer, primary_key=True)
|
|
username = db.Column(db.String(80), unique=True, nullable=False, index=True)
|
|
email = db.Column(db.String(200), unique=True, nullable=False)
|
|
password_hash = db.Column(db.String(256), nullable=False)
|
|
# role: 'admin' | 'advanced' | 'standard'
|
|
# (replaces the old is_admin Boolean — kept as property for template compat)
|
|
role = db.Column(db.String(20), nullable=False, default='standard')
|
|
is_active = db.Column(db.Boolean, default=True)
|
|
created_at = db.Column(db.DateTime, default=datetime.utcnow)
|
|
last_login = db.Column(db.DateTime, nullable=True)
|
|
|
|
app_accesses = db.relationship('AppAccess', backref='user', lazy='dynamic', cascade='all, delete-orphan')
|
|
api_keys = db.relationship('ApiKey', backref='user', lazy='dynamic', cascade='all, delete-orphan')
|
|
|
|
@property
|
|
def is_admin(self):
|
|
"""True when portal role is 'admin'. Kept for template/decorator backward compat."""
|
|
return self.role == 'admin'
|
|
|
|
@property
|
|
def is_advanced(self):
|
|
"""True when portal role is 'admin' or 'advanced'."""
|
|
return self.role in ('admin', 'advanced')
|
|
|
|
def get_accessible_apps(self):
|
|
return [a.app_name for a in self.app_accesses.filter_by(is_active=True).all()]
|
|
|
|
def can_access(self, app_name):
|
|
return self.app_accesses.filter_by(app_name=app_name, is_active=True).first() is not None
|
|
|
|
def app_role(self, app_name):
|
|
"""Return the per-app role override, or None if not set."""
|
|
access = self.app_accesses.filter_by(app_name=app_name, is_active=True).first()
|
|
return access.app_role if access else None
|
|
|
|
def __repr__(self):
|
|
return f'<PortalUser {self.username} role={self.role}>'
|
|
|
|
|
|
@login_manager.user_loader
|
|
def load_user(user_id):
|
|
return PortalUser.query.get(int(user_id))
|