Merge remote-tracking branch 'upstream/main'

Author: game2822

src/index.ts

@@ -37,4 +37,5 @@ export * from "./util/Constants";
 export * from "./util/JWT";
 export * from "./util/Relations";
 export * from "./util/URL";
+export * from "./util/Refresh"
 export * from "./util/Verifier";

src/rest/RESTManager.ts

@@ -13,20 +13,24 @@ export class RestManager {
         const { method, path, body, headers } = options;
         const url = `${this.baseURL}/${path}`;
 
-            console.log(`Sending ${method} request to:`, url, "with body:", body, "and headers:", headers);
-            let requestBody = body;
-            const contentType = headers?.["Content-Type"] || headers?.["content-type"];
-            if (body && contentType === "application/json") {
-                requestBody = JSON.stringify(body) ;
-            }
+        let requestBody: unknown = undefined;
+        let requestHeaders: Record<string, string> = {
+          "User-Agent": "@game2822/smartschool.js",
+          ...headers,
+        };
+
+        if (body instanceof URLSearchParams) {
+          requestBody = body.toString();
+          requestHeaders["Content-Type"] = "application/x-www-form-urlencoded";
+        } else if (body) {
+          requestBody = JSON.stringify(body);
+          requestHeaders["Content-Type"] = "application/json";
+        }
+
         const response = await fetch(url, {
             method,
-            body:    requestBody as any,
-            headers: {
-                "Content-Type": contentType || "application/json",
-                ...headers,
-                "User-Agent":   "@game28/smartschool.js"
-            }
+            body: requestBody,
+            headers: requestHeaders
         });
 
         if (!response.ok) {

src/routes/Grades.ts

@@ -1,4 +1,3 @@
-import { url } from "inspector";
 import { GRADES_COURSES, USER_GRADES_SETTINGS, USER_LAST_GRADES, USER_SERVICES } from "../rest/endpoints";
 import { RestManager } from "../rest/RESTManager";
 import { Grade } from "../structures/Grade";

src/structures/Smartschool.ts

@@ -21,8 +21,8 @@ import { KidData } from "../types/User";
 export class SmartSchool {
     constructor(
         protected accessToken: string,
-        protected refreshToken: string,
-        protected refreshURL: string,
+        public refreshToken: string,
+        readonly refreshURL: string,
         protected accessTokenTTL: number,
         public userId: string,
         public firstName: string,

src/util/Refresh.ts

@@ -0,0 +1,14 @@
+import { OIDCRefresh } from "../routes/OIDC";
+import { GetUserInfo } from "../routes/User";
+import { Skolengo } from "../structures/Skolengo";
+
+export async function LoginWithToken(url: string, refreshToken: string, wellKnown: string, tokenEndpoint: string, emsCode: string): Promise<Skolengo> {
+  const tokens = await OIDCRefresh(url, refreshToken);
+  return GetUserInfo(
+      tokens.access_token,
+      tokens.refresh_token,
+      wellKnown,
+      tokenEndpoint,
+      emsCode
+  );
+}