Fix auth.py: redirect to frontend instead of rendering templates
This commit is contained in:
parent
e17231eb75
commit
616ab44414
104
auth.py
104
auth.py
|
|
@ -1,87 +1,37 @@
|
||||||
from flask import Blueprint, render_template, redirect, url_for, request, flash
|
from flask import Blueprint, redirect, request, current_app, jsonify
|
||||||
from flask_login import login_user, logout_user, login_required, current_user
|
from flask_login import logout_user, login_required
|
||||||
from models import db, User
|
|
||||||
from container_manager import ContainerManager
|
|
||||||
|
|
||||||
auth_bp = Blueprint('auth', __name__)
|
auth_bp = Blueprint('auth', __name__)
|
||||||
|
|
||||||
@auth_bp.route('/login', methods=['GET', 'POST'])
|
|
||||||
def login():
|
|
||||||
"""User-Login"""
|
|
||||||
if request.method == 'POST':
|
|
||||||
username = request.form.get('username')
|
|
||||||
password = request.form.get('password')
|
|
||||||
|
|
||||||
user = User.query.filter_by(username=username).first()
|
|
||||||
|
|
||||||
if user and user.check_password(password):
|
|
||||||
login_user(user)
|
|
||||||
|
|
||||||
# Container spawnen wenn noch nicht vorhanden
|
|
||||||
if not user.container_id:
|
|
||||||
try:
|
|
||||||
container_mgr = ContainerManager()
|
|
||||||
container_id, port = container_mgr.spawn_container(user.id, user.username)
|
|
||||||
user.container_id = container_id
|
|
||||||
user.container_port = port
|
|
||||||
db.session.commit()
|
|
||||||
except Exception as e:
|
|
||||||
flash(f'Container-Start fehlgeschlagen: {str(e)}', 'error')
|
|
||||||
return redirect(url_for('auth.login'))
|
|
||||||
|
|
||||||
flash('Login erfolgreich!', 'success')
|
|
||||||
return redirect(url_for('dashboard'))
|
|
||||||
else:
|
|
||||||
flash('Ungültige Anmeldedaten', 'error')
|
|
||||||
|
|
||||||
return render_template('login.html')
|
|
||||||
|
|
||||||
@auth_bp.route('/signup', methods=['GET', 'POST'])
|
def get_frontend_url():
|
||||||
|
"""Generiert die Frontend-URL basierend auf der Konfiguration"""
|
||||||
|
scheme = current_app.config.get('PREFERRED_URL_SCHEME', 'https')
|
||||||
|
base_domain = current_app.config.get('BASE_DOMAIN', 'localhost')
|
||||||
|
spawner_subdomain = current_app.config.get('SPAWNER_SUBDOMAIN', 'coder')
|
||||||
|
|
||||||
|
if base_domain == 'localhost':
|
||||||
|
# Lokale Entwicklung - Frontend läuft auf Port 3000
|
||||||
|
return 'http://localhost:3000'
|
||||||
|
else:
|
||||||
|
return f"{scheme}://{spawner_subdomain}.{base_domain}"
|
||||||
|
|
||||||
|
|
||||||
|
@auth_bp.route('/login', methods=['GET'])
|
||||||
|
def login():
|
||||||
|
"""Redirect zum Frontend Login"""
|
||||||
|
return redirect(f"{get_frontend_url()}/login")
|
||||||
|
|
||||||
|
|
||||||
|
@auth_bp.route('/signup', methods=['GET'])
|
||||||
def signup():
|
def signup():
|
||||||
"""User-Registrierung"""
|
"""Redirect zum Frontend Signup"""
|
||||||
if request.method == 'POST':
|
return redirect(f"{get_frontend_url()}/signup")
|
||||||
username = request.form.get('username')
|
|
||||||
email = request.form.get('email')
|
|
||||||
password = request.form.get('password')
|
|
||||||
|
|
||||||
# Prüfe ob User existiert
|
|
||||||
if User.query.filter_by(username=username).first():
|
|
||||||
flash('Username bereits vergeben', 'error')
|
|
||||||
return redirect(url_for('auth.signup'))
|
|
||||||
|
|
||||||
if User.query.filter_by(email=email).first():
|
|
||||||
flash('Email bereits registriert', 'error')
|
|
||||||
return redirect(url_for('auth.signup'))
|
|
||||||
|
|
||||||
# Neuen User anlegen
|
|
||||||
user = User(username=username, email=email)
|
|
||||||
user.set_password(password)
|
|
||||||
db.session.add(user)
|
|
||||||
db.session.commit()
|
|
||||||
|
|
||||||
# Container aus Template bauen und starten
|
|
||||||
try:
|
|
||||||
container_mgr = ContainerManager()
|
|
||||||
container_id, port = container_mgr.spawn_container(user.id, user.username)
|
|
||||||
user.container_id = container_id
|
|
||||||
user.container_port = port
|
|
||||||
db.session.commit()
|
|
||||||
|
|
||||||
flash('Registrierung erfolgreich! Container wird gestartet...', 'success')
|
|
||||||
login_user(user)
|
|
||||||
return redirect(url_for('dashboard'))
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
db.session.delete(user)
|
|
||||||
db.session.commit()
|
|
||||||
flash(f'Registrierung fehlgeschlagen: {str(e)}', 'error')
|
|
||||||
|
|
||||||
return render_template('signup.html')
|
|
||||||
|
|
||||||
@auth_bp.route('/logout')
|
@auth_bp.route('/logout')
|
||||||
@login_required
|
@login_required
|
||||||
def logout():
|
def logout():
|
||||||
"""User-Logout"""
|
"""User-Logout (für Session-basierte Auth, falls verwendet)"""
|
||||||
logout_user()
|
logout_user()
|
||||||
flash('Erfolgreich abgemeldet', 'success')
|
return redirect(f"{get_frontend_url()}/login")
|
||||||
return redirect(url_for('auth.login'))
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user