Skip to content
Merged
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
40 changes: 40 additions & 0 deletions tasky/src/routes/group.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ use crate::models::group_join_request::GroupJoinRequestRepository;
use crate::response::group::{GroupResponse, GroupsResponse};
use crate::response::shared::User;
use crate::response::Enrich;
use crate::security::StaticSecurity;
use crate::security::{IsGranted, SecurityAction};
use crate::AppState;
use actix_web::delete;
Expand Down Expand Up @@ -280,3 +281,42 @@ pub async fn remove_user(
GroupRepository::update_group(group, conn);
Ok(HttpResponse::Ok().finish())
}

/// Endpoint to leave a specific group as student
#[post("/groups/{id}/leave")]
pub async fn leave_group(
data: web::Data<AppState>,
user: web::ReqData<UserData>,
path: web::Path<(i32,)>,
) -> Result<HttpResponse, ApiError> {
let conn = &mut data.db.db.get().unwrap();
let path_data = path.into_inner();

let mut group = GroupRepository::get_by_id(path_data.0, conn).ok_or(ApiError::BadRequest {
message: "No access to group".to_string(),
})?;

if !group.is_granted(SecurityAction::Read, &user) {
return Err(ApiError::Forbidden {
message: "You are not allowed to leave this group".to_string(),
});
}

if !StaticSecurity::is_granted(crate::security::StaticSecurityAction::IsStudent, &user) {
return Err(ApiError::Forbidden {
message: "You are not a student and not able to leave this group".to_string(),
});
}

// TODO: When switching to more scalabe approach, consider adding membership verification here
// This is not nessesary for application security but would be a little extra

group.members = group
.members
.iter()
.filter(|m| m.is_some() && m.unwrap() != user.user_id)
.copied()
.collect();
GroupRepository::update_group(group, conn);
Ok(HttpResponse::Ok().finish())
}
1 change: 1 addition & 0 deletions tasky/src/routes/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ pub fn init_services(cfg: &mut web::ServiceConfig) {
.service(group::get_enlistable_users)
.service(group::enlist_user)
.service(group::remove_user)
.service(group::leave_group)
.service(group_join_request::create_join_request)
.service(group_join_request::get_join_requests)
.service(group_join_request::approve_join_request)
Expand Down
8 changes: 8 additions & 0 deletions web/app/groups/[groupId]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import UpdateGroupModal from "@/components/group/UpdateGroupModal";
import useCurrentUser from "@/hooks/useCurrentUser";
import {isGranted} from "@/service/auth";
import {UserRoles} from "@/service/types/usernator";
import LeaveGroupModal from "@/components/group/LeaveGroupModal";

const GroupDetailsPage = ({ params }: { params: { groupId: string } }) => {
const id = parseInt(`${params.groupId}`, 10);
Expand All @@ -21,6 +22,7 @@ const GroupDetailsPage = ({ params }: { params: { groupId: string } }) => {
const [group, refetch] = useClientQuery<GroupType>(() => api.getGroup(id));
const { addGroup } = useSpotlightStage2();
const [updateModalOpen, setUpdateModalOpen] = useState<boolean>(false);
const [leaveModalOpen, setLeaveModalOpen] = useState<boolean>(false);
const { t } = useTranslation("common");

useEffect(() => {
Expand Down Expand Up @@ -48,6 +50,9 @@ const GroupDetailsPage = ({ params }: { params: { groupId: string } }) => {
{(isGranted(user, [UserRoles.Admin]) || group?.tutor.id === user?.id) && (
<Button onClick={() => setUpdateModalOpen(true)}>{t('common:titles.update-group')}</Button>
)}
{isGranted(user, [UserRoles.Student]) && (
<Button color="red" onClick={() => setLeaveModalOpen(true)}>{t('group:actions.leave')}</Button>
)}
</Group>
{group === null ? (
<CentralLoading />
Expand All @@ -61,6 +66,9 @@ const GroupDetailsPage = ({ params }: { params: { groupId: string } }) => {
refetch={refetch}
/>
)}
{leaveModalOpen && group && (
<LeaveGroupModal groupId={group.id} onClose={() => setLeaveModalOpen(false)} />
)}
</Container>
);
};
Expand Down
50 changes: 50 additions & 0 deletions web/components/group/LeaveGroupModal.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
import {Button, Group, Modal, Text} from "@mantine/core";
import {useTranslation} from "react-i18next";
import useApiServiceClient from "@/hooks/useApiServiceClient";
import {useRouter} from "next/navigation";
import {showNotification} from "@mantine/notifications";


interface LeaveGroupModalProps {
groupId: number;
onClose: () => void;
}

const LeaveGroupModal = ({groupId, onClose}: LeaveGroupModalProps) => {

const {t} = useTranslation(['group', 'common']);
const api = useApiServiceClient();
const router = useRouter();

const leave = async () => {
try {
await api.leaveGroup(groupId);
showNotification({
title: t('common:messages.success'),
message: t('group:messages.left-group')
});
router.push('/my-groups');
} catch (e: any) {
showNotification({
title: t('common:messages.error'),
message: e?.message ?? "",
})
}
}

return (
<Modal opened onClose={onClose} title={t('group:actions.leave')}>
<Text>
{t('group:text.leave-group')}
</Text>
<Group mt={10}>
<Button onClick={leave} color="red">{t("group:actions.leave")}</Button>
<Button onClick={onClose} color="gray">
{t("common:actions.cancel")}
</Button>
</Group>
</Modal>
);
}

export default LeaveGroupModal;
9 changes: 7 additions & 2 deletions web/public/locales/de/group.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,18 @@
"request-join": "Beitritt anfragen",
"create-group": "Gruppe erstellen",
"enlist-user": "Nutzer einschreiben",
"enlist": "Einschreiben"
"enlist": "Einschreiben",
"leave": "Verlassen"
},
"messages": {
"join-request-created-title": "Beitrittsanfrage erstellt",
"join-request-created-text": "Beitrittsanfrage für die Gruppe erstellt ",
"unknown-user": "Unbekannter Nutzer",
"enlisted-title": "Eingeschrieben",
"enlisted-text": "Du wurdest erfolgreich eingeschrieben "
"enlisted-text": "Du wurdest erfolgreich eingeschrieben ",
"left-group": "Gruppe erfolgreich verlassen"
},
"text": {
"leave-group": "Bist du sicher, dass du die Gruppe verlassen möchtest?"
}
}
9 changes: 7 additions & 2 deletions web/public/locales/en/group.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,18 @@
"request-join": "Request Join",
"create-group": "Create group",
"enlist-user": "Enlist user",
"enlist": "Enlist"
"enlist": "Enlist",
"leave": "Leave"
},
"messages": {
"join-request-created-title": "Join Request created",
"join-request-created-text": "Created join request on group ",
"unknown-user": "Unknown user",
"enlisted-title": "Enlisted",
"enlisted-text": "You successfully enlisted into group "
"enlisted-text": "You successfully enlisted into group ",
"left-group": "Left group successfully"
},
"text": {
"leave-group": "Are you sure you want to leave the group?"
}
}
4 changes: 4 additions & 0 deletions web/service/ApiService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,10 @@ class ApiService {
await this.post<any>("/usernator/switch_tutor", {});
}

public async leaveGroup(groupId: number): Promise<void> {
await this.post<any>(`/tasky/groups/${groupId}/leave`, {});
}

public async createOrUpdateCodeTests(
groupId: number,
assignmentId: number,
Expand Down