Skip to content

Commit

Permalink
fix fetching endpoints
Browse files Browse the repository at this point in the history
  • Loading branch information
@Truiteseche
Truiteseche committed Feb 25, 2024
1 parent feda78b commit 2ae2338
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 15 deletions.
38 changes: 24 additions & 14 deletions src/App.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1034,17 +1034,18 @@ export default function App() {
const options = {
body: "data=" + JSON.stringify(payload),
method: "POST",
signal: controller.signal
signal: controller.signal,
referrerPolicy: "no-referrer"
}

const messages = {
submitButtonText: "",
submitErrorMessage: ""
};

// fetch(`https://api.ecoledirecte.com/v3/login.awp?v=${apiVersion}`, options)
// fetch(`https://api.ecole-directe.plus/proxy?url=https://api.ecoledirecte.com/v3/login.awp?v=${apiVersion}`, options)
fetch(getProxiedURL(`https://api.ecoledirecte.com/v3/login.awp?v=${apiVersion}`), options)
// fetch(getProxiedURL(`https://api.ecoledirecte.com/v3/login.awp?v=${apiVersion}`), options)
fetch(`https://api.ecoledirecte.com/v3/login.awp?v=${apiVersion}`, options)
// fetch(`https://server.ecoledirecte.neptunium.fr/api/user/login`, options)
.then((response) => response.json())
.then((response) => {
Expand Down Expand Up @@ -1133,15 +1134,17 @@ export default function App() {
anneeScolaire: getUserSettingValue("isSchoolYearEnabled") ? getUserSettingValue("schoolYear").join("-") : ""
}

fetch(getProxiedURL(`https://api.ecoledirecte.com/v3/eleves/${accountsListState[activeAccount].id}/timeline.awp?verbe=get&v=${apiVersion}`),
// fetch(getProxiedURL(`https://api.ecoledirecte.com/v3/eleves/${accountsListState[activeAccount].id}/timeline.awp?verbe=get&v=${apiVersion}`),
fetch(`https://api.ecoledirecte.com/v3/eleves/${accountsListState[activeAccount].id}/timeline.awp?verbe=get&v=${apiVersion}`,
{
method: "POST",
headers: {
"user-agent": navigator.userAgent,
"x-token": tokenState,
},
body: `data=${JSON.stringify(data)}`,
signal: controller.signal
signal: controller.signal,
referrerPolicy: "no-referrer"
})
.then((response) => response.json())
.then((response) => {
Expand Down Expand Up @@ -1182,7 +1185,8 @@ export default function App() {
}
return await fetch(
// `https://raspi.ecole-directe.plus:3000/proxy?url=https://api.ecoledirecte.com/v3/telechargement.awp?verbe=get&fichierId=${file}&leTypeDeFichier=NODEVOIR&idDevoir=${id}&v=${apiVersion}`,
getProxiedURL(`https://api.ecoledirecte.com/v3/telechargement.awp?verbe=get&fichierId=${file}&leTypeDeFichier=NODEVOIR&idDevoir=${id}&v=${apiVersion}`),
// getProxiedURL(`https://api.ecoledirecte.com/v3/telechargement.awp?verbe=get&fichierId=${file}&leTypeDeFichier=NODEVOIR&idDevoir=${id}&v=${apiVersion}`),
`https://api.ecoledirecte.com/v3/telechargement.awp?verbe=get&fichierId=${file}&leTypeDeFichier=NODEVOIR&idDevoir=${id}&v=${apiVersion}`,
// `https://raspi.ecole-directe.plus:3000/proxy?url=https://api.ecoledirecte.com/v3/telechargement.awp?verbe=get&fichierId=${file}&leTypeDeFichier=NODEVOIR&idDevoir=${id}&v=${apiVersion}`,
{
method: "POST",
Expand All @@ -1193,7 +1197,7 @@ export default function App() {
cors: "no-cors",
body: `data=${JSON.stringify(data)}`,
signal: controller.signal,
redirect: 'follow'
referrerPolicy: "no-referrer"
},
)
.then(response => response.blob())
Expand Down Expand Up @@ -1221,18 +1225,20 @@ export default function App() {
fetch(
// `https://api.ecoledirecte.com/v3/eleves/${accountsListState[userId].id}/notes.awp?verbe=get&v=${apiVersion}`,
// `https://api.ecole-directe.plus/proxy?url=https://api.ecoledirecte.com/v3/eleves/${accountsListState[userId].id}/notes.awp?verbe=get&v=${apiVersion}`,
getProxiedURL(`https://api.ecoledirecte.com/v3/eleves/${accountsListState[userId].id}/notes.awp?verbe=get&v=${apiVersion}`),
// getProxiedURL(`https://api.ecoledirecte.com/v3/eleves/${accountsListState[userId].id}/notes.awp?verbe=get&v=${apiVersion}`),
`https://api.ecoledirecte.com/v3/eleves/${accountsListState[userId].id}/notes.awp?verbe=get&v=${apiVersion}`,
// `https://server.ecoledirecte.neptunium.fr/api/user/notes/${accountsListState[userId].id}`,
{
method: "POST",
headers: {
"user-agent": navigator.userAgent,
"x-token": tokenState
// "Content-Type": "application/json"
},
body: `data=${JSON.stringify(data)}`,
// body: JSON.stringify(data),
signal: controller.signal
signal: controller.signal,
referrerPolicy: "no-referrer",
mode: "cors",
"Sec-Fetch-Mode": "cors"
},
)
.then((response) => response.json())
Expand Down Expand Up @@ -1283,15 +1289,17 @@ export default function App() {
anneeScolaire: getUserSettingValue("isSchoolYearEnabled") ? getUserSettingValue("schoolYear").join("-") : ""
}

fetch(getProxiedURL(`https://api.ecoledirecte.com/v3/eleves/${accountsListState[activeAccount].id}/viescolaire.awp?verbe=get&v=${apiVersion}`),
// fetch(getProxiedURL(`https://api.ecoledirecte.com/v3/eleves/${accountsListState[activeAccount].id}/viescolaire.awp?verbe=get&v=${apiVersion}`),
fetch(`https://api.ecoledirecte.com/v3/eleves/${accountsListState[activeAccount].id}/viescolaire.awp?verbe=get&v=${apiVersion}`,
{
method: "POST",
headers: {
"user-agent": navigator.userAgent,
"x-token": tokenState,
},
body: `data=${JSON.stringify(data)}`,
signal: controller.signal
signal: controller.signal,
referrerPolicy: "no-referrer"
})
.then((response) => response.json())
.then((response) => {
Expand Down Expand Up @@ -1329,14 +1337,16 @@ export default function App() {
const data = {
libelle: name,
}
fetch(getProxiedURL("https://api.ecoledirecte.com/v3/messagerie/classeurs.awp?verbe=post%26v=4.46.0"),
// fetch(getProxiedURL("https://api.ecoledirecte.com/v3/messagerie/classeurs.awp?verbe=post%26v=4.46.0"),
fetch("https://api.ecoledirecte.com/v3/messagerie/classeurs.awp?verbe=post%26v=4.51.1",
{
method: "POST",
headers: {
"user-agent": navigator.userAgent,
"x-token": tokenState,
},
body: `data=${JSON.stringify(data)}`,
referrerPolicy: "no-referrer"
},
)
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Login/Login.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export default function Login({ keepLoggedIn, setKeepLoggedIn, fetchLogin, logou
En vous connectant, vous confirmez avoir lu et accepté notre <Link to="#policy" replace={true} className="policy-link" id="legal-notice">Politique de confidentialité et Conditions d'utilisation</Link>.
</p>
<p className="temp-disclaimer" id="proxy-error-notification">
Nous rencontrons quelques problèmes liés à l'API d'EcoleDirecte. Si le chargement dure, ne perdez pas votre temps à attendre la fin (elle n'arrivera pas). Nous travaillons activement sur ce problème, veuillez revenir dans quelques heures/jours.
Nous rencontrons quelques problèmes liés à l'API d'EcoleDirecte. Nous travaillons activement sur ce problème, veuillez revenir dans quelques heures/jours.
</p>
{location.hash === "#policy" && <Policy onCloseNavigateURL={""} />}
<EDPVersion currentEDPVersion={currentEDPVersion} />
Expand Down

0 comments on commit 2ae2338

Please sign in to comment.