fix: Adapt to new interface of nju authserver

Author: SuperKenVery

Dioxus.toml

@@ -5,7 +5,6 @@
 # HTML title tag content
 title = "南哪另一课表"
 
-base_path="schedule2/"
 
 # include `assets` in web platform
 [web.resource]

README.md

@@ -23,16 +23,12 @@
 <img width="935" height="768" alt="Select school page" src="https://github.com/user-attachments/assets/7eae85d8-e493-46cb-ab48-f452aaae1c93" />
 <img width="935" height="768" alt="Login page" src="https://github.com/user-attachments/assets/6fe5bfae-2aa7-4231-8894-389d73e0705f" />
 
-
-
-
 ## 使用提供的服务器
 
 [新版](https://n100.tail32664.ts.net/schedule-new/)
 
 [旧版](https://n100.tail32664.ts.net/schedule/)
 
-
 ## 隐私与数据安全
 
 此项目用于搭建一个服务器（以下称为“本服务器"），该服务器会将南大的课程表转换为iCalendar日历格式。为了从南大的服务器获取课程表，本服务器需要拿到你的统一认证用户名和密码以登陆。
@@ -86,8 +82,8 @@ db_path="./cookies.sqlite"
 # Must start with https://
 site_url="https://example.com/sub_dir"
 ```
-</details>
 
+</details>
 
 <details>
     <summary>参与开发</summary>
@@ -163,7 +159,6 @@ dx serve --hot-reload true
 
 如果要适配新学校，改第一部份就可以了。如果有问题欢迎提issue/discussion或者加QQ群讨论。
 
-
-
 更多内容可见注释，也欢迎GitHub Discussion/QQ群直接问～
+
 </details>

src/adapters/nju_undergrad/login.rs

@@ -21,7 +21,7 @@ use sqlx::prelude::FromRow;
 use std::sync::Arc;
 use std::{collections::HashMap, io::Cursor};
 use tokio::sync::Mutex;
-use tracing::info;
+use tracing::{debug, info};
 use uuid::Uuid;
 // use xee_xpath::{DocumentHandle, Documents, Queries, Query};
 
@@ -107,7 +107,7 @@ impl LoginSession for Session {
         let encrypted_password = encrypt(
             &password,
             self.context
-                .get("pwdDefaultEncryptSalt")
+                .get("pwdEncryptSalt")
                 .ok_or(anyhow!("Failed to find password encryption salt"))?,
         );
 
@@ -180,15 +180,17 @@ impl Session {
     /// by requesting the login page
     pub async fn new(db: Arc<Mutex<SqlitePool>>) -> Result<Self> {
         let (client, _jar) = build_client().await?;
+        debug!("Requesting login page");
         let login_page_response = client
             .get("https://authserver.nju.edu.cn/authserver/login")
             .send()
             .await?;
 
         let context = extract_context(login_page_response.text().await?.xptree()?)?;
 
+        debug!("Requesting captcha");
         let captcha_content = client
-            .get("https://authserver.nju.edu.cn/authserver/captcha.html")
+            .get("https://authserver.nju.edu.cn/authserver/getCaptcha.htl")
             .send()
             .await?
             .bytes()
@@ -209,7 +211,7 @@ impl Session {
 
 /// Extract some attributes on the page needed for POST requests.
 pub fn extract_context(login_page: XpathItemTree) -> Result<HashMap<String, String>> {
-    let variables = login_page.xpath("//form[@id='casLoginForm']/input")?;
+    let variables = login_page.xpath("//form[@id='pwdFromId']/input")?;
 
     let mut context = HashMap::new();
 
@@ -222,6 +224,7 @@ pub fn extract_context(login_page: XpathItemTree) -> Result<HashMap<String, Stri
         ) else {
             continue;
         };
+        debug!("Context: adding name={}, value={}", name, value);
         context.insert(name.to_string(), value.to_string());
     }
 

src/gui/steps/login.rs

@@ -19,7 +19,7 @@ pub fn Login() -> Element {
 
     rsx! {
         Hero {
-            image: "https://authserver.nju.edu.cn/authserver/custom/images/back3.jpg",
+            image: "https://authserver.nju.edu.cn/authserver/njuTheme/customStatic/web/images/back3.jpg",
 
             FieldSet {
                 onsubmit: move |event| {

src/gui/steps/select_school.rs

@@ -14,7 +14,7 @@ pub fn SchoolAPISelect() -> Element {
 
     rsx! {
         Hero {
-            image: "https://authserver.nju.edu.cn/authserver/custom/images/back3.jpg",
+            image: "https://authserver.nju.edu.cn/authserver/njuTheme/customStatic/web/images/back3.jpg",
 
             h1 {
                 class: "mb-5 text-5xl font-bold text-neutral-content",

src/gui/steps/view_link.rs

@@ -19,10 +19,10 @@ pub fn ViewLink() -> Element {
 
     rsx! {
         Hero {
-            image: "https://authserver.nju.edu.cn/authserver/custom/images/back3.jpg",
+            image: "https://authserver.nju.edu.cn/authserver/njuTheme/customStatic/web/images/back3.jpg",
 
             div {
-                class: "card bg-base-200 max-w-96 card-xl shadow-sm",
+                class: "card bg-base-200 max-w-lg card-xl shadow-sm",
 
                 div {
                     class: "card-body",