feat: add new admin APIs and applicants page

src/app.rs

@@ -1,11 +1,6 @@
 use crate::components::ToastList;
 use crate::components::login::ProviderLoginContext;
-use crate::pages::{
+use crate::pages::{AdminApplicantsPageFallback, AdminApplicantsPageShell, AdminApplicantsStudentList, AdminHomePage, AdminProviderPage, AdminScholarshipPage, AdminShell, AdminUtilsPage, ApplicantsPageFallback, ApplicantsStudentList, AuthCallbackPage, LoanerBorrowForm, LoanerFallback, LoanerReturnForm, LoanerShell, ProviderContactPage, ProviderPortal, ScholarshipInfoPage};
-    AdminHomePage, AdminProviderPage, AdminScholarshipPage, AdminShell, AdminUtilsPage,
-    ApplicantsPageFallback, ApplicantsStudentList, AuthCallbackPage, LoanerBorrowForm,
-    LoanerFallback, LoanerReturnForm, LoanerShell, ProviderContactPage, ProviderPortal,
-    ScholarshipInfoPage,
-};
 use crate::pages::{ApplicantsPageShell, student};
 use leptos::prelude::*;
 use leptos_meta::{MetaTags, Stylesheet, Title, provide_meta_context};
@@ -126,6 +121,10 @@ fn AdminRoutes() -> impl MatchNestedRoutes + Clone {
             <Route path=path!("providers") view=AdminProviderPage />
             <Route path=path!("scholarships") view=AdminScholarshipPage />
             <Route path=path!("utilities") view=AdminUtilsPage />
+            <ParentRoute path=path!("applicants") view=AdminApplicantsPageShell>
+                <Route path=path!("") view=AdminApplicantsPageFallback />
+                <Route path=path!("/:scholarship_id") view=AdminApplicantsStudentList />
+            </ParentRoute>
         </ParentRoute>
     }
     .into_inner()

src/common/user.rs

@@ -25,6 +25,6 @@ pub struct UserClaims {
     /// The intended use for the token.
     pub token_use: String,
     /// The list of the names of user pool groups that have this user as a member.
-    #[serde(rename = "cognito:groups")]
+    #[serde(rename = "cognito:groups", default = "Vec::new")]
     pub groups: Vec<String>,
 }

src/pages/admin/applicants_list.rs

