updated login references #25

README.md

@@ -23,6 +23,13 @@ version.py is used to define the version number used by any automation
  'Docker Compose Up' is using docker-compose.yml and will start a production server including the current version number
  'Docker Compose Debug Up' composes a docker container for debugging also including the version number
 
+### nice2know for debugging local docker containers
+1. make sure /var/run/docker.sock has group "docker" with rw permissions and user is assigned to group docker
+2. docker container IP != local IP - might wanna use the following commands to find the correct IP
+ - ```docker container list```
+ - ```docker inspect   -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}  container_name_or_id```
+default could be http://172.18.0.2:5000
+
 ## tasks.json
 does trigger the docker-compose commands used for 2 launch configurations.
 This is also where the respective ENV vars can be changed.

church_web_helper/app.py

@@ -54,15 +54,23 @@ def index():
 
 @app.before_request
 def check_session():
-    if request.endpoint != "login":
-        if "ct_api" not in session:
-            return redirect(url_for("login"))
+    """Session variable should contain ct_api and communi_api.
+    If not a redirect to respective login pages should be executed
+    """
+    if request.endpoint != "login_ct" and request.endpoint != "login_communi": 
+        #Check CT Login
+        if not session.get("ct_api"):
+            return redirect(url_for("login_ct"))
         elif not session["ct_api"].who_am_i():
-            return redirect(url_for("login"))
-
-
-@app.route("/login_churchtools", methods=["GET", "POST"])
-def login():
+            return redirect(url_for("login_ct"))
+        #Check Communi Login
+        if not session.get("communi_api"):
+            return redirect(url_for("login_communi"))
+        elif not session["communi_api"].who_am_i():
+            return redirect(url_for("login_communi"))
+
+@app.route("/ct/login", methods=["GET", "POST"])
+def login_ct():
     """
     Update login information for CT
     :return:
@@ -91,7 +99,7 @@ def login():
         )
 
 
-@app.route("/login_communi", methods=["GET", "POST"])
+@app.route("/communi/login", methods=["GET", "POST"])
 def login_communi():
     """
     Update login information for Communi Login

church_web_helper/templates/login_churchtools.html

@@ -14,7 +14,7 @@ <h2>Welcome {{ user.firstName }} {{ user.lastName }}</h2>
     </br></br>
     ReSubmit to change the authenticated user or server
     {% endif %}
-    <form action="/login_churchtools" method="POST">
+    <form action="/ct/login" method="POST">
         <div class="form-group">
             <label for="ct_domain">Domain:</label>
             <input type="text" id="ct_domain" class="form-control" name="ct_domain"

church_web_helper/templates/login_communi.html

@@ -15,7 +15,7 @@ <h2>Welcome {{ user.vorname }} {{ user.nachname }}</h2>
     ReSubmit to change the authenticated user or server
     {% endif %}
 
-    <form action="/login_communi" method="POST">
+    <form action="/communi/login" method="POST">
         <div class="form-group">
             <label for="communi_server">Communi Server:</label>
             <input type="text" id="communi_server" class="form-control" name="communi_server"

church_web_helper/templates/navbar.html

@@ -31,12 +31,12 @@
         <a class="nav-link dropdown-toggle" role="button" data-bs-toggle="dropdown" aria-expanded="false">Logins</a>
         <ul class="dropdown-menu dropdown-menu-end">
           <li class="nav-item">
-            <a class="nav-link {% if request.path == '/login_churchtools' %}{% endif %}" aria-current="page"
-              href="/login_churchtools">ChurchTools Login</a>
+            <a class="nav-link {% if request.path == '/ct/login' %}{% endif %}" aria-current="page"
+              href="/ct/login">ChurchTools Login</a>
           </li>
           <li class="nav-item">
-            <a class="nav-link {% if request.path == '/login_communi' %}{% endif %}" aria-current="page"
-              href="/login_communi">Communi Login</a>
+            <a class="nav-link {% if request.path == '/communi/login' %}{% endif %}" aria-current="page"
+              href="/communi/login">Communi Login</a>
           </li>
         </ul>
       </li>

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "church-web-helper"
-version = "1.6.1"
+version = "1.6.2"
 description = "A python package to make use of ChurchTools API and Communi API with a docker packaged WebUI"
 authors = [
     "bensteUEM",

version.py

@@ -1,6 +1,6 @@
 import os
 
-VERSION = '1.6.1'
+VERSION = '1.6.2'
 __version__ = VERSION
 
 if __name__ == '__main__':