DevStranger · DevStranger · Feb 5, 2025 · Feb 5, 2025 · Feb 5, 2025 · Feb 5, 2025
diff --git a/.env b/.env
@@ -1,8 +1,9 @@
 
-TEAMS_TENANT_ID = "40ad34a2-4df4-499f-a628-c865a29a7782"
+TEAMS_TENANT_ID = "common"
 TEAMS_CLIENT_ID = "4aa51599-98de-4a0a-8006-6939d24a18f4"
-TEAMS_CLIENT_SECRET = "T5l8Q~_mmVp_.qHDlRkUKenBCELcceLYPFnDUcGF"
-TEAMS_REDIRECT_URI = "https://login.microsoftonline.com/common/oauth2/nativeclient"
+TEAMS_CLIENT_SECRET = "3DG8Q~8S7YU3sdpe0u0EF-BUTBCkNZIm_Rkw6bf8"
+TEAMS_REDIRECT_URI = "http://localhost:5000/teams/callback"  
+TEAMS_CLIENT_VALUE = "3DG8Q~8S7YU3sdpe0u0EF-BUTBCkNZIm_Rkw6bf8"
 
 ZOOM_CLIENT_ID="FA1BsrIaTHyB5zmz2hukmg"
 ZOOM_CLIENT_SECRET="dpQeeLxZBAqFFaEpevt2WmAv1J81jtmJ"
@@ -12,4 +13,8 @@ ZOOM_REDIRECT_URI="http://localhost:5000/zoom/callback"
 SMTP_SERVER=smtp.gmail.com
 SMTP_PORT=587
 EMAIL_USERNAME=jfurtak03@gmail.com
