Refactor API token update logic and replace make_api_call with make_request

Author: rakshith-ravi

frontend/src/api/user/api_token/update.rs

@@ -1,7 +1,6 @@
-use std::collections::BTreeMap;
-
 use leptos::server_fn::codec::Json;
-use models::{api::user::*, rbac::WorkspacePermission};
+use models::api::user::*;
+use time::Time;
 
 use crate::prelude::*;
 
@@ -16,43 +15,36 @@ pub async fn update_api_token(
 	let access_token = BearerToken::from_str(access_token.unwrap().as_str())
 		.map_err(|_| ServerFnError::WrappedServerError(ErrorType::MalformedAccessToken))?;
 
-	let token_id = Uuid::parse_str(token_id.clone().as_str())
-		.map_err(|_| ServerFnError::WrappedServerError(ErrorType::WrongParameters))?;
-
-	let format = format_description!("[year]-[month]-[day]");
+	let UpdateApiTokenRequest {
+		name,
+		permissions,
+		token_nbf,
+		token_exp,
+		allowed_ips,
+	} = update_token_body;
 
 	let token_nbf = token_nbf
 		.map(|nbf| {
-			let date = Date::parse(nbf.as_str(), &format).map_err(|er| {
-				logging::log!("{:#?}", er);
-				ServerFnError::WrappedServerError(ErrorType::WrongParameters)
-			})?;
-
-			Ok::<OffsetDateTime, ServerFnError<ErrorType>>(
-				datetime!(2020-01-01 0:00 UTC).replace_date(date),
-			)
+			Time::from_hms(0, 0, 0)
+				.map(|time| nbf.replace_time(time))
+				.map_err(|_| ServerFnError::WrappedServerError(ErrorType::WrongParameters))
 		})
 		.transpose()?;
 
 	let token_exp = token_exp
-		.map(|exp| {
-			let date = Date::parse(exp.as_str(), &format).map_err(|er| {
-				logging::log!("{:#?}", er);
-				ServerFnError::WrappedServerError(ErrorType::WrongParameters)
-			})?;
-
-			Ok::<OffsetDateTime, ServerFnError<ErrorType>>(
-				datetime!(2020-01-01 0:00 UTC).replace_date(date),
-			)
+		.map(|nbf| {
+			Time::from_hms(0, 0, 0)
+				.map(|time| nbf.replace_time(time))
+				.map_err(|_| ServerFnError::WrappedServerError(ErrorType::WrongParameters))
 		})
 		.transpose()?;
 
 	let update_request_body = UpdateApiTokenRequest {
-		name: token_name,
+		name,
 		token_exp,
 		token_nbf,
 		permissions,
-		allowed_ips: None,
+		allowed_ips,
 	};
 
 	make_request::<UpdateApiTokenRequest>(
@@ -63,7 +55,7 @@ pub async fn update_api_token(
 				authorization: access_token,
 				user_agent: UserAgent::from_str("hyper/0.12.2").unwrap(),
 			})
-			.body(update_token_body)
+			.body(update_request_body)
 			.build(),
 	)
 	.await

frontend/src/api/workspace/deployment/stream_logs.rs

@@ -20,7 +20,7 @@ pub async fn stream_deployment_logs(
 	let _workspace_id = workspace_id
 		.ok_or_else(|| ServerFnError::WrappedServerError(ErrorType::WrongParameters))?;
 
-	// let x = make_api_call::<StreamDeploymentLogsRequest>(
+	// let x = make_request::<StreamDeploymentLogsRequest>(
 	// 	ApiRequest::builder()
 	// 		.path(StreamDeploymentLogsPath {
 	// 			deployment_id,

frontend/src/pages/auth/login.rs

@@ -18,7 +18,7 @@ pub async fn login(
 	let LoginResponse {
 		access_token,
 		refresh_token,
-	} = make_api_call::<LoginRequest>(
+	} = make_request::<LoginRequest>(
 		ApiRequest::builder()
 			.path(LoginPath)
 			.query(())
@@ -35,7 +35,7 @@ pub async fn login(
 	.await?
 	.body;
 
-	let workspaces = make_api_call::<ListUserWorkspacesRequest>(
+	let workspaces = make_request::<ListUserWorkspacesRequest>(
 		ApiRequest::builder()
 			.path(ListUserWorkspacesPath)
 			.query(())

frontend/src/pages/auth/sign_up.rs

@@ -13,7 +13,7 @@ pub async fn sign_up(
 	username: String,
 	password: String,
 ) -> Result<(), ServerFnError<ErrorType>> {
-	make_api_call::<CreateAccountRequest>(
+	make_request::<CreateAccountRequest>(
 		ApiRequest::builder()
 			.path(CreateAccountPath)
 			.query(())
@@ -80,7 +80,7 @@ pub fn SignUpForm(
 	// 		}
 
 	// 		let Ok(IsEmailValidResponse { available }) =
-	// make_api_call::<IsEmailValidRequest>( 			ApiRequest::builder()
+	// make_request::<IsEmailValidRequest>( 			ApiRequest::builder()
 	// 				.path(IsEmailValidPath)
 	// 				.query(IsEmailValidQuery { email })
 	// 				.headers(IsEmailValidRequestHeaders {
@@ -121,7 +121,7 @@ pub fn SignUpForm(
 	// 		}
 
 	// 		let Ok(IsUsernameValidResponse { available }) =
-	// 			make_api_call::<IsUsernameValidRequest>(
+	// 			make_request::<IsUsernameValidRequest>(
 	// 				ApiRequest::builder()
 	// 					.path(IsUsernameValidPath)
 	// 					.query(IsUsernameValidQuery { username })

frontend/src/utils/ext_traits.rs

@@ -54,23 +54,3 @@ where
 		Signal::derive(move || f(self.get()))
 	}
 }
-
-/// A trait to extend the [`String`] type with some useful methods that are not
-/// available in the standard library. This is useful for adding utility methods
-/// to the [`String`] type without polluting the global namespace.
-pub trait StringExt {
-	/// Wraps the [`String`] into an option depending on whether it's empty
-	/// Returns [`None`] if string is empty otherwise returns the string wrapped
-	/// in a [`Some()`]
-	fn some_if_not_empty(self) -> Option<String>;
-}
-
-impl StringExt for String {
-	fn some_if_not_empty(self) -> Option<String> {
-		if self.is_empty() {
-			None
-		} else {
-			Some(self)
-		}
-	}
-}