Skip to content

fix: some issues #409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
GuillaumeDeconinck wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fix: some issues #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions clients/javascript/tests/requirements/requirements.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@ describe('Requirements', () => {
calendarId: user1Calendar1.id,
duration: 1000 * 60 * 60,
startTime: new Date(0),
status: 'confirmed',
busy: true,
})
user1Calendar1Event1 = resEvent1?.event
Expand Down Expand Up @@ -624,6 +625,7 @@ describe('Requirements', () => {
calendarId: user1Calendar1.id,
duration: 1000 * 60 * 60,
startTime: new Date(0),
status: 'confirmed',
busy: true,
})
expect(resEvent1?.event.calendarId).toBe(user1Calendar1.id)
Expand All @@ -633,6 +635,7 @@ describe('Requirements', () => {
calendarId: user2Calendar1.id,
duration: 1000 * 60 * 60,
startTime: new Date(1000 * 60 * 61),
status: 'confirmed',
busy: true,
})
expect(resEvent2?.event.calendarId).toBe(user2Calendar1.id)
Expand Down
2 changes: 1 addition & 1 deletion crates/api/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ impl NitteiError {
fn error_response(&self) -> impl IntoResponse {
(
self.status_code(),
[(header::CONTENT_TYPE, "text/html; charset=utf-8")],
[(header::CONTENT_TYPE, "text/plain; charset=utf-8")],
self.to_string(),
)
}
Expand Down
84 changes: 24 additions & 60 deletions crates/api/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ mod user;

use std::sync::Arc;

use anyhow::anyhow;
use axum::{Extension, Router, http::header};
use futures::lock::Mutex;
use http_logger::metadata_middleware;
use job_schedulers::{start_reminder_generation_job, start_send_reminders_job};
use nittei_domain::{
Expand All @@ -27,7 +27,10 @@ use nittei_domain::{
use nittei_infra::NitteiContext;
use tokio::{
net::TcpListener,
sync::oneshot::{self, Sender},
sync::{
Mutex,
oneshot::{self, Sender},
},
};
use tower::ServiceBuilder;
use tower_http::{
Expand Down Expand Up @@ -210,11 +213,10 @@ impl Application {
info!("[server] Server stopped");
})
.await
.unwrap_or_else(|e| {
.map_err(|e| {
error!("[server] Server error: {:?}", e);
// Exit the process with an error code
std::process::exit(1);
});
anyhow!("Server error: {e:?}")
})?;

info!("[server] Server closed");

Expand Down Expand Up @@ -293,71 +295,37 @@ impl Application {

self.context.repos.accounts.insert(&account).await?;

let account_google_client_id_env = "NITTEI__ACCOUNT__GOOGLE__CLIENT_ID";
let account_google_client_secret_env = "NITTEI__ACCOUNT__GOOGLE__CLIENT_SECRET";
let account_google_redirect_uri_env = "NITTEI__ACCOUNT__GOOGLE__REDIRECT_URI";
let google_config = nittei_utils::config::APP_CONFIG
.account
.as_ref()
.and_then(|a| a.google.as_ref());
if let Some(google_client_id) = google_config.map(|g| g.client_id.clone()) {
let google_client_secret = google_config
.map(|g| g.client_secret.clone())
.unwrap_or_else(|| {
panic!(
"{account_google_client_secret_env} should be specified also when {account_google_client_id_env} is specified."
)
});
let google_redirect_uri = google_config
.map(|g| g.redirect_uri.clone())
.unwrap_or_else(|| {
panic!(
"{account_google_redirect_uri_env} should be specified also when {account_google_client_id_env} is specified."
)
});
if let Some(google_config) = google_config {
self.context
.repos
.account_integrations
.insert(&AccountIntegration {
account_id: account.id.clone(),
client_id: google_client_id,
client_secret: google_client_secret,
redirect_uri: google_redirect_uri,
client_id: google_config.client_id.clone(),
client_secret: google_config.client_secret.clone(),
redirect_uri: google_config.redirect_uri.clone(),
provider: IntegrationProvider::Google,
})
.await?;
}

let account_outlook_client_id_env = "NITTEI__ACCOUNT__OUTLOOK__CLIENT_ID";
let account_outlook_client_secret_env = "NITTEI__ACCOUNT__OUTLOOK__CLIENT_SECRET";
let account_outlook_redirect_uri_env = "NITTEI__ACCOUNT__OUTLOOK__REDIRECT_URI";
let outlook_config = nittei_utils::config::APP_CONFIG
.account
.as_ref()
.and_then(|a| a.outlook.as_ref());
if let Some(outlook_client_id) = outlook_config.map(|o| o.client_id.clone()) {
let outlook_client_secret = outlook_config
.map(|o| o.client_secret.clone())
.unwrap_or_else(|| {
panic!(
"{account_outlook_client_secret_env} should be specified also when {account_outlook_client_id_env} is specified."
)
});
let outlook_redirect_uri = outlook_config
.map(|o| o.redirect_uri.clone())
.unwrap_or_else(|| {
panic!(
"{account_outlook_redirect_uri_env} should be specified also when {account_outlook_client_id_env} is specified."
)
});
if let Some(outlook_config) = outlook_config {
self.context
.repos
.account_integrations
.insert(&AccountIntegration {
account_id: account.id.clone(),
client_id: outlook_client_id,
client_secret: outlook_client_secret,
redirect_uri: outlook_redirect_uri,
client_id: outlook_config.client_id.clone(),
client_secret: outlook_config.client_secret.clone(),
redirect_uri: outlook_config.redirect_uri.clone(),
provider: IntegrationProvider::Outlook,
})
.await?;
Expand Down Expand Up @@ -401,12 +369,10 @@ impl Application {
if cfg!(debug_assertions) {
// In debug mode, stop the server immediately
info!("[shutdown_handler] Stopping server...");
if let Some(server_handle) = shared_state.lock().await.shutdown_tx.take() {
server_handle.send(()).unwrap_or_else(|_| {
error!("[shutdown_handler] Failed to send shutdown signal");
// Exit the process with an error code
std::process::exit(1);
});
if let Some(server_handle) = shared_state.lock().await.shutdown_tx.take()
&& server_handle.send(()).is_err()
{
error!("[shutdown_handler] Failed to send shutdown signal");
}
info!("[shutdown_handler] api crate - shutdown complete");
} else {
Expand All @@ -422,12 +388,10 @@ impl Application {
info!("[shutdown_handler] Stopping server...");

// Shutdown the server
if let Some(server_handle) = shared_state.lock().await.shutdown_tx.take() {
server_handle.send(()).unwrap_or_else(|_| {
error!("[shutdown_handler] Failed to send shutdown signal");
// Exit the process with an error code
std::process::exit(1);
});
if let Some(server_handle) = shared_state.lock().await.shutdown_tx.take()
&& server_handle.send(()).is_err()
{
error!("[shutdown_handler] Failed to send shutdown signal");
}

info!("[shutdown_handler] api crate - shutdown complete");
Expand Down
Loading
Loading