@@ -0,0 +1,579 @@
+use crate::common::{
+    ComparisonData, ExpandableInfo, SchemaContainerStyle, SchemaHeaderStyle, SchemaNode,
+    SchemaType, ValueType,
+};
+use crate::components::{ActionButton, Banner, DataDisplay, Loading};
+use crate::pages::{StudentInformationDialog, UnauthenticatedPage};
+use crate::pages::api::get_comparison_info;
+use crate::pages::api::students::{GetStudentFiles, admin_get_all_input_files, get_student_data};
+use base64::Engine;
+use leptos::ev::{Event, MouseEvent};
+use leptos::html::Dialog;
+use leptos::logging::debug_log;
+use leptos::prelude::*;
+use leptos::wasm_bindgen::JsCast;
+use leptos::web_sys;
+use leptos::web_sys::{HtmlAnchorElement, ScrollBehavior};
+use leptos_icons::Icon;
+use leptos_oidc::{AuthLoaded, AuthSignal, Authenticated};
+use leptos_router::components::Outlet;
+use leptos_router::hooks::use_navigate;
+use std::collections::HashMap;
+use leptos_router::NavigateOptions;
+
+#[component]
+pub fn AdminApplicantsPageFallback() -> impl IntoView {
+    view! {
+        <div class="flex flex-col flex-1 gap-2">
+            <h1 class="flex-1 text-center font-bold text-2xl">"Scholarship Applicants"</h1>
+            <p class="text-center text-lg">
+                "Please select a scholarship from the left to view the eligible applicants."
+            </p>
+        </div>
+    }
+}
+
+#[component]
+pub fn AdminApplicantsPageShell() -> impl IntoView {
+    // This shell needs to simply contain everything that will stay consistent across paths.
+    // The path will change to contain each scholarship's id, which will directly affect the content
+    // shown in a subroute for this page.
+
+    // As a result, this page likely only needs to contain the banner and the list of scholarships.
+    // The content will be shown within the right side, but only as a result of some subroutes,
+    // each of which is still considered a single page.
+
+    view! {
+        <div class="flex flex-row mt-5">
+            <div class="flex-1" />
+            <div class="flex-3 flex flex-row items-start">
+                <AdminApplicantsScholarshipList />
+                <div class="flex-3 text-center">
+                    <Outlet />
+                </div>
+            </div>
+            <div class="flex-1" />
+        </div>
+    }
+}
+
+#[component]
+fn AdminApplicantsScholarshipList() -> impl IntoView {
+    use crate::common::ExpandableInfo;
+
+    #[server]
+    async fn admin_get_provider_scholarships(
+        access_token: String,
+    ) -> Result<Vec<ExpandableInfo>, ServerFnError> {
+        use crate::pages::api::SCHOLARSHIPS_TABLE;
+        use crate::pages::api::tokens::validate_and_get_token_info;
+
+        let claims = validate_and_get_token_info(access_token, "us-east-1_rvCU4Xy4j", "us-east-1").await?;
+
+        // Get the information from the database.
+        let client = crate::utils::server::create_dynamo_client().await;
+
+        let output = client
+            .scan()
+            .table_name(SCHOLARSHIPS_TABLE)
+            .send()
+            .await?
+            .items
+            .unwrap_or_default()
+            .into_iter()
+            .filter_map(|item| serde_dynamo::from_item(item).ok())
+            .collect::<Vec<ExpandableInfo>>();
+
+        Ok(output)
+    }
+
+    // Use access token for user identification
+    let auth = expect_context::<AuthSignal>();
+    let access_token =
+        Memo::new(move |_| auth.with(|auth| auth.authenticated().map(|a| a.access_token())));
+
+    // We need to get the scholarships from the API. We don't need the whole scholarship, just the
+    // name and ID.
+    let trigger = Trigger::new();
+    let scholarships_res = Resource::new(
+        move || (trigger.track(), access_token.get()),
+        async move |(_, access_token)| {
+            admin_get_provider_scholarships(access_token.unwrap_or_default()).await
+        },
+    );
+
+    let navigate = use_navigate();
+
+    // This closure returns another closure that's using the correct scholarship ID.
+    // It avoids having to define it within the Transition component. It's wrapped in a Callback
+    // because this makes it Send + Sync.
+    let on_view_click = Callback::new(move |scholarship_id: String| {
+        let path = format!("/admin/applicants/{}", scholarship_id);
+        navigate(&*path, Default::default());
+    });
+
+    view! {
+        <div class="flex flex-col flex-1 rounded-md shadow-lg/33 p-2 gap-3">
+            <h2 class="text-xl font-bold flex-1 text-center">"Scholarships"</h2>
+            <Transition fallback=Loading>
+                {move || {
+                    scholarships_res
+                        .get()
+                        .map(|items_res| {
+                            let items = match items_res {
+                                Ok(items) => items,
+                                Err(e) => {
+                                    return view! {
+                                        <div>
+                                            {format!("Couldn't get scholarships: {}", e.to_string())}
+                                        </div>
+                                    }
+                                        .into_any();
+                                }
+                            };
+
+                            view! {
+                                <For
+                                    each=move || items.clone()
+                                    key=|item| item.subject.clone()
+                                    let(item)
+                                >
+                                    <ApplicantsScholarshipEntry
+                                        item=item
+                                        on_view_click=on_view_click
+                                    />
+                                </For>
+                            }
+                                .into_any()
+                        })
+                        .collect_view()
+                }}
+            </Transition>
+        </div>
+    }
+}
+
+#[component]
+fn ApplicantsScholarshipEntry(
+    #[prop()] item: ExpandableInfo,
+    #[prop(into)] on_view_click: Callback<String, ()>,
+) -> impl IntoView {
+    // Store the item's subject.
+    let subject = StoredValue::new(item.subject);
+    let scholarship_name = Memo::new(move |_| {
+        item.data
+            .get("name")
+            .map(|name| name.as_string().ok().flatten())
+            .flatten()
+            .unwrap_or("<unnamed scholarship>".to_string())
+    });
+
+    let on_click = move |_| {
+        on_view_click.run(subject.get_value());
+    };
+
+    view! {
+        <div class="flex flex-col rounded-md shadow-md hover:shadow-lg/33 transition-shadow">
+            <div class="text-center p-2">{scholarship_name}</div>
+            <div
+                class="flex-1 font-bold text-white rounded-b-md text-center cursor-pointer bg-red-800 hover:bg-red-900 p-2 transition-bg"
+                on:click=on_click
+            >
+                "View Applicants"
+            </div>
+        </div>
+    }
+}
+
+#[component]
+pub fn AdminApplicantsStudentList() -> impl IntoView {
+    use crate::pages::api::get_scholarship_info;
+    use crate::pages::api::students::admin_get_completed_students;
+    use leptos_router::hooks::use_params;
+    use leptos_router::params::Params;
+
+    /// The parameters for the page that displays this component. This may be moved to the page-level
+    /// rather than the component-level.
+    #[derive(Params, PartialEq)]
+    struct StudentListParams {
+        scholarship_id: Option<String>,
+    }
+
+    // This is in charge of finding all student information and running the comparisons.
+    // It will then display all the eligible students.
+
+    let params = use_params::<StudentListParams>();
+    let auth = expect_context::<AuthSignal>();
+    let access_token =
+        Memo::new(move |_| auth.with(|a| a.authenticated().map(|a| a.access_token())));
+
+    let scholarship_id = Memo::new(move |_| {
+        params
+            .read()
+            .as_ref()
+            .ok()
+            .and_then(|params| params.scholarship_id.clone())
+    });
+
+    #[server]
+    async fn get_eligibility_info(
+        token: String,
+        scholarship_id: String,
+    ) -> Result<
+        (
+            HashMap<String, HashMap<String, ValueType>>,
+            ExpandableInfo,
+            Vec<ComparisonData>,
+        ),
+        ServerFnError,
+    > {
+        let (students, scholarships, requirements_list) = tokio::join!(
+            admin_get_completed_students(token),
+            get_scholarship_info(scholarship_id),
+            get_comparison_info()
+        );
+
+        Ok((students?, scholarships?, requirements_list?))
+    }
+
+    let resource = Resource::new(
+        move || (access_token.get(), scholarship_id.get()),
+        move |(access_token, scholarship_id)| async move {
+            let Some(token) = access_token else {
+                return Err(ServerFnError::new("Couldn't find access token"));
+            };
+            let Some(scholarship_id) = scholarship_id else {
+                return Err(ServerFnError::new("Couldn't find scholarship ID"));
+            };
+
+            get_eligibility_info(token, scholarship_id).await
+        },
+    );
+
+    view! {
+        <div class="flex flex-col flex-1">
+            <Suspense fallback=Loading>
+                {move || {
+                    resource
+                        .get()
+                        .map(|result| {
+                            match result {
+                                Ok((students, scholarship, requirements_list)) => {
+                                    view! {
+                                        <h1 class="text-2xl font-bold">"Eligible Students"</h1>
+                                        <div class="text-lg">
+                                            "Click on a student's name to view their information and download any requested files."
+                                        </div>
+                                        <div class="text-lg">
+                                            "If your scholarship requires a transcript, please send an email to Sara Smith at "
+                                            <a
+                                                class="text-blue-500 underline"
+                                                href="mailto:ssmith@region15.org"
+                                            >
+                                                "ssmith@region15.org"
+                                            </a>"."
+                                        </div>
+                                        <AdminApplicantsStudentListView
+                                            access_token=access_token
+                                            students=students
+                                            scholarship=scholarship
+                                            requirements=requirements_list
+                                        />
+                                    }
+                                        .into_any()
+                                }
+                                Err(e) => {
+                                    view! {
+                                        <div>
+                                            "Error while getting eligible students: "{e.to_string()}
+                                        </div>
+                                    }
+                                        .into_any()
+                                }
+                            }
+                        })
+                }}
+            </Suspense>
+        </div>
+    }
+}
+
+#[component]
+fn AdminApplicantsStudentListView(
+    #[prop(into)] access_token: Signal<Option<String>>,
+    #[prop(into)] students: Signal<HashMap<String, HashMap<String, ValueType>>>,
+    #[prop(into)] scholarship: Signal<ExpandableInfo>,
+    #[prop(into)] requirements: Signal<Vec<ComparisonData>>,
+) -> impl IntoView {
+    let eligible_students = RwSignal::new(HashMap::new());
+    let error_msg = RwSignal::new(String::new());
+    // let (current_student_id, set_current_student_id) = query_signal::<String>("student_id");
+    let current_student_id = RwSignal::new(None);
+    let navigate_student = Callback::new(move |id: String| {
+        let options = web_sys::ScrollToOptions::new();
+        options.set_top(0.0);
+        options.set_behavior(ScrollBehavior::Smooth);
+
+        if let Some(window) = web_sys::window() {
+            window.scroll_to_with_scroll_to_options(&options);
+        }
+
+        current_student_id.set(Some(id));
+    });
+    let dialog_visible =
+        Signal::derive(move || !current_student_id.get().unwrap_or_default().is_empty());
+    let on_dialog_close = Callback::new(move |_| {
+        current_student_id.set(None);
+    });
+
+    let fafsa_required = Memo::new(move |_| {
+        let required = scholarship
+            .get()
+            .data
+            .get("fafsa_required")
+            .map(|v| v.as_string().ok().flatten())
+            .flatten()
+            .unwrap_or_default();
+
+        required == "Yes"
+    });
+
+    let essay_required = Memo::new(move |_| {
+        let prompt = scholarship
+            .get()
+            .data
+            .get("essay_prompt")
+            .map(|v| v.as_string().ok().flatten())
+            .flatten()
+            .unwrap_or_default();
+
+        !prompt.is_empty()
+    });
+
+    let fafsa_resource = Resource::new(
+        move || (fafsa_required.get(), access_token.get()),
+        move |(fafsa_required, access_token)| async move {
+            // Only get this information if the FAFSA is required. Otherwise, return a blank result.
+            let Some(access_token) = access_token else {
+                return Err(ServerFnError::new("Couldn't find access token"));
+            };
+            if !fafsa_required {
+                return Ok(HashMap::new());
+            }
+
+            admin_get_all_input_files(
+                access_token,
+                "financial_info".to_string(),
+                "fafsa".to_string(),
+            )
+                .await
+        },
+    );
+    let essay_resource = Resource::new(
+        move || (essay_required.get(), access_token.get()),
+        move |(essay_required, access_token)| async move {
+            // Only get this information if the scholarship requested it. Otherwise, return a blank
+            // result.
+            let Some(access_token) = access_token else {
+                return Err(ServerFnError::new("Couldn't find access token"));
+            };
+            if !essay_required {
+                return Ok(HashMap::new());
+            }
+
+            admin_get_all_input_files(
+                access_token,
+                "scholarship_essays".to_string(),
+                scholarship.get().subject,
+            )
+                .await
+        },
+    );
+
+    fn get_eligible_students(
+        students: HashMap<String, HashMap<String, ValueType>>,
+        scholarship: ExpandableInfo,
+        requirements: Vec<ComparisonData>,
+        essay_required: bool,
+        fafsa_required: bool,
+        fafsa_list: HashMap<String, Vec<String>>,
+        essay_list: HashMap<String, Vec<String>>,
+    ) -> Result<HashMap<String, HashMap<String, ValueType>>, Error> {
+        // Get the full map of requirements. Each key contains a list of IDs.
+        let scholarship_requirements = scholarship
+            .data
+            .get("requirements")
+            .map(|val| val.as_map().ok()?)
+            .flatten()
+            .unwrap_or_default();
+
+        // Get the lists of requirements. Maps into string IDs and discards invalid ValueTypes.
+        let requirement_lists = scholarship_requirements
+            .into_iter()
+            .filter_map(|(_, list_val)| {
+                let list = list_val.as_list().ok().flatten()?;
+                let string_list = list
+                    .into_iter()
+                    .filter_map(|v| v.as_string().ok().flatten())
+                    .collect::<Vec<String>>();
+
+                Some(string_list)
+            })
+            .collect::<Vec<Vec<String>>>();
+
+        // Resolve the requirement IDs. Discards all IDs that do not resolve.
+        let resolved_requirements = requirement_lists
+            .into_iter()
+            .map(|list| {
+                list.into_iter()
+                    .filter_map(|id| {
+                        requirements
+                            .iter()
+                            .cloned()
+                            .find(|requirement| requirement.id == id)
+                    })
+                    .collect::<Vec<ComparisonData>>()
+            })
+            .collect::<Vec<Vec<ComparisonData>>>();
+
+        // Check student eligibility. These are all students that have completed the demographics
+        // forms.
+        let eligible_students = students
+            .into_iter()
+            .filter_map(|(id, student)| {
+                // The student needs to pass one requirement from each list.
+                // The easiest ones to check first are whether the scholarship requires a student
+                // essay and/or their fafsa information. If the student does not have these things,
+                // they are skipped.
+
+                if fafsa_required && !fafsa_list.contains_key(&id) {
+                    // Get the student files related to their fafsa and continue. Return false if not there.
+                    debug_log!(
+                        "Student with id {id} failed - FAFSA is required but was not found."
+                    );
+                    return None;
+                }
+
+                if essay_required && !essay_list.contains_key(&id) {
+                    // Get the student's files related to their essays and continue. Return false if not there.
+                    debug_log!(
+                        "Student with id {id} failed - essay is required but was not found."
+                    );
+                    return None;
+                }
+
+                let result = resolved_requirements.iter().all(|list| {
+                    if list.is_empty() {
+                        return true;
+                    }
+                    list.iter().any(|requirement| {
+                        let result = requirement.compare(&student).unwrap_or(false);
+
+                        if !result {
+                            debug_log!(
+                                "Student with id {id} failed - requirement with id {} failed.",
+                                requirement.id
+                            );
+                        }
+
+                        result
+                    })
+                });
+
+                if result { Some((id, student)) } else { None }
+            })
+            .collect::<HashMap<String, HashMap<String, ValueType>>>();
+
+        // debug_log!("Total number of eligible students: {}", eligible_students.len());
+
+        Ok(eligible_students)
+    }
+
+    Effect::new(move || {
+        // We have to wait until we've gotten fafsa/essay requirements.
+        debug_log!("Waiting on essay and FAFSA resources...");
+        if let (Some(fafsa_list), Some(essay_list)) = (fafsa_resource.get(), essay_resource.get()) {
+            debug_log!(
+                "Running eligibility check on {} students",
+                students.get().len()
+            );
+            let eligible_res = get_eligible_students(
+                students.get(),
+                scholarship.get(),
+                requirements.get(),
+                essay_required.get(),
+                fafsa_required.get(),
+                fafsa_list.unwrap_or_default(),
+                essay_list.unwrap_or_default(),
+            );
+
+            match eligible_res {
+                Ok(list) => {
+                    debug_log!("Total number of eligible students: {}", list.len());
+                    eligible_students.set(list);
+                }
+                Err(e) => error_msg.set(format!("Failed to get eligible students list: {e}")),
+            }
+        }
+    });
+
+    // This is actually just a display of all the information from the students list.
+    // As defined in the ApplicantsStudentList component, this will already be wrapped in a
+    // flex container.
+    view! {
+        <StudentInformationDialog
+            scholarship_id=scholarship.get().subject
+            student_id=current_student_id
+            visible=dialog_visible
+            on_close=on_dialog_close
+            essay_required=essay_required
+            fafsa_required=fafsa_required
+        />
+        <Show when=move || !error_msg.get().is_empty()>
+            <div>"Error checking student eligibility: "{error_msg}</div>
+        </Show>
+        <div class="m-3 flex flex-col">
+            <div class="flex flex-row p-1 border-b-1 border-black">
+                <div class="pl-5 flex-1 text-lg font-bold text-left">"Last Name"</div>
+                <div class="pr-5 flex-1 text-lg font-bold text-left">"First Name"</div>
+            </div>
+            <For
+                each=move || eligible_students.get()
+                key=|(id, _)| id.clone()
+                children=move |(student_id, student)| {
+                    let student = StoredValue::new(student);
+                    let first_name = Memo::new(move |_| {
+                        student
+                            .get_value()
+                            .get("first_name")
+                            .map(|n| n.as_string().ok().flatten())
+                            .unwrap_or_default()
+                    });
+                    let last_name = Memo::new(move |_| {
+                        student
+                            .get_value()
+                            .get("last_name")
+                            .map(|n| n.as_string().ok().flatten())
+                            .unwrap_or_default()
+                    });
+                    let on_click = move |_| {
+                        navigate_student.run(student_id.clone());
+                    };
+                    // For now, we'll just display each student's first and last name.
+                    // Now I'll add a container with some links. These links will just be appended
+                    // to the end of the current path.
+
+                    view! {
+                        <div
+                            class="flex flex-row p-1 border-y-1 border-gray-200 cursor-pointer hover:bg-yellow-100 transition-all duration-200"
+                            on:click=on_click
+                        >
+                            <div class="pl-5 flex-1 text-lg text-left">{last_name}</div>
+                            <div class="pr-5 flex-1 text-lg text-left">{first_name}</div>
+                        </div>
+                    }
+                }
+            />
+        </div>
+    }
+}

