4nk/lecoffre-front
5
0
Fork 0
Code Issues 3 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

WIP: titouan #23

Closed
Titouan wants to merge 6 commits from titouan into dev
pull from: titouan
merge into: 4nk:dev
Conversation 0 Commits 6 Files Changed 8 +24 -15
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 89f7923e43 - Show all commits

21
src/front/Components/Layouts/LoginCallback/index.tsx
View File

@ -23,6 +23,7 @@ import Iframe from "src/sdk/Iframe";
import LoaderService from "src/common/Api/LeCoffreApi/sdk/Loader/LoaderService"; import LoaderService from "src/common/Api/LeCoffreApi/sdk/Loader/LoaderService";
import { ProgressInfo } from "src/common/Api/LeCoffreApi/sdk/ImportData"; import { ProgressInfo } from "src/common/Api/LeCoffreApi/sdk/ImportData";
import { FrontendVariables } from "@Front/Config/VariablesFront";
export default function LoginCallBack() { export default function LoginCallBack() {
const router = useRouter(); const router = useRouter();
@ -65,14 +66,22 @@ export default function LoginCallBack() {
async function getUser() { async function getUser() {
UserStore.instance.disconnect(); UserStore.instance.disconnect();
// TODO: review const variables = FrontendVariables.getInstance();
// HACK: If start with http://local.lecoffreio.4nkweb:3000/authorized-client if (!variables?.ANK_BASE_REDIRECT_URI || !variables?.FRONT_APP_HOST) {
// Replace with http://localhost:3000/authorized-client console.error("Redirect URIs not properly configured");
if (window.location.href.startsWith('http://local.4nkweb.com')) { } else if (window.location.href.startsWith(`${variables.ANK_BASE_REDIRECT_URI}/authorized-client`)) {
window.location.href = window.location.href.replace('http://local.4nkweb.com:3000/authorized-client', 'http://localhost:3000/authorized-client'); const newUrl = window.location.href.replace(
return; `${variables.ANK_BASE_REDIRECT_URI}/authorized-client`,
`${variables.FRONT_APP_HOST}/authorized-client`
);
history.replaceState(null, '', newUrl); // Change l'URL sans rechargement
} }
// else if (window.location.href.startsWith(variables.ANK_BASE_REDIRECT_URI)) {
// window.location.href = window.location.href.replace(`${variables.ANK_BASE_REDIRECT_URI}/authorized-client`, `${variables.FRONT_APP_HOST}/authorized-client`);
// return;
// }
const code = router.query["code"]; const code = router.query["code"];
if (code) { if (code) {
try { try {