[#50] fixed mailto duplication

src/features/Calendars/CalendarSlice.ts

@@ -2,7 +2,7 @@ import { createAsyncThunk, createSlice, PayloadAction } from "@reduxjs/toolkit";
 import { Calendars } from "./CalendarTypes";
 import { CalendarEvent } from "../Events/EventsTypes";
 import { getCalendar, getCalendars } from "./CalendarApi";
-import { getOpenPaasUserId } from "../User/userAPI";
+import getOpenPaasUser from "../User/userAPI";
 import { parseCalendarEvent } from "../Events/eventUtils";
 import { deleteEvent, putEvent } from "../Events/EventApi";
 import { formatDateToYYYYMMDDTHHMMSS } from "../../utils/dateUtils";
@@ -12,7 +12,7 @@ export const getCalendarsListAsync = createAsyncThunk<
   Record<string, Calendars> // Return type
 >("calendars/getCalendars", async () => {
   const importedCalendars: Record<string, Calendars> = {};
-  const user = (await getOpenPaasUserId()) as Record<string, string>;
+  const user = (await getOpenPaasUser()) as Record<string, string>;
   const calendars = (await getCalendars(user.id)) as Record<string, any>;
   const rawCalendars = calendars._embedded["dav:calendar"];
 

src/features/User/userAPI.ts

@@ -7,7 +7,7 @@ export default async function getOpenPaasUser() {
 
 export async function searchUsers(query: string) {
   const response: any[] = await api
-    .post(`api/people/search/`, {
+    .post(`api/people/search`, {
       body: JSON.stringify({
         limit: 10,
         objectTypes: ["user", "group", "contact", "ldap"],

src/features/User/userSlice.ts

@@ -25,7 +25,7 @@ export const userSlice = createSlice({
         state.organiserData = {} as userOrganiser;
       }
       state.organiserData.cn = action.payload.name;
-      state.organiserData.cal_address = `mailto:${action.payload.email}`;
+      state.organiserData.cal_address = action.payload.email;
     },
     setTokens: (state, action) => {
       state.tokens = action.payload;
@@ -39,9 +39,11 @@ export const userSlice = createSlice({
       if (!state.organiserData) {
         state.organiserData = {} as userOrganiser;
       }
-      state.organiserData.cn = `${action.payload.firstname} ${action.payload.lastname}`;
+      if (action.payload.firstname && action.payload.lastname) {
+        state.organiserData.cn = `${action.payload.firstname} ${action.payload.lastname}`;
+      }
       if (action.payload.preferredEmail) {
-        state.organiserData.cal_address = `mailto:${action.payload.preferredEmail}`;
+        state.organiserData.cal_address = action.payload.preferredEmail;
         state.userData.email = action.payload.preferredEmail;
       }
     });