revert 24f04a7e82

revert try to do better

backend/Dockerfile

@@ -1,4 +1,8 @@
-FROM rust:latest AS builder
+FROM archlinux:latest AS builder
+
+RUN pacman -Syu --noconfirm && \
+    pacman -S --noconfirm rust cargo && \
+    pacman -Scc --noconfirm
 
 WORKDIR /app
 
@@ -11,12 +15,11 @@ COPY src ./src
 RUN touch src/main.rs
 RUN cargo build --release
 
-FROM debian:bookworm-slim
+FROM archlinux:latest
 
-RUN apt-get update && apt-get install -y \
-    libssl3 \
-    ca-certificates \
-    && rm -rf /var/lib/apt/lists/*
+RUN pacman -Syu --noconfirm && \
+    pacman -S --noconfirm openssl ca-certificates && \
+    pacman -Scc --noconfirm
 
 WORKDIR /app
 

backend/src/services/oauth_service.rs

@@ -1,7 +1,5 @@
-use oauth2::{
-    basic::BasicClient, AuthUrl, ClientId, ClientSecret, RedirectUrl, TokenUrl,
-    AuthorizationCode, TokenResponse, Scope, CsrfToken,
-};
+use oauth2::{basic::BasicClient, AuthUrl, ClientId, ClientSecret, RedirectUrl, TokenUrl, AuthorizationCode, TokenResponse, Scope, CsrfToken, Client, StandardRevocableToken, EndpointSet, EndpointNotSet};
+use oauth2::basic::{BasicErrorResponse, BasicRevocationErrorResponse, BasicTokenIntrospectionResponse, BasicTokenResponse};
 use reqwest::Client as HttpClient;
 use sea_orm::{DatabaseConnection, EntityTrait, ColumnTrait, QueryFilter, ActiveModelTrait, Set};
 use serde::Deserialize;
@@ -34,11 +32,7 @@ impl OAuthService {
         let redirect_url = std::env::var("GOOGLE_REDIRECT_URL")
             .unwrap_or_else(|_| "http://localhost:8080/api/auth/google/callback".to_string());
 
-        let client = BasicClient::new(ClientId::new(client_id))
-            .set_client_secret(ClientSecret::new(client_secret))
-            .set_auth_uri(AuthUrl::new("https://accounts.google.com/o/oauth2/v2/auth".to_string()).unwrap())
-            .set_token_uri(TokenUrl::new("https://oauth2.googleapis.com/token".to_string()).unwrap())
-            .set_redirect_uri(RedirectUrl::new(redirect_url).unwrap());
+        let client = Self::getClient(client_id, client_secret, redirect_url);
 
         let (auth_url, csrf_token) = client
             .authorize_url(CsrfToken::new_random)
@@ -58,11 +52,7 @@ impl OAuthService {
         let redirect_url = std::env::var("GOOGLE_REDIRECT_URL")
             .unwrap_or_else(|_| "http://localhost:8080/api/auth/google/callback".to_string());
 
-        let client = BasicClient::new(ClientId::new(client_id))
-            .set_client_secret(ClientSecret::new(client_secret))
-            .set_auth_uri(AuthUrl::new("https://accounts.google.com/o/oauth2/v2/auth".to_string()).unwrap())
-            .set_token_uri(TokenUrl::new("https://oauth2.googleapis.com/token".to_string()).unwrap())
-            .set_redirect_uri(RedirectUrl::new(redirect_url).unwrap());
+        let client = Self::getClient(client_id, client_secret, redirect_url);
 
         let http_client = oauth2::reqwest::ClientBuilder::new()
             .build()
@@ -77,6 +67,23 @@ impl OAuthService {
         Ok(token.access_token().secret().clone())
     }
 
+    fn getClient(client_id: String, client_secret: String, redirect_url: String) -> Client<BasicErrorResponse,
+                                                                                           BasicTokenResponse,
+                                                                                           BasicTokenIntrospectionResponse,
+                                                                                           StandardRevocableToken,
+                                                                                           BasicRevocationErrorResponse,
+                                                                                           EndpointSet,
+                                                                                           EndpointNotSet,
+                                                                                           EndpointNotSet,
+                                                                                           EndpointNotSet,
+                                                                                           EndpointSet> {
+        BasicClient::new(ClientId::new(client_id))
+            .set_client_secret(ClientSecret::new(client_secret))
+            .set_auth_uri(AuthUrl::new("https://accounts.google.com/o/oauth2/v2/auth".to_string()).unwrap())
+            .set_token_uri(TokenUrl::new("https://oauth2.googleapis.com/token".to_string()).unwrap())
+            .set_redirect_uri(RedirectUrl::new(redirect_url).unwrap())
+    }
+
     pub async fn get_user_info(&self, access_token: &str) -> Result<GoogleUserInfo, OAuthError> {
         let response = self.http_client
             .get("https://www.googleapis.com/oauth2/v2/userinfo")

frontend/package-lock.json

@@ -16,6 +16,7 @@
         "react": "^19.2.0",
         "react-dom": "^19.2.0",
         "react-i18next": "^16.5.3",
+        "react-icons": "^5.5.0",
         "react-router-dom": "^7.10.1",
         "zustand": "^5.0.9"
       },
@@ -3819,6 +3820,15 @@
         }
       }
     },
+    "node_modules/react-icons": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-5.5.0.tgz",
+      "integrity": "sha512-MEFcXdkP3dLo8uumGI5xN3lDFNsRtrjbOEKDLD7yv76v4wpnEq2Lt2qeHaQOr34I/wPN3s3+N08WkQ+CW37Xiw==",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": "*"
+      }
+    },
     "node_modules/react-refresh": {
       "version": "0.18.0",
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.18.0.tgz",

frontend/package.json

@@ -18,6 +18,7 @@
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
     "react-i18next": "^16.5.3",
+    "react-icons": "^5.5.0",
     "react-router-dom": "^7.10.1",
     "zustand": "^5.0.9"
   },

frontend/src/pages/Login.tsx

@@ -2,6 +2,7 @@ import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { authApi } from '../api/client';
 import { Loader2, Wallet } from 'lucide-react';
+import { FcGoogle } from 'react-icons/fc';
 
 export default function Login() {
   const { t } = useTranslation();
@@ -53,24 +54,7 @@ export default function Login() {
               <Loader2 className="w-6 h-6 animate-spin" />
             ) : (
               <>
-                <svg className="w-6 h-6" viewBox="0 0 24 24">
-                  <path
-                    fill="#4285F4"
-                    d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z"
-                  />
-                  <path
-                    fill="#34A853"
-                    d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z"
-                  />
-                  <path
-                    fill="#FBBC05"
-                    d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z"
-                  />
-                  <path
-                    fill="#EA4335"
-                    d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z"
-                  />
-                </svg>
+                <FcGoogle className="w-6 h-6" />
                 {t('login.googleButton')}
               </>
             )}
@@ -79,4 +63,4 @@ export default function Login() {
       </div>
     </div>
   );
-}
+}