Skip to content
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

📁 Fix user not always defined #2703

Merged
merged 1 commit into from
Jan 24, 2023
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
4 changes: 2 additions & 2 deletions twake/backend/node/src/services/documents/services/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ export class DocumentsService {
//In the case of the trash we definitively delete the items
if (id === "trash") {
//Only administrators can execute this action
const role = await gr.services.companies.getUserRole(context.company.id, context.user.id);
const role = await gr.services.companies.getUserRole(context.company.id, context.user?.id);
if (hasCompanyAdminLevel(role) === false) {
throw new CrudException("Only administrators can empty the trash", 403);
}
Expand Down Expand Up @@ -538,7 +538,7 @@ export class DocumentsService {
ids,
version_id: versionId,
company_id: context.company.id,
user_id: context.user.id,
user_id: context.user?.id,
});
};

Expand Down
14 changes: 7 additions & 7 deletions twake/backend/node/src/services/documents/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ export const getDefaultDriveItem = (
const defaultDriveItem = merge<DriveFile, Partial<DriveFile>>(new DriveFile(), {
company_id: context.company.id,
added: item.added || new Date().getTime().toString(),
creator: item.creator || context.user.id,
creator: item.creator || context.user?.id,
is_directory: item.is_directory || false,
is_in_trash: false,
last_user: item.last_user || context.user.id,
last_user: item.last_user || context.user?.id,
last_modified: new Date().getTime().toString(),
parent_id: item.parent_id || "root",
root_group_folder: item.root_group_folder || "",
Expand All @@ -64,7 +64,7 @@ export const getDefaultDriveItem = (
level: "none",
},
{
id: context.user.id,
id: context.user?.id,
type: "user",
level: "manage",
},
Expand Down Expand Up @@ -109,7 +109,7 @@ export const getDefaultDriveItemVersion = (
): FileVersion => {
const defaultVersion = merge(new FileVersion(), {
application_id: version.application_id || "",
creator_id: version.creator_id || context.user.id,
creator_id: version.creator_id || context.user?.id,
data: version.data || {},
date_added: version.date_added || new Date().getTime(),
file_id: version.file_id || "",
Expand Down Expand Up @@ -173,7 +173,7 @@ export const hasAccessLevel = (
export const isCompanyGuest = async (context: CompanyExecutionContext): Promise<boolean> => {
const userRole = await globalResolver.services.companies.getUserRole(
context.company.id,
context.user.id,
context.user?.id,
);

return userRole === "guest";
Expand All @@ -188,7 +188,7 @@ export const isCompanyGuest = async (context: CompanyExecutionContext): Promise<
export const isCompanyAdmin = async (context: CompanyExecutionContext): Promise<boolean> => {
const userRole = await globalResolver.services.companies.getUserRole(
context.company.id,
context.user.id,
context.user?.id,
);

return userRole === "admin";
Expand Down Expand Up @@ -386,7 +386,7 @@ export const getAccessLevel = async (
const accessEntities = item.access_info.entities || [];

//Users
const matchingUser = accessEntities.find(a => a.type === "user" && a.id === context.user.id);
const matchingUser = accessEntities.find(a => a.type === "user" && a.id === context.user?.id);
if (matchingUser) return matchingUser.level;

//Channels
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,12 @@ export class DocumentsController {

return {
...(await globalResolver.services.documents.documents.get(id, context)),
websockets: globalResolver.platformServices.realtime.sign(
[{ room: `/companies/${context.company.id}/documents/item/${id}` }],
request.currentUser.id,
),
websockets: request.currentUser?.id
? globalResolver.platformServices.realtime.sign(
[{ room: `/companies/${context.company.id}/documents/item/${id}` }],
request.currentUser?.id,
)
: [],
};
};

Expand Down