chg: Renamed some structs

Author: SinTan1729

actix/src/auth.rs

@@ -13,29 +13,29 @@ use crate::config::Config;
 
 // Define JSON struct for error response
 #[derive(Serialize)]
-pub struct APIResponse {
+pub struct APIVerification {
     pub success: bool,
     pub error: bool,
     reason: String,
     pass: bool,
 }
 
 // If the api_key environment variable exists
-pub fn is_api_ok(http: HttpRequest, config: &Config) -> APIResponse {
+pub fn is_api_ok(http: HttpRequest, config: &Config) -> APIVerification {
     // If the api_key environment variable exists
     if config.api_key.is_some() {
         // If the header exists
         if let Some(header) = get_api_header(&http) {
             // If the header is correct
             if is_key_valid(header, config) {
-                APIResponse {
+                APIVerification {
                     success: true,
                     error: false,
                     reason: "Correct API key".to_string(),
                     pass: false,
                 }
             } else {
-                APIResponse {
+                APIVerification {
                     success: false,
                     error: true,
                     reason: "Incorrect API key".to_string(),
@@ -46,7 +46,7 @@ pub fn is_api_ok(http: HttpRequest, config: &Config) -> APIResponse {
         // Further authentication checks will be conducted in services.rs
         } else {
             // Due to the implementation of this result in services.rs, this JSON object will not be outputted.
-            APIResponse {
+            APIVerification {
                 success: false,
                 error: false,
                 reason: "No valid authentication was found".to_string(),
@@ -56,14 +56,14 @@ pub fn is_api_ok(http: HttpRequest, config: &Config) -> APIResponse {
     } else {
         // If the API key isn't set, but an API Key header is provided
         if get_api_header(&http).is_some() {
-            APIResponse {
+            APIVerification {
                 success: false,
                 error: true,
                 reason: "An API key was provided, but the 'api_key' environment variable is not configured in the Chhoto URL instance".to_string(), 
                 pass: false
             }
         } else {
-            APIResponse {
+            APIVerification {
                 success: false,
                 error: false,
                 reason: "".to_string(),

actix/src/services.rs

@@ -31,7 +31,7 @@ pub enum ChhotoError {
 
 // Define JSON struct for returning success/error data
 #[derive(Serialize)]
-struct Response {
+struct JSONResponse {
     success: bool,
     error: bool,
     reason: String,
@@ -115,15 +115,15 @@ pub async fn add_link(
                 HttpResponse::Created().json(response)
             }
             Err(ServerError) => {
-                let response = Response {
+                let response = JSONResponse {
                     success: false,
                     error: true,
                     reason: "Something went wrong when adding the link.".to_string(),
                 };
                 HttpResponse::InternalServerError().json(response)
             }
             Err(ClientError { reason }) => {
-                let response = Response {
+                let response = JSONResponse {
                     success: false,
                     error: true,
                     reason,
@@ -192,15 +192,15 @@ pub async fn expand(req: String, data: web::Data<AppState>, http: HttpRequest) -
                 HttpResponse::Ok().json(body)
             }
             Err(ServerError) => {
-                let body = Response {
+                let body = JSONResponse {
                     success: false,
                     error: true,
                     reason: "Something went wrong when finding the link.".to_string(),
                 };
                 HttpResponse::BadRequest().json(body)
             }
             Err(ClientError { reason }) => {
-                let body = Response {
+                let body = JSONResponse {
                     success: false,
                     error: true,
                     reason,
@@ -226,23 +226,23 @@ pub async fn edit_link(
     if result.success || is_session_valid(session, config) {
         match utils::edit_link(&req, &data.db, config) {
             Ok(()) => {
-                let body = Response {
+                let body = JSONResponse {
                     success: true,
                     error: false,
                     reason: String::from("Edit was successful."),
                 };
                 HttpResponse::Created().json(body)
             }
             Err(ServerError) => {
-                let body = Response {
+                let body = JSONResponse {
                     success: false,
                     error: true,
                     reason: "Something went wrong when editing the link.".to_string(),
                 };
                 HttpResponse::InternalServerError().json(body)
             }
             Err(ClientError { reason }) => {
-                let body = Response {
+                let body = JSONResponse {
                     success: false,
                     error: true,
                     reason,
@@ -377,7 +377,7 @@ pub async fn login(req: String, session: Session, data: web::Data<AppState>) ->
         if let Some(valid_pass) = authorized {
             if !valid_pass {
                 warn!("Failed login attempt!");
-                let response = Response {
+                let response = JSONResponse {
                     success: false,
                     error: true,
                     reason: "Wrong password!".to_string(),
@@ -390,7 +390,7 @@ pub async fn login(req: String, session: Session, data: web::Data<AppState>) ->
             .insert("chhoto-url-auth", auth::gen_token())
             .expect("Error inserting auth token.");
 
-        let response = Response {
+        let response = JSONResponse {
             success: true,
             error: false,
             reason: "Correct password!".to_string(),
@@ -442,23 +442,23 @@ pub async fn delete_link(
     if result.success {
         match utils::delete_link(&shortlink, &data.db, data.config.allow_capital_letters) {
             Ok(()) => {
-                let response = Response {
+                let response = JSONResponse {
                     success: true,
                     error: false,
                     reason: format!("Deleted {shortlink}"),
                 };
                 HttpResponse::Ok().json(response)
             }
             Err(ServerError) => {
-                let response = Response {
+                let response = JSONResponse {
                     success: false,
                     error: true,
                     reason: "Something went wrong when deleting the link.".to_string(),
                 };
                 HttpResponse::InternalServerError().json(response)
             }
             Err(ClientError { reason }) => {
-                let response = Response {
+                let response = JSONResponse {
                     success: false,
                     error: true,
                     reason,