add endpoint to docs and 400 error result

Author: camila314

openapi.yml

@@ -83,9 +83,14 @@ paths:
           content:
             application/json:
               schema:
-                type: string
-                description: The token used for authentication
-                example: "a1b2c3d4-1234-5678-9abc-1234567890ab"
+                type: object
+                properties:
+                  error:
+                    type: "null"
+                  payload:
+                    type: string
+                    description: The token used for authentication
+                    example: "a1b2c3d4-1234-5678-9abc-1234567890ab"
         "400":
           description: Bad request - for different reasons, like IP mismatch, interval not being respected, etc.
           content:
@@ -100,6 +105,53 @@ paths:
         "500":
           $ref: "#/components/responses/InternalServerError"
 
+  /v1/login/github/token:
+    post:
+      tags:
+        - user
+      summary: Login with GitHub access token
+      description: Log in immediately with a GitHub access token. Returns a token if the login was successful.
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                token:
+                  type: string
+                  description: The access token from GitHub
+                  example: "ghp_1234567890abcdefgh"
+      responses:
+        "200":
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  error:
+                    type: "null"
+                  payload:
+                    type: object
+                    properties:
+                      type: string
+                      description: The Geode token used for authentication
+                      example: "a1b2c3d4-1234-5678-9abc-1234567890ab"
+        "400":
+          description: Bad request - invalid access token.
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  error:
+                    type: string
+                  payload:
+                    type: "null"
+        "500":
+          $ref: "#/components/responses/InternalServerError"
+
+
   /v1/mods:
     get:
       tags:

src/auth/github.rs

@@ -164,7 +164,7 @@ impl GithubClient {
         }
     }
 
-    pub async fn get_user(&self, token: String) -> Result<serde_json::Value, ApiError> {
+    pub async fn get_user(&self, token: &str) -> Result<serde_json::Value, ApiError> {
         let client = Client::new();
         let resp = match client
             .get("https://api.github.com/user")

src/endpoints/auth/github.rs

@@ -23,12 +23,9 @@ struct TokenLoginParams {
 }
 
 async fn developer_from_token(
-    client: &github::GithubClient,
     pool: &mut PgConnection,
-    token: String
+    user: serde_json::Value
 ) -> Result<Uuid, Option<ApiError>> {
-    let user = client.get_user(token).await?;
-
     let id = user.get("id").ok_or(None)?.as_i64().unwrap();
     let username = user.get("login").ok_or(None)?;
 
@@ -169,9 +166,10 @@ pub async fn poll_github_login(
         .await
         .or(Err(ApiError::TransactionError))?;
 
+    let user = client.get_user(&token).await.map_err(|_| ApiError::InternalError)?;
     let mut transaction = pool.begin().await.or(Err(ApiError::TransactionError))?;
 
-    let token = match developer_from_token(&client, &mut transaction, token).await {
+    let token = match developer_from_token(&mut transaction, user).await {
         Ok(t) => t,
         Err(e) => {
             if let Some(e) = e {
@@ -196,15 +194,18 @@ pub async fn github_token_login(
     json: web::Json<TokenLoginParams>,
     data: web::Data<AppData>,
 ) -> Result<impl Responder, ApiError> {
-    let mut pool = data.db.acquire().await.or(Err(ApiError::DbAcquireError))?;
-    let mut transaction = pool.begin().await.or(Err(ApiError::TransactionError))?;
-
     let client = github::GithubClient::new(
         data.github_client_id.to_string(),
         data.github_client_secret.to_string(),
     );
 
-    let token = match developer_from_token(&client, &mut transaction, json.token.to_string()).await {
+    let user = client.get_user(&json.token).await
+        .map_err(|_| ApiError::BadRequest(format!("Invalid access token: {}", json.token)))?;
+
+    let mut pool = data.db.acquire().await.or(Err(ApiError::DbAcquireError))?;
+    let mut transaction = pool.begin().await.or(Err(ApiError::TransactionError))?;
+
+    let token = match developer_from_token(&mut transaction, user).await {
         Ok(t) => t,
 
         Err(e) => {