Merge pull request #239 from Gabriel29306/pin-auth

[PRONOTE]: Les code pin sont là !
PapillonApp · Oct 1, 2024 · d582132 · d582132
2 parents b1ef029 + ac9994e
commit d582132
Show file tree

Hide file tree

Showing 9 changed files with 372 additions and 28 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/Templates/LoginView.tsx b/src/components/Templates/LoginView.tsx
@@ -56,7 +56,7 @@ const LoginView: React.FC<{
   const [username, setUsername] = useState("");
   const [password, setPassword] = useState("");
 
-  const [customFieldsInputs, setCustomFields] = useState<
+  const [customFieldsInputs, setCustomFieldsInputs] = useState<
     LoginViewCustomInput[]
   >(
     customFields.map((field) => ({
@@ -214,7 +214,7 @@ const LoginView: React.FC<{
                 <TextInput
                   value={field.value}
                   onChangeText={(text) => {
-                    setCustomFields(
+                    setCustomFieldsInputs(
                       customFieldsInputs.map((f, i) => {
                         if (i === index) {
                           return {

diff --git a/src/providers/AlertProvider.tsx b/src/providers/AlertProvider.tsx
@@ -13,7 +13,7 @@ type AlertAction = {
   backgroundColor?: string;
 };
 
-type Alert = {
+export type Alert = {
   title: string;
   message: string;
   actions?: AlertAction[];

diff --git a/src/router/helpers/types.ts b/src/router/helpers/types.ts
@@ -39,6 +39,11 @@ export type RouteParameters = {
       nextTimeToken: string
     }
   };
+  Pronote2FA_Auth: {
+    session: pronote.SessionHandle,
+    error: pronote.SecurityError,
+    accountID: string
+  };
 
   // login.ecoledirecte
   EcoleDirecteCredentials: undefined;

diff --git a/src/router/screens/login/pronote.ts b/src/router/screens/login/pronote.ts
@@ -9,6 +9,7 @@ import PronoteManualURL from "@/views/login/pronote/PronoteManualURL";
 import PronoteQRCode from "@/views/login/pronote/PronoteQRCode";
 import PronoteWebview from "@/views/login/pronote/PronoteWebview";
 import PronoteV6Import from "@/views/login/pronote/PronoteV6Import";
+import Pronote2FA_Auth from "@/views/login/pronote/Pronote2FA_Auth";
 
 
 export default [
@@ -56,4 +57,8 @@ export default [
     headerTitle: "Importer d'une ancienne version",
     presentation: "modal",
   }),
+  createScreen("Pronote2FA_Auth", Pronote2FA_Auth, {
+    headerTitle: "Connexion à PRONOTE",
+    headerBackVisible: true
+  }),
 ] as const;
diff --git a/src/services/pronote/determinate-authentication-view.tsx b/src/services/pronote/determinate-authentication-view.tsx
@@ -1,8 +1,9 @@
 import type { NativeStackNavigationProp } from "@react-navigation/native-stack";
 import type { RouteParameters } from "@/router/helpers/types";
-import { Check, KeyRound, LockKeyhole } from "lucide-react-native";
+import { KeyRound, LockKeyhole } from "lucide-react-native";
 import pronote from "pawnote";
 import {info, warn} from "@/utils/logger/logger";
+import type { Alert } from "@/providers/AlertProvider";
 
 /**
  * Va exécuter une requête pour déterminer
@@ -14,7 +15,7 @@ import {info, warn} from "@/utils/logger/logger";
 const determinateAuthenticationView = async <ScreenName extends keyof RouteParameters>(
   pronoteURL: string,
   navigation: NativeStackNavigationProp<RouteParameters, ScreenName>,
-  showAlert: any // TODO: type
+  showAlert: (alert: Alert) => void
 ): Promise<void> => {
   let instance: pronote.Instance | undefined;
   if (!pronoteURL.startsWith("https://") && !pronoteURL.startsWith("http://")) {