feat: added the news

Author: game2822

.gitignore

@@ -140,3 +140,4 @@ subjects.json
 timetable.json
 timetable.json
 attendance.json
+news.json

examples/news.ts

@@ -0,0 +1,46 @@
+process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
+import readline from "readline";
+import fs from "fs";
+import dotenv from "dotenv";
+import { LoginWithToken } from "../src";
+
+dotenv.config();
+
+const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+});
+
+const askQuestion = (query: string): Promise<string> => {
+    return new Promise(resolve => rl.question(query, resolve));
+};
+
+const main = async () => {
+    try {
+        const url = process.env.INSTANCE_URL ?? "";
+        const refreshToken = process.env.REFRESH_TOKEN ?? "";
+        const userId = process.env.USER_ID ?? "";
+        const deviceId = process.env.DEVICE_ID ?? "";
+
+        // Refresh token and get device ID
+        console.log("Refreshing token...");
+        const smartschool = await LoginWithToken(url, refreshToken, deviceId);
+        console.log("Token refreshed successfully.");
+
+        // Fetch news
+        console.log("\nFetching news...");
+        const news = await smartschool.GetNews();
+
+        fs.writeFileSync("news.json", JSON.stringify(news, null, 2));
+        console.log("\nNews fetched successfully:");
+        console.log(`Found ${news.length} news items.`);
+        console.log(JSON.stringify(news, null, 2));
+    } catch (error) {
+        console.error("\nAn error occurred:");
+        console.error(error);
+    } finally {
+        rl.close();
+    }
+};
+
+main();

src/rest/endpoints.ts

@@ -2,7 +2,7 @@
 export const BASE_URL = () => "https://api.skolengo.com/api/v1/bff-sko-app";
 
 export const SEARCH_SCHOOLS = () => "schools";
-export const SCHOOL_NEWS = () => "schools-info";
+export const SCHOOL_NEWS = () => "Homepage/Pnsrpc/request?method=getPnsRecentNews";
 
 export const USER_INFO = () => "mobile/accountinfo";
 export const USER_ASSIGNMENT = (id: string, userId: string, completed: string) => "planner/api/v1/planned-assignments/"+ userId.split("_")[0] + "/" + id + "/" + completed;

src/routes/School.ts

@@ -6,57 +6,41 @@ import { NewsAttributes } from "../types/News";
 import { BaseDataResponse, BaseResponse, fileIncluded } from "../types/RequestHandler";
 import { schoolIncluded } from "../types/School";
 import { getSingleRelation } from "../util/Relations";
-
-const manager = new RestManager(BASE_URL());
-
-export const GetSchoolNews = async (accessToken: string): Promise<Array<News>> => {
-    const response = await manager.get<BaseResponse>(SCHOOL_NEWS(), {
-        "include":                         "illustration,school,author,author.person,author.technicalUser",
-        "fields[schoolInfo]":              "illustration,school,author,publicationDateTime,title,shortContent,content,linkedWebSiteUrl",
-        "fields[announcement]":            "level",
-        "fields[schoolInfoFile]":          "url,alternativeText",
-        "fields[school]":                  "name",
-        "fields[schoolInfoAuthor]":        "person,technicalUser,additionalInfo",
-        "fields[person]":                  "firstName,lastName,title,photoUrl",
-        "fields[schoolInfoTechnicalUser]": "label,logoUrl",
-        "page[limit]":                     50
-    }, {
-        Authorization: `Bearer ${accessToken}`
-    });
-
-    const includedMap = new Map<string, unknown>();
-    for (const item of response.included ?? []) {
-        includedMap.set(`${item.type}:${item.id}`, item);
-    }
-
-    return (Array.isArray(response.data) ? response.data : [])
-        .filter((item): item is BaseDataResponse<"news", NewsAttributes> => item.type === "news")
+import { extractBaseUrl } from "../util/URL";
+
+
+export const GetSchoolNews = async (url: string, accessToken: string, mobileId: string): Promise<Array<News>> => {
+    const [base] = extractBaseUrl(url);
+    const manager = new RestManager(base);
+
+    const responsetext = await manager.post<any>(SCHOOL_NEWS(),
+    undefined,
+    undefined,
+     {
+        headers: {
+                "Authorization": `Bearer ${accessToken}`,
+                "Accept-Language": "fr",
+                "SmscMobileId": mobileId
+            }
+    },
+    true
+);
+    const response = JSON.parse(responsetext);
+
+    return (Array.isArray(response) ? response : [])
         .map(news => {
-            const { relationships, attributes } = news;
-
-            const illustrationId = getSingleRelation(relationships.illustration)?.id;
-            const authorData = getSingleRelation(relationships.school);
-
-            const illustration = illustrationId
-                ? includedMap.get(`schoolInfoFile:${illustrationId}`) as fileIncluded
-                : null;
-
-            const author = authorData
-                ? includedMap.get(`${authorData.type}:${authorData.id}`) as schoolIncluded
-                : null;
-
             return new News(
-                news.id,
-                new Date(attributes?.publicationDateTime ?? ""),
-                attributes?.title ?? "",
-                attributes?.shortContent ?? "",
-                attributes?.content ?? "",
+                news.newsItem.newsID,
+                new Date(news.newsItem.date_published ?? ""),
+                news.newsItem.title ?? "",
+                news.newsItem.message ?? "",
+                news.newsItem.message ?? "",
                 {
-                    id:   authorData?.id ?? "",
-                    name: author?.attributes?.name ?? ""
+                    id:   news.newsItem.author ?? "",
+                    name: news.newsItem.name ?? ""
                 },
-                attributes?.linkedWebSiteUrl ?? "",
-                new Attachment(accessToken, illustration?.id ?? "", illustration?.attributes?.url ?? "")
+                "",
+                new Attachment(accessToken, news.icon ?? "", `${base}/smsc/svg/${news.icon}/${news.icon}_24x24.svg`)
             );
         });
 };

src/structures/Smartschool.ts

@@ -86,7 +86,7 @@ export class SmartSchool {
     }
     async GetNews(): Promise<Array<News>> {
         await this.refreshAccessToken();
-        return GetSchoolNews(this.accessToken);
+        return GetSchoolNews(this.refreshURL, this.accessToken, this.SMSCMobileID);
     }
     async GetTimetable(periodStart?: Date, periodEnd?: Date): Promise<Array<TimetableDay>> {
         await this.refreshAccessToken();