Skip to content

Authentication support via IdP #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VITE_BaseURL="https://api-test.ramanchada.ideaconsult.net/"
2,316 changes: 488 additions & 1,828 deletions package-lock.json

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,21 @@
"@radix-ui/react-icons": "^1.3.2",
"@radix-ui/react-menubar": "^1.0.4",
"@radix-ui/react-slot": "^1.0.2",
"@react-keycloak/web": "^3.4.0",
"@tanstack/react-table": "^8.13.2",
"axios": "^1.7.7",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.0",
"easy-autocomplete": "^1.3.5",
"framer-motion": "^10.18.0",
"jquery": "^3.7.1",
"json-format-highlight": "^1.0.4",
"keycloak-js": "^26.0.0",
"lucide-react": "^0.350.0",
"oidc-client-ts": "^3.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-oidc-context": "^3.2.0",
"react-router-dom": "^6.22.0",
"survey-core": "latest",
"survey-react-ui": "latest",
Expand Down
44 changes: 44 additions & 0 deletions public/serviceWorker.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
let accessToken = "";

self.addEventListener("install", (event) => {
self.skipWaiting();
});

self.addEventListener("activate", (event) => {
event.waitUntil(self.clients.claim());
});

self.addEventListener("message", (event) => {
if (event.data && event.data.type === "TOKEN") {
accessToken = event.data.token;
console.log(accessToken);
}
});

self.addEventListener("fetch", (event) => {
const { request } = event;
const url = new URL(event.request.url);

if (
accessToken &&
url.origin.startsWith("https://") &&
url.origin.endsWith(".ideaconsult.net/template") &&
request.method === "GET" &&
url.origin !== "https://iam.ideaconsult.net" &&
url.origin !== "https://idp.ideaconsult.net" &&
// request.destination === "image" &&
event.request.headers["Authorization"] == undefined
) {
const authRequest = new Request(request, {
headers: new Headers({
...request.headers,
Authorization: `Bearer ${accessToken}`,
}),
mode: "cors",
});
event.respondWith(fetch(authRequest));
console.log("with token");
} else {
console.log("without token");
}
});
11 changes: 11 additions & 0 deletions src/DataTable/TemplateTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@ export default function TemplateTable({ data }) {
},
});

console.log(table.getPageCount());
// console.log(table.getState().pagination.pageIndex);
const pageCount = table.getPageCount();
const currentPage = table.getState().pagination.pageIndex;

