forked from
pds.dad/at-advent
this repo has no description
logic for day one done
+120
-146
+4
web/Dockerfile
+4
web/Dockerfile
+20
-10
web/src/handlers/day.rs
+20
-10
web/src/handlers/day.rs
···
1
-
use crate::error_response;
2
1
use crate::session::{AxumSessionStore, FlashMessage, get_flash_message, set_flash_message};
3
2
use crate::templates::{HtmlTemplate, day::DayTemplate};
3
+
use crate::{AppState, error_response};
4
4
use atrium_api::agent::Agent;
5
5
use atrium_api::types::string::Did;
6
6
use axum::{
···
22
22
23
23
fn pick_day(
24
24
day: Day,
25
-
pool: PgPool,
25
+
state: AppState,
26
26
oauth_client: Option<OAuthAgentType>,
27
27
) -> Result<Box<dyn AdventChallenge + Send + Sync>, AdventError> {
28
28
match day {
29
-
Day::One => Ok(Box::new(DayOne { pool, oauth_client })),
30
-
Day::Two => Ok(Box::new(DayTwo { pool, oauth_client })),
31
-
Day::Three => Ok(Box::new(DayThree { pool, oauth_client })),
29
+
Day::One => Ok(Box::new(DayOne::new(
30
+
state.postgres_pool,
31
+
oauth_client,
32
+
state.handle_resolver,
33
+
))),
34
+
Day::Two => Ok(Box::new(DayTwo {
35
+
pool: state.postgres_pool,
36
+
oauth_client,
37
+
})),
38
+
Day::Three => Ok(Box::new(DayThree {
39
+
pool: state.postgres_pool,
40
+
oauth_client,
41
+
})),
32
42
_ => Err(AdventError::InvalidDay(0)), // Day::Three => {}
33
43
// Day::Four => {}
34
44
// Day::Five => {}
···
67
77
68
78
pub async fn view_day_handler(
69
79
Path(id): Path<u8>,
70
-
State(pool): State<PgPool>,
80
+
app_state: State<AppState>,
71
81
session: AxumSessionStore,
72
82
) -> Result<impl IntoResponse, Response> {
73
83
let day = Day::from(id);
74
84
75
85
let did = session.get_did();
76
86
let did_clone = did.clone();
77
-
let challenge = pick_day(day, pool, None).map_err(|err| {
87
+
let challenge = pick_day(day, app_state.0, None).map_err(|err| {
78
88
log::error!("Error picking day: {err}");
79
89
error_response(StatusCode::INTERNAL_SERVER_ERROR, "Error picking day")
80
90
})?;
···
267
277
///This is the endpoint to verify the day's challenge
268
278
pub async fn post_day_handler(
269
279
Path(day): Path<u8>,
270
-
State(pool): State<PgPool>,
280
+
state: State<AppState>,
271
281
State(oauth_client): State<OAuthClientType>,
272
282
mut session: AxumSessionStore,
273
283
Form(form): Form<PostDayForm>,
···
282
292
let did = Did::new(did.to_string())
283
293
.map_err(log_and_respond(StatusCode::BAD_REQUEST, "Invalid DID"))?;
284
294
295
+
let day = Day::from(day);
285
296
let client = oauth_client.restore(&did).await.map_err(log_and_respond(
286
297
StatusCode::INTERNAL_SERVER_ERROR,
287
298
"There was an error restoring the oauth client",
288
299
))?;
289
300
290
301
let agent = Agent::new(client);
291
-
let day = Day::from(day);
292
302
293
-
let challenge = pick_day(day, pool, Some(agent)).map_err(log_and_respond(
303
+
let challenge = pick_day(day, state.0, Some(agent)).map_err(log_and_respond(
294
304
StatusCode::INTERNAL_SERVER_ERROR,
295
305
"Error picking the day",
296
306
))?;
+3
-2
web/src/main.rs
+3
-2
web/src/main.rs
···
4
4
templates::error::ErrorTemplate,
5
5
templates::home::{DayStatus, HomeTemplate},
6
6
};
7
+
use atrium_common::resolver::Resolver;
7
8
use atrium_identity::{
8
9
did::{CommonDidResolver, CommonDidResolverConfig, DEFAULT_PLC_DIRECTORY_URL},
9
10
handle::{AtprotoHandleResolver, AtprotoHandleResolverConfig},
···
65
66
redis_pool: bb8::Pool<RedisConnectionManager>,
66
67
oauth_client: OAuthClientType,
67
68
//Used to get did to handle leaving because I figured we'd need it
68
-
_handle_resolver: HandleResolver,
69
+
handle_resolver: HandleResolver,
69
70
}
70
71
71
72
fn oauth_scopes() -> Vec<Scope> {
···
182
183
postgres_pool,
183
184
redis_pool,
184
185
oauth_client: client,
185
-
_handle_resolver: handle_resolver,
186
+
handle_resolver,
186
187
};
187
188
//HACK Yeah I don't like it either - bt
188
189
let prod: bool = env::var("PROD")