src/pages/admin/mod.rs

@@ -3,9 +3,11 @@ mod home_page;
 mod provider_page;
 mod scholarship_page;
 mod utils_page;
+mod applicants_list;
 
 pub use shell::*;
 pub use home_page::*;
 pub use provider_page::*;
 pub use scholarship_page::*;
 pub use utils_page::*;
+pub use applicants_list::*;

src/pages/admin/shell.rs

@@ -25,6 +25,7 @@ pub fn AdminShell() -> impl IntoView {
                             TabInfo::new("Providers", "providers", None),
                             TabInfo::new("Scholarships", "scholarships", None),
                             TabInfo::new("Utilities", "utilities", None),
+                            TabInfo::new("Scholarship Applicants", "applicants", None),
                         ]
                     />
                 </Authenticated>

src/pages/api/files.rs

@@ -66,7 +66,7 @@ pub async fn upload_file(data: MultipartData) -> Result<String, ServerFnError> {
         return Err(ServerFnError::new("Missing file contents"));
     }
 
-    let user_claims = validate_and_get_token_info(access_token).await?;
+    let user_claims = validate_and_get_token_info(access_token, "us-east-1_Lfjuy5zaM", "us-east-1").await?;
     let subject = user_claims.subject;
 
     let key = format!("{form_id}/{subject}/{input_name}/{file_name}");
