Merge pull request #1 from silverfox68/dev

Dev

run.sh

@@ -1 +1 @@
-GOOGLE_CLIENT_ID=735264084619-clsmvgdqdmum4rvrcj0kuk28k9agir1c.apps.googleusercontent.com GOOGLE_CLIENT_SECRET=L6uI7FQGoMJd-ay1HO_iGJ6M cargo run
+GOOGLE_CLIENT_ID=735264084619-clsmvgdqdmum4rvrcj0kuk28k9agir1c.apps.googleusercontent.com GOOGLE_CLIENT_SECRET=L6uI7FQGoMJd-ay1HO_iGJ6M DISCORD_CLIENT_ID=956189108559036427 DISCORD_CLIENT_SECRET=dx2DZxjDhVMCCnGX4xpz5MxSTgZ4lHBI cargo run

runprod.sh

@@ -0,0 +1 @@
+GOOGLE_CLIENT_ID=735264084619-clsmvgdqdmum4rvrcj0kuk28k9agir1c.apps.googleusercontent.com GOOGLE_CLIENT_SECRET=L6uI7FQGoMJd-ay1HO_iGJ6M REDIRECT_URL=https://www.jean-marie.ca/auth cargo run

src/main.rs

@@ -20,7 +20,8 @@ use axum::{
 use http::header;
 use oauth2::{
     basic::BasicClient, reqwest::async_http_client, AuthUrl, AuthorizationCode, ClientId,
-    ClientSecret, RedirectUrl, TokenResponse, TokenUrl,
+    PkceCodeChallenge, RedirectUrl, RevocationUrl, Scope, TokenUrl,
+    ClientSecret, TokenResponse, CsrfToken,
 };
 use serde::{Deserialize, Serialize};
 use std::{env, net::SocketAddr};
@@ -50,7 +51,8 @@ async fn main() {
 
     // `MemoryStore` just used as an example. Don't use this in production.
     let store = MemoryStore::new();
-    let oauth_client = oauth_client();
+    let google_oauth_client = google_oauth_client();
+    let discord_oauth_client = discord_oauth_client();
 
     // build our application with a route
     let app = Router::new()
@@ -67,13 +69,19 @@ async fn main() {
             ),
         )
         .route("/", get(index))
+        .route("/google_auth", get(google_auth))
+        .route("/discord_auth", get(discord_auth))
         .route("/login", get(login))
+        .route("/dashboard", get(dashboard))
+        .route("/auth/callback", get(google_authorized))
+        .route("/auth/discord", get(discord_authorized))
         .layer(Extension(store))
-        .layer(Extension(oauth_client));
+        .layer(Extension(discord_oauth_client))
+        .layer(Extension(google_oauth_client));
 
     // run our app with hyper
     // `axum::Server` is a re-export of `hyper::Server`
-    let addr = SocketAddr::from(([0, 0, 0, 0], 3000));
+    let addr = SocketAddr::from(([0, 0, 0, 0], 40192));
     tracing::debug!("listening on {}", addr);
     axum::Server::bind(&addr)
         .serve(app.into_make_service())
@@ -85,7 +93,7 @@ async fn main() {
 async fn index(user: Option<User>) -> impl IntoResponse {
     let name = match user {
         Some(u) => u.username,
-        None => "You're not logged in.\nVisit `/auth/discord` to do so.".to_string(),
+        None => "You're not logged in.".to_string(),
     };
     let template = IndexTemplate { name };
     HtmlTemplate(template)
@@ -97,31 +105,44 @@ async fn login() -> impl IntoResponse {
     HtmlTemplate(template)
 }
 
-fn oauth_client() -> BasicClient {
+fn google_oauth_client() -> BasicClient {
-    // Environment variables (* = required):
-    // *"CLIENT_ID"     "REPLACE_ME";
-    // *"CLIENT_SECRET" "REPLACE_ME";
-    //  "REDIRECT_URL"  "http://127.0.0.1:3000/auth/authorized";
-    //  "AUTH_URL"      "https://discord.com/api/oauth2/authorize?response_type=code";
-    //  "TOKEN_URL"     "https://discord.com/api/oauth2/token";
-
-    let client_id = env::var("GOOGLE_CLIENT_ID").expect("Missing CLIENT_ID!");
-    let client_secret = env::var("GOOGLE_CLIENT_SECRET").expect("Missing CLIENT_SECRET!");
     let redirect_url = env::var("REDIRECT_URL")
-        .unwrap_or_else(|_| "http://127.0.0.1:3000/auth/authorized".to_string());
+        .unwrap_or_else(|_| "http://localhost:40192/auth/callback".to_string());
 
-    let auth_url = env::var("AUTH_URL").unwrap_or_else(|_| {
+    let google_client_id = env::var("GOOGLE_CLIENT_ID").expect("Missing GOOGLE_CLIENT_ID!");
+    let google_client_secret = env::var("GOOGLE_CLIENT_SECRET").expect("Missing GOOGLE_CLIENT_SECRET!");
+    let google_auth_url = env::var("GOOGLE_AUTH_URL").unwrap_or_else(|_| {
+        "https://accounts.google.com/o/oauth2/v2/auth".to_string()
+    });
+    let google_token_url = env::var("GOOGLE_TOKEN_URL")
+        .unwrap_or_else(|_| "https://www.googleapis.com/oauth2/v3/token".to_string());
+
+    BasicClient::new(
+        ClientId::new(google_client_id),
+        Some(ClientSecret::new(google_client_secret)),
+        AuthUrl::new(google_auth_url).unwrap(),
+        Some(TokenUrl::new(google_token_url).unwrap()),
+    )
+    .set_redirect_uri(RedirectUrl::new(redirect_url).unwrap())
+}
+
+fn discord_oauth_client() -> BasicClient {
+    let redirect_url = env::var("REDIRECT_URL")
+        .unwrap_or_else(|_| "http://localhost:40192/auth/discord".to_string());
+
+    let discord_client_id = env::var("DISCORD_CLIENT_ID").expect("Missing DISCORD_CLIENT_ID!");
+    let discord_client_secret = env::var("DISCORD_CLIENT_SECRET").expect("Missing DISCORD_CLIENT_SECRET!");
+    let discord_auth_url = env::var("DISCORD_AUTH_URL").unwrap_or_else(|_| {
         "https://discord.com/api/oauth2/authorize?response_type=code".to_string()
     });
-
+    let discord_token_url = env::var("DISCORD_TOKEN_URL")
-    let token_url = env::var("TOKEN_URL")
         .unwrap_or_else(|_| "https://discord.com/api/oauth2/token".to_string());
 
     BasicClient::new(
-        ClientId::new(client_id),
+        ClientId::new(discord_client_id),
-        Some(ClientSecret::new(client_secret)),
+        Some(ClientSecret::new(discord_client_secret)),
-        AuthUrl::new(auth_url).unwrap(),
+        AuthUrl::new(discord_auth_url).unwrap(),
-        Some(TokenUrl::new(token_url).unwrap()),
+        Some(TokenUrl::new(discord_token_url).unwrap()),
     )
     .set_redirect_uri(RedirectUrl::new(redirect_url).unwrap())
 }
@@ -242,7 +263,7 @@ where
 }
 
 // Valid user session required. If there is none, redirect to the auth page
-async fn protected(user: User) -> impl IntoResponse {
+async fn dashboard(user: User) -> impl IntoResponse {
     format!(
         "Welcome to the protected area :)\nHere's your info:\n{:?}",
         user
@@ -265,6 +286,35 @@ async fn logout(
     Redirect::to("/".parse().unwrap())
 }
 
+async fn google_auth(Extension(google_oauth_client): Extension<BasicClient>) -> impl IntoResponse {
+    let (pkce_code_challenge, pkce_code_verifier) = PkceCodeChallenge::new_random_sha256();
+
+    // Generate the authorization URL to which we'll redirect the user.
+    let (auth_url, csrf_state) = google_oauth_client
+        .authorize_url(CsrfToken::new_random)
+        .add_scope(Scope::new(
+            "https://www.googleapis.com/auth/userinfo.profile".to_string(),
+        ))
+        .add_scope(Scope::new(
+            "https://www.googleapis.com/auth/userinfo.email".to_string(),
+        ))
+        .set_pkce_challenge(pkce_code_challenge)
+        .url();
+
+    // Redirect to Google's oauth service
+    Redirect::to(auth_url.to_string().parse().unwrap())
+}
+
+async fn discord_auth(Extension(discord_oauth_client): Extension<BasicClient>) -> impl IntoResponse {
+    let (auth_url, _csrf_token) = discord_oauth_client
+        .authorize_url(CsrfToken::new_random)
+        .add_scope(Scope::new("identify".to_string()))
+        .url();
+
+    // Redirect to Discord's oauth service
+    Redirect::to(auth_url.to_string().parse().unwrap())
+}
+
 #[derive(Debug, Deserialize)]
 #[allow(dead_code)]
 struct AuthRequest {
@@ -272,13 +322,69 @@ struct AuthRequest {
     state: String,
 }
 
-async fn login_authorized(
+async fn google_authorized(
     Query(query): Query<AuthRequest>,
     Extension(store): Extension<MemoryStore>,
-    Extension(oauth_client): Extension<BasicClient>,
+    Extension(google_oauth_client): Extension<BasicClient>,
+) -> impl IntoResponse {
+
+    print!("{}", query.code);
+/*
+    // Get an auth token
+    let token = google_oauth_client
+        .exchange_code(AuthorizationCode::new(query.code.clone()))
+        .request_async(async_http_client)
+        .await
+        .unwrap();
+
+    // Fetch user data from discord
+    let client = reqwest::Client::new();
+    let user_data: User = client
+        // https://discord.com/developers/docs/resources/user#get-current-user
+        .get("https://discordapp.com/api/users/@me")
+        .bearer_auth(token.access_token().secret())
+        .send()
+        .await
+        .unwrap()
+        .json::<User>()
+        .await
+        .unwrap();
+*/
+
+    // Create a new session filled with user data
+    let mut session = Session::new();
+    //session.insert("user", &user_data).unwrap();
+
+    // Store session and get corresponding cookie
+    let cookie = store.store_session(session).await.unwrap().unwrap();
+
+    // Build the cookie
+    let cookie = format!("{}={}; SameSite=Lax; Path=/", COOKIE_NAME, cookie);
+
+    // Set cookie
+    let mut headers = HeaderMap::new();
+    headers.insert(SET_COOKIE, cookie.parse().unwrap());
+
+    //(headers, Redirect::to("/dashboard".parse().unwrap()))
+
+    let mut page = String::new();
+    page.push_str(&"Display the data returned by Google\n".to_string());
+    page.push_str(&"\nState: ".to_string());
+    page.push_str(&query.state);
+    page.push_str(&"\nCode: ".to_string());
+    page.push_str(&query.code);
+    page.push_str(&"\nScope: ".to_string());
+
+    page
+}
+
+async fn discord_authorized(
+    Query(query): Query<AuthRequest>,
+    Extension(store): Extension<MemoryStore>,
+    Extension(discord_oauth_client): Extension<BasicClient>,
 ) -> impl IntoResponse {
     // Get an auth token
-    let token = oauth_client
+    let token = discord_oauth_client
         .exchange_code(AuthorizationCode::new(query.code.clone()))
         .request_async(async_http_client)
         .await
@@ -311,14 +417,14 @@ async fn login_authorized(
     let mut headers = HeaderMap::new();
     headers.insert(SET_COOKIE, cookie.parse().unwrap());
 
-    (headers, Redirect::to("/".parse().unwrap()))
+    (headers, Redirect::to("/dashboard".parse().unwrap()))
 }
 
 struct AuthRedirect;
 
 impl IntoResponse for AuthRedirect {
     fn into_response(self) -> Response {
-        Redirect::temporary("/auth/discord".parse().unwrap()).into_response()
+        Redirect::temporary("/login".parse().unwrap()).into_response()
     }
 }
 

templates/login.html

@@ -1,4 +1,47 @@
 {% extends "base.html" %}
 {% block content %}
-Hello {{ name }}
+<section class="vh-100" style="background-color: #508bfc;">
+    <div class="container py-5 h-100">
+      <div class="row d-flex justify-content-center align-items-center h-100">
+        <div class="col-12 col-md-8 col-lg-6 col-xl-5">
+          <div class="card shadow-2-strong" style="border-radius: 1rem;">
+            <div class="card-body p-5 text-center">
+  
+              <h3 class="mb-5">Sign in</h3>
+  
+              <div class="form-outline mb-4">
+                <input type="email" id="typeEmailX-2" class="form-control form-control-lg" />
+                <label class="form-label" for="typeEmailX-2">Email</label>
+              </div>
+  
+              <div class="form-outline mb-4">
+                <input type="password" id="typePasswordX-2" class="form-control form-control-lg" />
+                <label class="form-label" for="typePasswordX-2">Password</label>
+              </div>
+  
+              <!-- Checkbox -->
+              <div class="form-check d-flex justify-content-start mb-4">
+                <input
+                  class="form-check-input"
+                  type="checkbox"
+                  value=""
+                  id="form1Example3"
+                />
+                <label class="form-check-label" for="form1Example3"> Remember password </label>
+              </div>
+  
+              <button class="btn btn-primary btn-lg btn-block" type="submit">Login</button>
+  
+              <hr class="my-4">
+  
+              <!-- <a class="btn btn-lg btn-block btn-primary" style="background-color: #dd4b39;" type="submit" href="/google_auth"><i class="fab fa-google me-2"></i> Sign in with google</a> -->
+              <a class="btn btn-lg btn-block btn-primary" style="background-color: #3b5998;" type="submit" href="/discord_auth"><i class="fab fa-discord me-2"></i> Sign in with discord</a>
+              <!-- <button class="btn btn-lg btn-block btn-primary mb-2" style="background-color: #3b5998;" type="submit"><i class="fab fa-facebook-f me-2"></i>Sign in with facebook</button> -->
+  
+            </div>
+          </div><
+        </div>
+      </div>
+    </div>
+  </section>
 {% endblock content %}