From 8251cd9bfdbe33427e9b886cf13fc2adb6b0f176 Mon Sep 17 00:00:00 2001 From: AIIrondev Date: Wed, 29 Jul 2026 00:22:35 +0200 Subject: [PATCH] Fix of a dubled function --- Web/app.py | 47 +++++++++++++++++------------------------------ 1 file changed, 17 insertions(+), 30 deletions(-) diff --git a/Web/app.py b/Web/app.py index faeaea1..390bdc5 100755 --- a/Web/app.py +++ b/Web/app.py @@ -10375,11 +10375,24 @@ def my_borrowed_items(): @app.route('/api/push/vapid-key', methods=['GET']) def get_vapid_key(): - """Returns the VAPID public key for web push subscriptions.""" + """ + Returns the VAPID public key for web push subscriptions + """ from Web.push_notifications import _get_vapid_public - if not _get_vapid_public(): - return jsonify({'error': 'VAPID public key not configured'}), 500 - return jsonify({'publicKey': _get_vapid_public()}) + if 'username' not in session: + return jsonify({'success': False, 'error': 'Not authenticated'}), 401 + + try: + if not _get_vapid_public(): + return jsonify({'success': False, 'error': 'VAPID public key not configured'}), 500 + + return jsonify({ + 'success': True, + 'publicKey': _get_vapid_public() + }) + except Exception as e: + app.logger.error(f'Error getting VAPID key: {e}') + return jsonify({'success': False}), 500 @app.route('/notifications') def notifications_view(): @@ -12225,32 +12238,6 @@ def get_push_subscriptions(): app.logger.error(f'Error getting push subscriptions: {e}') return jsonify({'success': False}), 500 - -@app.route('/api/push/vapid-key', methods=['GET']) -def get_vapid_key(): - """ - Get the VAPID public key for push notifications - Used by the service worker to communicate with push service - """ - try: - vapid_key = pn.VAPID_PUBLIC_KEY - if not vapid_key: - app.logger.warning('VAPID_PUBLIC_KEY not configured') - return jsonify({ - 'success': False, - 'error': 'Push notifications not configured on server' - }), 501 - - return jsonify({ - 'success': True, - 'vapid_key': vapid_key - }) - - except Exception as e: - app.logger.error(f'Error getting VAPID key: {e}') - return jsonify({'success': False}), 500 - - @app.route('/api/push/test', methods=['POST']) def test_push_notification(): """