Merge branch 'fix-sso-1929' of github.com:Diman0/Mailu into fix-sso-1929

core/admin/mailu/__init__.py

@@ -11,7 +11,7 @@ import hmac
 def create_app_from_config(config):
     """ Create a new application based on the given configuration
     """
-    app = flask.Flask(__name__)
+    app = flask.Flask(__name__, static_folder='static_files', static_url_path='')
     app.cli.add_command(manage.mailu)
 
     # Bootstrap is used for error display and flash messages
@@ -62,7 +62,6 @@ def create_app_from_config(config):
     app.register_blueprint(ui.ui, url_prefix='/ui')
     app.register_blueprint(internal.internal, url_prefix='/internal')
     app.register_blueprint(sso.sso, url_prefix='/sso')
-    app.register_blueprint(static_files.static, url_prefix='/static')
     return app
 
 

core/admin/mailu/sso/__init__.py

@@ -1,5 +1,5 @@
 from flask import Blueprint
 
-sso = Blueprint('sso', __name__, static_folder='static', template_folder='templates')
+sso = Blueprint('sso', __name__, template_folder='templates')
 
 from mailu.sso.views import *

core/admin/mailu/sso/views/base.py

@@ -22,7 +22,7 @@ def login():
 
     if form.validate_on_submit():
         if str(form.target.data) == 'Admin':
-            endpoint = 'ui.index'
+            endpoint = 'ui.user_settings'
             destination = app.config['WEB_ADMIN']
         elif str(form.target.data) == 'Webmail':
             endpoint = 'ui.webmail'
@@ -44,4 +44,4 @@ def login():
 def logout():
     flask_login.logout_user()
     flask.session.destroy()
-    return flask.redirect(flask.url_for('.login'))
+    return flask.redirect(flask.url_for('.login'))

core/admin/mailu/static_files/__init__.py

@@ -1,5 +0,0 @@
-from flask import Blueprint
-
-static = Blueprint('static', __name__, static_folder='static', static_url_path='/static')
-
-

core/nginx/Dockerfile

@@ -16,7 +16,7 @@ COPY conf /conf
 COPY static /static
 COPY *.py /
 
-RUN gzip -k9 /static/*.ico /static/*.txt
+RUN gzip -k9 /static/*.ico /static/*.txt; chmod a+rX -R /static
 
 EXPOSE 80/tcp 443/tcp 110/tcp 143/tcp 465/tcp 587/tcp 993/tcp 995/tcp 25/tcp 10025/tcp 10143/tcp
 VOLUME ["/certs"]

core/nginx/conf/nginx.conf

@@ -129,16 +129,10 @@ http {
 
       # Actual logic
       {% if ADMIN == 'true' or WEBMAIL != 'none' %}
-      location ^~ /sso {
+      location ~ ^/(sso|static) {
         include /etc/nginx/proxy.conf;
         proxy_pass http://$admin;
       }
-
-      location ^~ /static {
-        include /etc/nginx/proxy.conf;
-        rewrite ^/static/(.*) /static/static/$1 break;
-        proxy_pass http://$admin;
-      }
       {% endif %}
 
       {% if WEB_WEBMAIL != '/' and WEBROOT_REDIRECT != 'none' %}