chris
/
jean-marie
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup warnings

This commit is contained in:
Chris Jean-Marie 2024-09-20 00:55:43 +00:00
parent bfa9433350
commit 3691056d9f
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
backend/src/google_oauth.rs
View File

@ -1,16 +1,14 @@
use axum_session::{Session, SessionAnyPool, SessionConfig, SessionStore, SessionLayer}; use axum_session::{Session, SessionAnyPool};
use axum::{ use axum::{
extract::{Extension, Query}, extract::Query,
http::header::{HeaderMap, SET_COOKIE},
response::{IntoResponse, Redirect}, response::{IntoResponse, Redirect},
}; };
use axum_server;
use oauth2::{ use oauth2::{
basic::BasicClient, reqwest::async_http_client, AuthUrl, AuthorizationCode, ClientId, basic::BasicClient, AuthUrl, ClientId,
ClientSecret, CsrfToken, PkceCodeChallenge, RedirectUrl, Scope, TokenUrl, ClientSecret, CsrfToken, PkceCodeChallenge, RedirectUrl, Scope, TokenUrl,
}; };
use serde::Deserialize; use serde::Deserialize;
use std::{collections::HashMap, env}; use std::env;
#[derive(Debug, Deserialize)] #[derive(Debug, Deserialize)]
#[allow(dead_code)] #[allow(dead_code)]
@ -20,10 +18,10 @@ pub struct AuthRequest {
} }
pub async fn google_auth() -> impl IntoResponse { pub async fn google_auth() -> impl IntoResponse {
let (pkce_code_challenge, pkce_code_verifier) = PkceCodeChallenge::new_random_sha256(); let (pkce_code_challenge, _pkce_code_verifier) = PkceCodeChallenge::new_random_sha256();
// Generate the authorization URL to which we'll redirect the user. // Generate the authorization URL to which we'll redirect the user.
let (auth_url, csrf_state) = google_oauth_client() let (auth_url, _csrf_state) = google_oauth_client()
.authorize_url(CsrfToken::new_random) .authorize_url(CsrfToken::new_random)
.add_scope(Scope::new( .add_scope(Scope::new(
"https://www.googleapis.com/auth/userinfo.profile".to_string(), "https://www.googleapis.com/auth/userinfo.profile".to_string(),
@ -38,7 +36,7 @@ pub async fn google_auth() -> impl IntoResponse {
Redirect::to(&auth_url.to_string()) Redirect::to(&auth_url.to_string())
} }
pub async fn google_authorized(session: Session<SessionAnyPool>, pub async fn google_authorized(_session: Session<SessionAnyPool>,
Query(query): Query<AuthRequest>, Query(query): Query<AuthRequest>,
// Extension(oauth_clients): Extension<HashMap<&str, BasicClient>>, // Extension(oauth_clients): Extension<HashMap<&str, BasicClient>>,
) -> impl IntoResponse { ) -> impl IntoResponse {

5
backend/src/main.rs
View File

@ -1,12 +1,11 @@
use std::{net::SocketAddr, collections::HashMap}; use std::net::SocketAddr;
use askama::Template; use askama::Template;
use axum_session::{Session, SessionAnyPool, SessionConfig, SessionStore, SessionLayer}; use axum_session::{Session, SessionAnyPool, SessionConfig, SessionStore, SessionLayer};
use axum::{ use axum::{
Router, Router,
routing::{get, get_service}, response::{Html, IntoResponse, Response}, Extension routing::{get, get_service}, response::{Html, IntoResponse, Response},
}; };
use http::StatusCode; use http::StatusCode;
use oauth2::basic::BasicClient;
use serde::{Serialize, Deserialize}; use serde::{Serialize, Deserialize};
use tower_http::services::ServeDir; use tower_http::services::ServeDir;