const setIdShosen = useSetIsShosen();
useEffect(() => {
setIdShosen(data && rowSelection ? data[rowSelection]?.uuid : null);
Expand Down Expand Up @@ -164,6 +169,12 @@ export default function TemplateTable({ data }) {
>
Previous
</button>
<div className="paginationPageCount">
<p>
page <span className="pageCurrent">{currentPage + 1}</span> of{" "}
<span className="pageCurrent">{pageCount}</span>
</p>
</div>
<button
className="paginBtn"
variant="outline"
Expand Down
25 changes: 25 additions & 0 deletions src/DialogComp/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,31 @@ button[disabled] {
color: #919191;
}

.buttonLogin {
display: flex;
align-items: center;
justify-content: space-between;
gap: 9px;
padding: 0.3rem 1rem;
border: 1px solid #def4ff !important;
background: #fff;
color: #282828;
white-space: nowrap;
border-radius: 6px;
}
.buttonLogin:hover {
display: flex;
align-items: center;
justify-content: space-between;
gap: 9px;
padding: 0.3rem 1rem;
border: 1px solid #def4ff !important;
background: #def4ff !important;
color: #282828;
white-space: nowrap;
border-radius: 6px;
}

.IconButton {
font-family: inherit;
border-radius: 100%;
Expand Down
2 changes: 2 additions & 0 deletions src/MenuBar/Header.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
display: flex;
align-items: center;
border-bottom: 1px solid #e2e2e2;
justify-content: space-between;
padding: 0 1rem 0 0;
}

.headerStartScreen {
Expand Down
57 changes: 42 additions & 15 deletions src/MenuBar/LogoBar.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,35 @@
import React, { useState } from "react";
import { Navigate } from "react-router-dom";
import "./Header.css";

import PreferencesDialog from "@/DialogComp/PreferencesDialog";
import { useKeycloak } from "@react-keycloak/web";
import { useNavigate } from "react-router-dom";

import { useSetUuid, useSetIsShosen } from "../store/store";
import { Link } from "react-router-dom";
import Button from "@/ui/Button";
import { useSetIsShosen, useSetUuid } from "../store/store";

export default function LogoBar({ startScreen, uuid, setProjectID }) {
const setUUID = useSetUuid();
const setIdShosen = useSetIsShosen();
const [projectName, setProjectName] = useState(() =>
localStorage.getItem("project")
);

const { keycloak } = useKeycloak();
const navigate = useNavigate();

const username = keycloak.tokenParsed?.preferred_username
? keycloak.tokenParsed?.preferred_username
: localStorage.getItem("username");

const stored_token = localStorage.getItem("token");

const logoutHandle = () => {
navigate("/");
localStorage.removeItem("username");
localStorage.removeItem("token");
localStorage.removeItem("refreshToken");
keycloak.logout();
};
return (
<div className={startScreen ? "headerStartScreen" : "header"}>
<div>
Expand All @@ -32,19 +48,30 @@ export default function LogoBar({ startScreen, uuid, setProjectID }) {
</h1>
</Link>
</div>
<div style={{ display: "flex", gap: "22px", alignItems: "center" }}>
{projectName ? (
<div className="projectName">
<span className="projectLabel">Project:</span>
<span>{projectName}</span>
</div>
<div className="userInfo">
<div className="username">
{keycloak.authenticated || username ? username : ""}
</div>
{keycloak.authenticated || stored_token ? (
<button
onClick={() => {
logoutHandle();
}}
className="buttonLogin"
>
Log out
</button>
) : (
<p className="projectPromt">Project is not selected</p>
<button
onClick={() => {
// navigate("/");
keycloak.login();
}}
className="buttonLogin"
>
Log in
</button>
)}
<PreferencesDialog
setProjectName={setProjectName}
projectName={projectName}
/>
</div>
</div>
);
Expand Down
4 changes: 2 additions & 2 deletions src/MenuBar/TopMenuBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import "./Header.css";

import config from "../utils/config";

import { useIntermediateData, useUuid, useProjectID } from "../store/store";
import { useIntermediateData, useProjectID, useUuid } from "../store/store";

import { postRequestUUID, downloadFile } from "../lib/request";
import { downloadFile, postRequestUUID } from "../lib/request";

export default function TopMenuBar() {
const [copied, setCopied] = useState(false);
Expand Down
50 changes: 46 additions & 4 deletions src/StartScreenComp/StartScreenComp.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,23 @@
background-color: #fff;
padding: 0 2rem;
}
.description {
line-height: 1.6rem;
}
.descriptionNew {
margin: 2rem;
margin: 1rem 0 2rem 2rem;
display: flex;
gap: 60px;
align-items: flex-start;
align-items: center;
gap: 120px;
justify-content: space-between;
}

.topBarAuth {
/* display: flex; */
justify-content: space-between;
align-items: center;
padding-top: 12px;
}

.underDev {
Expand All @@ -19,6 +31,19 @@
padding: 0.3rem 0.8rem;
border-bottom-left-radius: 6px;
border-bottom-right-radius: 6px;
margin-top: -30px;
}
.userInfo {
display: flex;
align-items: center;
gap: 12px;
}

.username {
color: #6d6d6d;
font-size: 14px;
font-weight: 600;
text-transform: capitalize;
}

.createNewBtn {
Expand Down Expand Up @@ -137,9 +162,26 @@ th {
.pagination {
margin-top: 2rem;
display: flex;
align-items: flex-end;
align-items: center;
justify-content: flex-end;
gap: 12px;
gap: 18px;
}

.paginationPageCount {
width: 110px;
/* color: #777777; */
/* text-transform: uppercase; */
font-size: 14px;
}
.pageCurrent {
display: inline-block;
background-color: #e3f6ff;
width: 20px;
height: 20px;
padding: 2px;
border-radius: 50%;
text-align: center;
font-weight: 700;
}

.paginBtn {
Expand Down
Loading
Loading