@@ -157,7 +157,7 @@ pub async fn delete_file(
 ) -> Result<String, ServerFnError> {
     use imports::*;
 
-    let user_claims = validate_and_get_token_info(access_token).await?;
+    let user_claims = validate_and_get_token_info(access_token, "us-east-1_Lfjuy5zaM", "us-east-1").await?;
     let subject = user_claims.subject;
 
     let entry_hk = format!("STUDENT#{subject}");
@@ -226,7 +226,7 @@ pub async fn list_files(
 ) -> Result<Vec<String>, ServerFnError> {
     use imports::*;
 
-    let user_claims = validate_and_get_token_info(access_token).await?;
+    let user_claims = validate_and_get_token_info(access_token, "us-east-1_Lfjuy5zaM", "us-east-1").await?;
     let subject = user_claims.subject;
 
     let entry_hk = format!("STUDENT#{subject}");

src/pages/api/students.rs

@@ -137,24 +137,41 @@ pub async fn get_all_student_data(
 }
 
 #[server]
-pub async fn get_completed_students(
+pub async fn provider_get_completed_students(
     access_token: String,
 ) -> Result<HashMap<String, HashMap<String, crate::common::ValueType>>, ServerFnError> {
     use imports::*;
 
+    let claims = validate_and_get_token_info(access_token, "us-east-1_Lfjuy5zaM", "us-east-1").await?;
+    if !claims.groups.contains(&"ScholarshipProviders".to_string()) {
+        return Err(ServerFnError::new(
+            "User is not in the ScholarshipProviders group",
+        ));
+    }
+
+    get_completed_students().await
+}
+
+#[server]
+pub async fn admin_get_completed_students(
+    access_token: String,
+) -> Result<HashMap<String, HashMap<String, crate::common::ValueType>>, ServerFnError> {
+    use imports::*;
+
+    let _ = validate_and_get_token_info(access_token, "us-east-1_rvCU4Xy4j", "us-east-1").await?;
+
+    get_completed_students().await
+}
+
+#[server]
+async fn get_completed_students() -> Result<HashMap<String, HashMap<String, crate::common::ValueType>>, ServerFnError> {
+    use imports::*;
+
     // We want to get all student information. The requirements are that the students have completed
     // the demographics form - everything else may bed from this.
     // The easiest way is to get all the information and filter on this side, instead of bookkeeping
     // on the database's side.
 
-    // We want to verify the access token first, and make sure that the user has the correct access.
-    let claims = validate_and_get_token_info(access_token).await?;
-    if !claims.groups.contains(&"ScholarshipProviders".to_string()) {
-        return Err(ServerFnError::new(
-            "User is not in the ScholarshipProviders group",
-        ));
-    }
-
     let client = create_dynamo_client().await;
 
     let response = client
@@ -229,7 +246,7 @@ pub async fn get_file_by_key(
 ) -> Result<Vec<u8>, ServerFnError> {
     use imports::*;
 
-    let user_claims = validate_and_get_token_info(access_token).await?;
+    let user_claims = validate_and_get_token_info(access_token, "us-east-1_Lfjuy5zaM", "us-east-1").await?;
 
     // Check if the user's subject is contained in the file_key (since all files are keyed by the
     // user's subject)
@@ -279,7 +296,7 @@ pub async fn get_student_files(
 ) -> Result<(String, Vec<u8>), ServerFnError> {
     use imports::*;
 
-    let claims = validate_and_get_token_info(access_token).await?;
+    let claims = validate_and_get_token_info(access_token, "us-east-1_Lfjuy5zaM", "us-east-1").await?;
 
     // Check if the user has permission to get these files.
     if !claims.groups.contains(&"ScholarshipProviders".to_string()) {
@@ -420,19 +437,12 @@ pub async fn get_student_files(
 ///
 /// This is only usable by users with provider-level access.
 #[server]
-pub async fn get_all_input_files(
+async fn get_all_input_files(
-    access_token: String,
     form_name: String,
     input_name: String,
 ) -> Result<HashMap<String, Vec<String>>, ServerFnError> {
     use imports::*;
 
-    let claims = validate_and_get_token_info(access_token).await?;
-
-    if !claims.groups.contains(&"ScholarshipProviders".to_string()) {
-        return Err(ServerFnError::new("Access denied: user is not a provider"));
-    }
-
     let client = create_dynamo_client().await;
 
     let res = client
@@ -473,3 +483,32 @@ pub async fn get_all_input_files(
 
     Ok(result_map)
 }
+
+#[server]
+pub async fn admin_get_all_input_files(
+    access_token: String,
+    form_name: String,
+    input_name: String,
+) -> Result<HashMap<String, Vec<String>>, ServerFnError> {
+    use imports::*;
+
+    let _ = validate_and_get_token_info(access_token, "us-east-1_rvCU4Xy4j", "us-east-1").await?;
+
+    get_all_input_files(form_name, input_name).await
+}
+
+#[server]
+pub async fn provider_get_all_input_files(
+    access_token: String,
+    form_name: String,
+    input_name: String,
+) -> Result<HashMap<String, Vec<String>>, ServerFnError> {
+    use imports::*;
+
+    let claims = validate_and_get_token_info(access_token, "us-east-1_Lfjuy5zaM", "us-east-1").await?;
+    if !claims.groups.contains(&"ScholarshipProviders".to_string()) {
+        return Err(ServerFnError::new("Access denied: user is not a provider"));
+    }
+
+    get_all_input_files(form_name, input_name).await
+}

src/pages/api/tokens.rs

@@ -17,10 +17,19 @@ pub async fn fetch_jwks(user_pool_id: String, region: String) -> Result<JwkSet,
 
 /// Validates a JWT, and, if successful, decodes it into a series of user claims.
 #[cfg(feature = "ssr")]
-pub async fn validate_and_get_token_info(token: String) -> Result<UserClaims, ServerFnError> {
+pub async fn validate_and_get_token_info(
+    token: String,
+    pool_id: impl Into<String>,
+    pool_region: impl Into<String>
+) -> Result<UserClaims, ServerFnError> {
     use jsonwebtoken::{Algorithm, Validation, decode};
 
-    let jwks = fetch_jwks("us-east-1_Lfjuy5zaM".into(), "us-east-1".into()).await?;
+    let pool_id = pool_id.into();
+
+    leptos::logging::debug_log!("Validating token using group {}", pool_id);
+
+    // let jwks = fetch_jwks("us-east-1_Lfjuy5zaM".into(), "us-east-1".into()).await?;
+    let jwks = fetch_jwks(pool_id, pool_region.into()).await?;
 
     let validation = Validation::new(Algorithm::RS256);
     // validation.set_audience(&["scholarships-rs"]);

src/pages/provider_applicants.rs

@@ -1,11 +1,8 @@
-use crate::common::{
+use crate::common::{ComparisonData, ExpandableInfo, SchemaContainerStyle, SchemaHeaderStyle, SchemaNode, SchemaType, ValueType};
-    ComparisonData, ExpandableInfo, SchemaContainerStyle, SchemaHeaderStyle, SchemaNode,
-    SchemaType, ValueType,
-};
 use crate::components::{ActionButton, Banner, DataDisplay, Loading};
 use crate::pages::UnauthenticatedPage;
 use crate::pages::api::get_comparison_info;
-use crate::pages::api::students::{GetStudentFiles, get_all_input_files, get_student_data};
+use crate::pages::api::students::{GetStudentFiles, provider_get_all_input_files, get_student_data};
 use base64::Engine;
 use leptos::ev::{Event, MouseEvent};
 use leptos::html::Dialog;
@@ -71,12 +68,12 @@ fn ApplicantsScholarshipList() -> impl IntoView {
 
     #[server]
     async fn get_provider_scholarships(
-        access_token: String,
+        access_token: String
     ) -> Result<Vec<ExpandableInfo>, ServerFnError> {
         use crate::pages::api::SCHOLARSHIPS_TABLE;
         use crate::pages::api::tokens::validate_and_get_token_info;
 
-        let claims = validate_and_get_token_info(access_token).await?;
+        let claims = validate_and_get_token_info(access_token, "us-east-1_Lfjuy5zaM".to_string(), "us-east-1".to_string()).await?;
 
         // Get the information from the database.
         let client = crate::utils::server::create_dynamo_client().await;
@@ -110,8 +107,10 @@ fn ApplicantsScholarshipList() -> impl IntoView {
     let trigger = Trigger::new();
     let scholarships_res = Resource::new(
         move || (trigger.track(), access_token.get()),
-        async move |(_, access_token)| {
+        move |(_, access_token)| async move {
-            get_provider_scholarships(access_token.unwrap_or_default()).await
+            get_provider_scholarships(
+                access_token.unwrap_or_default()
+            ).await
         },
     );
 
@@ -201,7 +200,7 @@ fn ApplicantsScholarshipEntry(
 #[component]
 pub fn ApplicantsStudentList() -> impl IntoView {
     use crate::pages::api::get_scholarship_info;
-    use crate::pages::api::students::get_completed_students;
+    use crate::pages::api::students::provider_get_completed_students;
     use leptos_router::hooks::use_params;
     use leptos_router::params::Params;
 
@@ -241,7 +240,7 @@ pub fn ApplicantsStudentList() -> impl IntoView {
         ServerFnError,
     > {
         let (students, scholarships, requirements_list) = tokio::join!(
-            get_completed_students(token),
+            provider_get_completed_students(token),
             get_scholarship_info(scholarship_id),
             get_comparison_info()
         );
@@ -374,7 +373,7 @@ fn ApplicantsStudentListView(
                 return Ok(HashMap::new());
             }
 
-            get_all_input_files(
+            provider_get_all_input_files(
                 access_token,
                 "financial_info".to_string(),
                 "fafsa".to_string(),
@@ -394,7 +393,7 @@ fn ApplicantsStudentListView(
                 return Ok(HashMap::new());
             }
 
-            get_all_input_files(
+            provider_get_all_input_files(
                 access_token,
                 "scholarship_essays".to_string(),
                 scholarship.get().subject,
@@ -592,7 +591,7 @@ fn ApplicantsStudentListView(
 }
 
 #[component]
-fn StudentInformationDialog(
+pub fn StudentInformationDialog(
     #[prop(into)] scholarship_id: Signal<String>,
     #[prop(into)] student_id: Signal<Option<String>>,
     #[prop(into)] visible: Signal<bool>,
@@ -1287,7 +1286,10 @@ fn StudentInformationDialog(
                             })
                     })}
                     {move || Suspend::new(async move {
-                        get_student_data(student_id.get().unwrap_or_default(), "family".to_string())
+                        get_student_data(
+                                student_id.get().unwrap_or_default(),
+                                "family".to_string()
+                            )
                             .await
                             .map(|student_info| {
                                 view! {