-EMAIL_PASSWORD=blmr hpes ktzy wnti
+EMAIL_PASSWORD=blmr hpes ktzy wnti
+
+GOOGLE_CLIENT_ID = "907999041253-2eqttdeuvd1inb1oh6a81vptdk1sh9ao.apps.googleusercontent.com"
+GOOGLE_CLIENT_SECRET = "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"
+GOOGLE_REDIRECT_URI = "http://localhost:5000/google-calendar/callback"
diff --git a/LICENSE.md b/LICENSE.md
@@ -0,0 +1,87 @@
+## NOTICE
+
+This code was developed by the **Girls Inc.** team, consisting of:
+
+- **Aleksandra Adamiak**
+- **Maja Chlipała**
+- **Joanna Furtak**
+- **Julia Mikrut**
+
+as part of a final project for the *Software Engineering* course.
+
+If you use this code in academic work, please ensure proper credit is given to the authors.
+
+---
+
+# Apache License
+
+Copyright 2025 Girls Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+
+---
+
+# Apache License 2.0
+
+**Version 2.0, January 2004**  
+[http://www.apache.org/licenses/](http://www.apache.org/licenses/)
+
+## TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+### 1. Definitions.
+
+- **"License"** shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+- **"Licensor"** shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+- **"Legal Entity"** shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity.
+- **"You" (or "Your")** shall mean an individual or Legal Entity exercising permissions granted by this License.
+- **"Source" form** shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+- **"Object" form** shall mean any form resulting from mechanical transformation or translation of a Source form.
+- **"Work"** shall mean the work of authorship, whether in Source or Object form, made available under the License.
+- **"Derivative Works"** shall mean any work based on (or derived from) the Work.
+- **"Contribution"** shall mean any work of authorship submitted to Licensor for inclusion in the Work.
+- **"Contributor"** shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received.
+
+### 2. Grant of Copyright License.
+Each Contributor grants You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+### 3. Grant of Patent License.
+Each Contributor grants You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable patent license to use the Work.
+
+### 4. Redistribution.
+You may reproduce and distribute copies of the Work under the following conditions:
+
+- You must give any other recipients of the Work a copy of this License.
+- You must cause any modified files to carry prominent notices stating that You changed the files.
+- You must retain all copyright, patent, trademark, and attribution notices from the Source form of the Work.
+- If the Work includes a "NOTICE" text file, then any Derivative Works that You distribute must include a readable copy of those notices.
+
+### 5. Submission of Contributions.
+Unless stated otherwise, any Contribution submitted for inclusion in the Work shall be under the terms of this License.
+
+### 6. Trademarks.
+This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor.
+
+### 7. Disclaimer of Warranty.
+The Work is provided "AS IS", without warranty of any kind, either express or implied.
+
+### 8. Limitation of Liability.
+In no event shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages.
+
+### 9. Accepting Warranty or Additional Liability.
+You may offer and charge a fee for acceptance of support, warranty, indemnity, or other liability obligations, but only on Your sole responsibility.
+
+---
+
+| ![logoo](https://github.com/user-attachments/assets/4b34cc5f-8992-45bb-b354-4a69a66a5189) | **Zespół NoteWriter Girls Inc.** | **👑 Ola 🐝 Maja 🐝 Asia 🐝 Julka** |
+|:--:|:--:|:--:|
diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
-# Aplikacja do Sporządzania Notatek ze Spotkań
+# ![logoo](https://github.com/user-attachments/assets/77f90a59-717a-4f1c-99b4-b49435647273) Aplikacja do Sporządzania Notatek ze Spotkań
+
 
 Aplikacja umożliwia nagrywanie spotkań, tworzenie z nich notatek oraz informowanie nieobecnych uczestników o ich przebiegu.
 
@@ -67,3 +68,7 @@ Na:
 - W razie problemów z FFmpeg, sprawdź ścieżkę i upewnij się, że jest poprawna
 
 ---
+
+| ![logoo](https://github.com/user-attachments/assets/4b34cc5f-8992-45bb-b354-4a69a66a5189) | **Zespół NoteWriter Girls Inc.** | **👑 Ola 🐝 Maja 🐝 Asia 🐝 Julka** |
+|:--:|:--:|:--:|
+
diff --git a/SECURITY.md b/SECURITY.md
@@ -0,0 +1,64 @@
+# 🛡️ Polityka Bezpieczeństwa (Security Policy)
+
+## 📌 Wprowadzenie
+
+Dziękujemy za zainteresowanie bezpieczeństwem naszego projektu **NoteWriter**. Bezpieczeństwo użytkowników oraz ich danych jest dla nas priorytetem. 
+Prosimy o przestrzeganie poniższych zasad i zgłaszanie wszelkich problemów związanych z bezpieczeństwem.
+
+---
+
+## 🔍 Zgłaszanie problemów z bezpieczeństwem
+
+Jeśli znalazłeś/aś podatność w naszym systemie, prosimy o niepubliczne zgłoszenie problemu. Możesz to zrobić poprzez:
+
+- **E-mail:** majachlipala@student.agh.edu.pl
+- **GitHub Issues** *(tylko dla publicznych zgłoszeń związanych z ogólną konfiguracją bezpieczeństwa)*
+- **Slack (kanał #girls_group)** *(dla członków zespołu deweloperskiego)*
+
+**Nie publikuj szczegółów podatności publicznie, dopóki nie zostanie ona naprawiona!**
+
+---
+
+## 🔄 Polityka aktualizacji
+
+- **Aktualizacje zabezpieczeń** będą publikowane co **35 dni** lub natychmiast w przypadku wykrycia krytycznych podatności  
+- **Komponenty zewnętrzne** (np. biblioteki) są regularnie skanowane pod kątem znanych podatności 
+- **Testy penetracyjne** są przeprowadzane przed każdą nową, dużą wersją aplikacji
+
+---
+
+## 🔑 Najlepsze praktyki bezpieczeństwa
+
+Aby zapewnić bezpieczeństwo aplikacji i danych użytkowników, stosujemy następujące praktyki:
+
+- **Szyfrowanie danych** w bazie danych (AES-256) oraz podczas transmisji (TLS 1.3)
+- **Autoryzacja i uwierzytelnianie** użytkowników oparte na OAuth 2.0 i JWT
+- **Minimalizacja uprawnień** – dostęp do danych jest ograniczony do niezbędnego minimum 
+- **Rejestrowanie i monitorowanie** prób nieautoryzowanego dostępu do systemu 
+
+---
+
+## 📝 Zakres odpowiedzialności
+
+- **Zespół NoteWriter Girls Inc.** w żadnym przypadku NIE jest odpowiedzialny za ochronę danych użytkowników i aplikacji  
+- **Użytkownicy** są zobowiązani do stosowania bezpiecznych haseł i ochrony swoich kont zewnętrznych (Google, MS Teams, Zoom)
+
+---
+
+## 📅 Kontakt i wsparcie
+
+Jeśli masz pytania dotyczące polityki bezpieczeństwa, skontaktuj się z nami:
+
+📧 **majachlipala@student.agh.edu.pl**  
+🌐 **[Maja Chlipała via UPEL](https://upel.agh.edu.pl/my/)**  
+
+Pytania dotyczące przekazywania notatek po spotkaniach drogą mailową proszę kierować do:
+
+📧 **jfurtak03@gmail.com**  
+🌐 **[Joanna Furtak via UPEL](https://upel.agh.edu.pl/my/)** 
+
+Dziękujemy za dbanie o bezpieczeństwo naszej aplikacji! 🚀
+
+
+| ![logoo](https://github.com/user-attachments/assets/4b34cc5f-8992-45bb-b354-4a69a66a5189) | **Zespół NoteWriter Girls Inc.** | **👑 Ola 🐝 Maja 🐝 Asia 🐝 Julka** |
+|:--:|:--:|:--:|
diff --git a/apka/app/backend/__init__.py b/apka/app/backend/__init__.py
@@ -2,7 +2,6 @@
 from flask import Flask
 from flask_sqlalchemy import SQLAlchemy
 
-# Inicjalizacja SQLAlchemy (jedna, wspólna instancja)
 db = SQLAlchemy()
 
 UPLOAD_FOLDER = 'uploads'
@@ -11,29 +10,24 @@ def create_app() -> Flask:
     app = Flask(__name__, static_folder="../frontend/static", template_folder="../frontend/templates")
     app.secret_key = "secret_key"
 
-    # Upewnij się, że mamy folder "instance" (jeśli nie istnieje, to go twórz)
     instance_folder = os.path.join(os.getcwd(), 'instance')
     if not os.path.exists(instance_folder):
         os.makedirs(instance_folder)
 
-    # Konfiguracja ścieżki do pliku bazy w folderze instance
     database_path = os.path.join(instance_folder, 'database.db')
     app.config['SQLALCHEMY_DATABASE_URI'] = f"sqlite:///{database_path}"
     app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
     app.config['UPLOAD_FOLDER'] = UPLOAD_FOLDER
 
-    # Inicjalizacja SQLAlchemy z aplikacją Flask
     db.init_app(app)
 
     with app.app_context():
-        # Importujemy modele PRZED wywołaniem create_all()
         from .models import Email, Note
 
         print("Sprawdzam i tworzę tabele w bazie (o ile ich brak)...")
-        db.create_all()  # Teraz SQLAlchemy zna klasy Email, Note
+        db.create_all()  
         print("Gotowe!")
 
-    # Rejestrowanie blueprintu
     from .routes import main
     app.register_blueprint(main)
 

diff --git a/apka/app/backend/__pycache__/__init__.cpython-311.pyc b/apka/app/backend/__pycache__/__init__.cpython-311.pyc
diff --git a/apka/app/backend/__pycache__/google_calendar_integration.cpython-311.pyc b/apka/app/backend/__pycache__/google_calendar_integration.cpython-311.pyc
diff --git a/apka/app/backend/__pycache__/models.cpython-311.pyc b/apka/app/backend/__pycache__/models.cpython-311.pyc
diff --git a/apka/app/backend/__pycache__/ms_calendar_integration.cpython-311.pyc b/apka/app/backend/__pycache__/ms_calendar_integration.cpython-311.pyc
diff --git a/apka/app/backend/__pycache__/note.cpython-311.pyc b/apka/app/backend/__pycache__/note.cpython-311.pyc
diff --git a/apka/app/backend/__pycache__/note.cpython-312.pyc b/apka/app/backend/__pycache__/note.cpython-312.pyc
diff --git a/apka/app/backend/__pycache__/recording.cpython-311.pyc b/apka/app/backend/__pycache__/recording.cpython-311.pyc
diff --git a/apka/app/backend/__pycache__/routes.cpython-311.pyc b/apka/app/backend/__pycache__/routes.cpython-311.pyc
diff --git a/apka/app/backend/__pycache__/screenshot.cpython-311.pyc b/apka/app/backend/__pycache__/screenshot.cpython-311.pyc
diff --git a/apka/app/backend/__pycache__/summary.cpython-311.pyc b/apka/app/backend/__pycache__/summary.cpython-311.pyc
diff --git a/apka/app/backend/__pycache__/teams_integration.cpython-311.pyc b/apka/app/backend/__pycache__/teams_integration.cpython-311.pyc
diff --git a/apka/app/backend/__pycache__/zoom_integration.cpython-311.pyc b/apka/app/backend/__pycache__/zoom_integration.cpython-311.pyc
diff --git a/apka/app/backend/google_calendar_integration.py b/apka/app/backend/google_calendar_integration.py
@@ -11,9 +11,9 @@
 
 load_dotenv()
 
-GOOGLE_CLIENT_ID = "907999041253-2eqttdeuvd1inb1oh6a81vptdk1sh9ao.apps.googleusercontent.com"
-GOOGLE_CLIENT_SECRET = "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"
-GOOGLE_REDIRECT_URI = "http://localhost:5000/google-calendar/callback"
+GOOGLE_CLIENT_ID = os.getenv("GOOGLE_CLIENT_ID")
+GOOGLE_CLIENT_SECRET = os.getenv("GOOGLE_CLIENT_SECRET")
+GOOGLE_REDIRECT_URI = os.getenv("GOOGLE_REDIRECT_URI")
 
 SCOPES = ["https://www.googleapis.com/auth/calendar.readonly"]
 

diff --git a/apka/app/backend/ms_calendar_integration.py b/apka/app/backend/ms_calendar_integration.py
diff --git a/apka/app/backend/note.py b/apka/app/backend/note.py
@@ -9,7 +9,7 @@
 from .summary import generate_summary
 
 # Inicjalizacja modelu Whisper
-token = ""
+token = "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"
 model = load_model("base")
 
 
@@ -73,7 +73,6 @@ def combine_transcription_with_diarization(transcription_segments, diarization):
     speaker_durations = defaultdict(float)
     speaker_word_counts = defaultdict(int)
     current_speaker = None
-    speaker_transcriptions = defaultdict(list)
 
     for segment in transcription_segments:
         start_time, end_time, text = segment['start'], segment['end'], segment['text']
@@ -90,13 +89,19 @@ def combine_transcription_with_diarization(transcription_segments, diarization):
 
         speaker_durations[speaker] += (end_time - start_time)
         speaker_word_counts[speaker] += word_count
-        speaker_transcriptions[speaker].append(text)
 
-    for speaker, sentences in speaker_transcriptions.items():
-        diarized_text.append(f"{speaker}:\n{' '.join(sentences)}")
+        # Jeżeli zmienił się mówca, dodajemy jego identyfikator
+        if speaker != current_speaker:
+            diarized_text.append(f"\n{speaker}:")
+            current_speaker = speaker
 
+        diarized_text.append(f" {text}")
+
+    # Tworzenie końcowego tekstu
+    formatted_transcription = "".join(diarized_text)
     speaker_speeds = {spk: speaker_word_counts[spk] / speaker_durations[spk] for spk in speaker_durations}
-    return "\n".join(diarized_text), speaker_durations, speaker_speeds
+
+    return formatted_transcription, speaker_durations, speaker_speeds
 
 
 def process_audio_and_save_transcription(audio_folder, docx_folder, screenshots_folder):