Skip to content

Commit 667c283

Browse files
author
Alexandra Zwinger
committed
Make keycloak work
1 parent c47c516 commit 667c283

File tree

5 files changed

+22
-19
lines changed

5 files changed

+22
-19
lines changed

src/App.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ import {Routes, Route} from "react-router-dom";
44
import {customTheme} from "./customTheme";
55
import React from "react";
66
import Navbar from "./components/Navbar";
7-
// import {ReactKeycloakProvider} from '@react-keycloak/web'
7+
import {ReactKeycloakProvider} from '@react-keycloak/web'
88

99
import CalenderPage from './pages/CalendarPage';
1010
import Homepage from './pages/Homepage';
1111
import Settings from './pages/YourStudies';
1212
import Page404 from './pages/Page404';
1313
import Score from './pages/Score';
14-
// import keycloak from "./Keycloak";
14+
import keycloak from "./Keycloak";
1515

1616
function App() {
1717
return (
18-
/*<ReactKeycloakProvider
18+
<ReactKeycloakProvider
1919
authClient={keycloak}
2020
initOptions={{ onLoad: 'login-required', checkLoginIframe: false }}
2121
onEvent={(event, error) => {
@@ -24,7 +24,7 @@ function App() {
2424
console.error('Authentication Error:', error);
2525
}
2626
}}
27-
>*/
27+
>
2828
<ThemeProvider theme={customTheme}>
2929
<CssBaseline/>
3030
<GlobalStyles styles={{html: {WebkitFontSmoothing: "auto"}}}/>
@@ -39,7 +39,7 @@ function App() {
3939
</Routes>
4040
</div>
4141
</ThemeProvider>
42-
/*</ReactKeycloakProvider>*/
42+
</ReactKeycloakProvider>
4343
);
4444
}
4545

src/AxiosConfig.tsx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
11
import axios from 'axios';
2-
/*import keycloak from "./Keycloak";*/
2+
import keycloak from "./Keycloak";
33

44
const axiosInstance = axios.create({
55
baseURL: 'http://localhost:8080',
6+
headers: {
7+
'Content-Type': 'application/json',
8+
},
9+
withCredentials: true,
610
});
711

8-
/*axiosInstance.interceptors.request.use(
12+
axiosInstance.interceptors.request.use(
913
async (config) => {
1014
const token = keycloak.token;
1115
if (token) {
1216
config.headers['Authorization'] = `Bearer ${token}`;
1317
}
14-
console.log(token);
1518
return config;
1619
},
1720
(error) => {
1821
return Promise.reject(error);
1922
}
20-
);*/
23+
);
2124

2225
export default axiosInstance;

src/Keycloak.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
/* import Keycloak from "keycloak-js";
1+
import Keycloak from "keycloak-js";
22

33
const keycloak = new Keycloak({
44
url: 'http://localhost:7070',
5-
realm: 'study-buddies-realm',
6-
clientId: 'keycloak-client'
5+
realm: 'study-buddies',
6+
clientId: 'sb-backend'
77
});
88

99
export default keycloak;
10-
*/
11-
export class Keycloak {}
10+

src/components/CalendarComponent.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import {MeetingDto} from '../dtos/MeetingDto';
66
import '../styles/Calendar.css';
77
import {useTheme} from '@mui/material/styles';
88
import useMediaQuery from '@mui/material/useMediaQuery';
9+
import {getMeetings} from "../api/MeetingApi";
10+
import axiosInstance from "../AxiosConfig";
911

1012
export default function CalendarComponent(props: { isDialogOpen: boolean }) {
1113
const [selectedMeeting, setSelectedMeeting] = useState<MeetingDto | null>(null);
@@ -15,10 +17,9 @@ export default function CalendarComponent(props: { isDialogOpen: boolean }) {
1517

1618
const fetchMeetings = async () => {
1719
try {
18-
const response = await fetch('http://localhost:8080/meeting');
20+
const response = await getMeetings(axiosInstance);
1921

20-
const meetings = await response.json();
21-
setEvents(meetings.map(({title, date_from, date_until, description, place}: any) => ({
22+
setEvents(response.map(({title, date_from, date_until, description, place}: any) => ({
2223
title,
2324
start: new Date(date_from).toISOString(),
2425
end: new Date(date_until).toISOString(),

src/form/MeetingForm.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import dayjs from 'dayjs';
1111
import {AdapterDayjs} from '@mui/x-date-pickers/AdapterDayjs';
1212
import {deDE} from "@mui/x-date-pickers/locales";
1313
import {createMeeting} from "../api/MeetingApi";
14-
import axios from "axios";
1514
import {useForm} from "@pankod/refine-react-hook-form";
1615
import {defaultMeetingDto, MeetingDto} from "../dtos/MeetingDto";
1716
import {HttpError} from "@refinedev/core";
17+
import axiosInstance from "../AxiosConfig";
1818

1919
interface MeetingFormProps {
2020
open: boolean;
@@ -91,7 +91,7 @@ export function MeetingForm({open, onClose}: MeetingFormProps) {
9191
};
9292

9393
try {
94-
await createMeeting(axios, meetingData);
94+
await createMeeting(axiosInstance, meetingData);
9595
onClose();
9696
} catch (error) {
9797
console.error('Fehler:', error);

0 commit comments

Comments
 (0)