🐛 (src/): fix logout function

pyproject.toml

@@ -12,6 +12,7 @@ flask = "^3.0.3"
 authlib = "^1.3.1"
 python-dotenv = "^1.0.1"
 redis = "^5.0.8"
+flask-socketio = "^5.4.1"
 
 
 [tool.poetry.group.docs.dependencies]

src/app.py

@@ -1,6 +1,7 @@
 from logging.config import dictConfig
 from authlib.integrations.flask_client import OAuth
 from flask import Flask
+from flask_socketio import SocketIO #, emit
 from .db_redis import DBManager
 # from .db import DBManager
 
@@ -39,14 +40,14 @@
 app.logger.debug("Loading configs from envs")
 app.config.from_object('src.config')
 
 app.logger.debug(f"Setting secret key: {app.config['SECRET_KEY']}")
 app.secret_key = app.config['SECRET_KEY']
 
 app.logger.debug("Setting REDIS ip and password: %s %s", app.config['REDIS_IP'], app.config['REDIS_PASSWORD'])
 app.redis_ip = app.config['REDIS_IP']
 app.redis_password = app.config['REDIS_PASSWORD']
 
 app.logger.debug("Setting LDAPSYNC ip and port: %s %s", app.config['LDAPSYNC_IP'], app.config['LDAPSYNC_PORT'])
 app.ldapsync_ip = app.config['LDAPSYNC_IP']
 app.ldapsync_port = app.config['LDAPSYNC_PORT']
 
@@ -67,4 +68,6 @@
     }
 )
 
 app.logger.debug("OAUTH CONFIGS: %s", oauth._registry)
+
+socketio = SocketIO(app)

src/routes.py

@@ -1,12 +1,13 @@
 from flask import url_for, session, request, render_template, redirect
-from .app import app, dbms, oauth
+from .app import app, dbms, oauth, socketio
+import requests
 
 
 @app.route('/', methods=['GET', 'POST', 'DELETE'])
 def homepage():
     user = session.get('user')
 
     app.logger.debug(f"/ User value: {user}")
 
     if user:
         _username = user['metadata']['name']
@@ -24,12 +25,12 @@
 
             if request.method == 'POST':
                 user_to_update = request.form['id']
                 app.logger.debug(f"UPDATING USER {user_to_update} REQUEST")
 
                 dbms.update_request_status(user_to_update)
 
             user['request_data'] = dbms.get_all_request_data()
             app.logger.debug(f"ADMIN REQUEST DATA: {user['request_data']}")
 
             return render_template('users/admin.html', user=user)
 
@@ -45,7 +46,7 @@
                 print(request.method)
 
         user['request_data'] = dbms.get_request_data(_username)
         app.logger.debug(f"USER REQUEST DATA: {user['request_data']}")
 
         return render_template('users/user.html', user=user)
 
@@ -53,7 +54,7 @@
 
 
 @app.route('/login')
 def login():
     app.logger.debug('Redirecting to Vault')
     redirect_uri = url_for('auth', _external=True, _scheme='https')
 
@@ -63,17 +64,17 @@
 
 
 @app.route('/auth')
 def auth():
     try:
         token = oauth.vault.authorize_access_token()
 
     except Exception as e: # TODO: choose better Exception
         app.logger.error("Error while autorizing access token, %s", e)
 
         return redirect(url_for('homepage'))
 
     app.logger.debug('Success user auth')
     app.logger.debug(f'Token: {token}')
 
     session['user'] = token['userinfo']
     session['token'] = token
@@ -81,19 +82,24 @@
     return redirect(url_for('homepage'))
 
 @app.route('/logout')
 def logout():
     token = session.get('token')
 
     app.logger.debug(f'Logging out {token}')
-
-    oauth.vault.post('auth/token/revoke-self', token=token)
+    oauth.vault.post('auth/token/revoke', token=token)
 
     app.logger.debug('Cleaning session values')
-    session.pop('user', None)
-    session.pop('token', None)
+    session.clear()
 
     return redirect('/')
 
+@socketio.on('disconnect')
+def on_session_close():
+    logout()
+
+    app.logger.debug('Calling Vault to Logout')
+    _ = requests.get(url="https://vault.unipg.it/ui/vault/logout")
+
 @app.route('/info')
 def info():
     return render_template('info.html')

src/templates/users/admin.html

@@ -6,7 +6,7 @@
 {% block body %}
   <h3>Welcome {{user['infos'].get('name', user['username'])}}</h3>
 
-  <div class="position-absolute top-50 start-50 translate-middle">
+  <div class="d-flex justify-content-center">
     <a href="{{ user['uninuvolaurl'] }}"><button type="button" class="btn btn-primary btn-lg">
         Start computing
         <i class="bi bi-rocket-takeoff-fill"></i>

src/templates/users/user.html

@@ -31,7 +31,7 @@ <h3 class="mt-5">Request status</h3>
 
   {% else %}
     {% if user['request_data']['status'] == 'synced' %}
-    <div class="position-absolute top-50 start-50 translate-middle">
+    <div class="d-flex justify-content-center">
       <a href="{{ user['uninuvolaurl'] }}"><button type="button" class="btn btn-primary btn-lg fs-1">
           Start computing
           <i class="bi bi-rocket-takeoff-fill"></i>