feat: implement provider and student specific login contexts

src/pages/api/comparisons.rs

@@ -1,6 +1,5 @@
-use std::collections::HashMap;
 #[cfg(feature = "ssr")]
-use crate::pages::utils::server_utils::create_dynamo_client;
+use crate::utils::server::create_dynamo_client;
 
 #[cfg(feature = "ssr")]
 use aws_sdk_dynamodb::error::ProvideErrorMetadata;
@@ -12,6 +11,7 @@ use crate::common::{
     ComparisonData, ComparisonType, MapListComparison, NumberComparison, NumberListComparison,
     TextComparison, TextListComparison, ValueType,
 };
+use std::collections::HashMap;
 use leptos::prelude::ServerFnError;
 use leptos::server;
 

src/pages/api/scholarships.rs

@@ -8,7 +8,7 @@ use leptos::leptos_dom::log;
 #[cfg(feature = "ssr")]
 use uuid::Uuid;
 #[cfg(feature = "ssr")]
-use crate::pages::utils::server_utils::create_dynamo_client;
+use crate::utils::server::{create_dynamo_client, into_attr_map};
 #[cfg(feature = "ssr")]
 use crate::common::ValueType;
 
@@ -51,7 +51,6 @@ pub async fn get_scholarship_info(id: String) -> Result<ExpandableInfo, ServerFn
 
 #[server(CreateScholarshipInfo, endpoint = "/scholarship/info/create")]
 pub async fn create_scholarship_info(info: ExpandableInfo) -> Result<(), ServerFnError> {
-    use crate::pages::utils::server_utils::create_dynamo_client;
     use aws_sdk_dynamodb::error::ProvideErrorMetadata;
 
     let client = create_dynamo_client().await;

src/pages/comparison_test.rs

@@ -3,12 +3,12 @@ use super::api::{get_all_scholarship_info, get_comparison_info};
 use super::home_page::get_submission;
 use crate::common::{ComparisonData, ExpandableInfo, ValueType};
 use crate::components::{ActionButton, Loading, Panel, Row};
-use crate::pages::utils::get_user_claims;
 use leptos::either::Either;
 use leptos::leptos_dom::logging::console_log;
 use leptos::logging::log;
 use leptos::prelude::*;
 use leptos_oidc::{AuthLoaded, Authenticated};
+use crate::utils::get_user_claims;
 
 #[component]
 pub fn ComparisonTestPage() -> impl IntoView {

src/pages/home_page.rs

@@ -10,7 +10,6 @@ use std::io::Write;
 
 use crate::common::{ComparisonData, ExpandableInfo};
 use crate::pages::UnauthenticatedPage;
-use crate::pages::utils::get_user_claims;
 use crate::components::{
     ActionButton, CheckboxList, Loading, MultiEntry, OutlinedTextField, Panel, RadioList, Row,
     Select, TextFieldType, ValidatedForm
@@ -26,6 +25,7 @@ use leptos::web_sys::HtmlAnchorElement;
 use leptos::wasm_bindgen::JsCast;
 use std::collections::HashMap;
 use crate::pages::api::get_comparisons_categorized;
+use crate::utils::get_user_claims;
 
 /// # Get Student Info
 /// Gets a student's information given their `subject`.

src/pages/mod.rs

@@ -7,7 +7,6 @@ mod provider_portal;
 mod scholarship_info;
 mod test_page;
 mod unauthenticated_page;
-mod utils;
 mod provider_contact;
 mod auth_callback;
 

src/pages/provider_contact.rs

@@ -1,14 +1,14 @@
-use std::collections::HashMap;
+#[cfg(feature = "ssr")]
+use crate::utils::server::{create_dynamo_client, into_attr_map};
+
+use std::collections::HashMap;
 use leptos::logging::log;
 use leptos::prelude::*;
 use leptos_oidc::{AuthLoaded, Authenticated};
 use crate::common::ValueType;
 use crate::components::{Banner, Loading, OutlinedTextField, Panel, Row, TextFieldType, Toast, ToastContext, ToastList, ValidatedForm};
 use crate::pages::UnauthenticatedPage;
-use crate::pages::utils::get_user_claims;
-
-#[cfg(feature = "ssr")]
-use crate::pages::utils::server_utils::create_dynamo_client;
+use crate::utils::get_user_claims;
 
 #[cfg(feature = "ssr")]
 static PROVIDER_CONTACT_TABLE: &str = "leptos-provider-contacts";
@@ -52,7 +52,6 @@ async fn get_provider_contact(id: String) -> Result<HashMap<String, ValueType>,
 #[server]
 async fn put_provider_contact(id: String, contact_info: HashMap<String, ValueType>) -> Result<(), ServerFnError> {
     use aws_sdk_dynamodb::error::ProvideErrorMetadata;
-    use crate::pages::utils::server_utils::into_attr_map;
 
     let client = create_dynamo_client().await;
 

src/pages/scholarship_info.rs

@@ -8,7 +8,7 @@ use leptos_router::hooks::{use_navigate, use_params};
 use crate::common::{ExpandableInfo, ScholarshipFormParams, SubmitStatus, ValueType};
 use crate::components::{ActionButton, Banner, ChipsList, Loading, OutlinedTextField, Panel, RadioList, Row, TextFieldType, Toast, ToastContext, ToastList, ValidatedForm};
 use super::UnauthenticatedPage;
-use crate::pages::utils::get_user_claims;
+use crate::utils::get_user_claims;
 use super::api::{get_provider_scholarships, get_scholarship_info, CreateScholarshipInfo, RegisterScholarship, DeleteProviderScholarship, get_comparisons_categorized, CreateTestComparisons};
 
 

src/pages/utils.rs

@@ -1,42 +0,0 @@
-use crate::common::UserClaims;
-use leptos::prelude::{Signal, With, use_context};
-use leptos_oidc::{Algorithm, AuthSignal, TokenData};
-
-/// # Server Utilities
-///
-/// These utility functions can only be used from the server. They are created to use server-side
-/// dependencies like the AWS SDK. Use of these functions will crash the front end, as these
-/// dependencies cannot be compiled for WASM (nor should they be).
-#[cfg(feature = "ssr")]
-pub mod server_utils {
-    use std::collections::HashMap;
-    use aws_config::SdkConfig;
-    use crate::common::ValueType;
-
-    /// Creates an [`SdkConfig`] struct for use with AWS SDK structs.
-    pub async fn create_aws_config() -> SdkConfig {
-        aws_config::load_defaults(aws_config::BehaviorVersion::latest()).await
-    }
-
-    /// Creates a DynamoDB client.
-    pub async fn create_dynamo_client() -> aws_sdk_dynamodb::Client {
-        aws_sdk_dynamodb::Client::new(&create_aws_config().await)
-    }
-
-    pub fn into_attr_map(map: HashMap<String, ValueType>) -> HashMap<String, aws_sdk_dynamodb::types::AttributeValue> {
-        map.into_iter().map(|(k, v)| (k, v.into())).collect()
-    }
-}
-
-/// Gets the current user claims. This function should only be used in an area that has
-/// access to an AuthSignal, or it will result in a total failure.
-pub fn get_user_claims() -> Signal<Option<TokenData<UserClaims>>> {
-    let auth = use_context::<AuthSignal>().expect("Couldn't find AuthSignal.");
-    Signal::derive(move || {
-        auth.with(|auth| {
-            auth.authenticated().and_then(|data| {
-                data.decoded_access_token::<UserClaims>(Algorithm::RS256, &["account"])
-            })
-        })
-    })
-}