Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
P
planner-team-one
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
21
Issues
21
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Евгений Положенцев
planner-team-one
Commits
2d68f3fe
Commit
2d68f3fe
authored
Dec 23, 2022
by
Евгений Положенцев
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#119
added auth to the functions with user should be checked as author or executor
parent
a7a0a978
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
5 deletions
+8
-5
helpers.ts
planner-api/src/helpers.ts
+1
-1
copyTasks.ts
planner-api/src/routers/copyTasks.ts
+3
-3
MyTasks.js
planner-front/src/containers/MyTasks/MyTasks.js
+4
-1
No files found.
planner-api/src/helpers.ts
View file @
2d68f3fe
...
@@ -63,7 +63,7 @@ export const authAuthorOrExecutorOfTask = async(req: Request,res: Response, next
...
@@ -63,7 +63,7 @@ export const authAuthorOrExecutorOfTask = async(req: Request,res: Response, next
}
}
req
.
body
=
{...
req
.
body
,
task
:
task
}
req
.
body
=
{...
req
.
body
,
task
:
task
}
next
()
next
()
};
};
/**Check if user with the given token is executor or author of task with the given dateTimeTaskId */
/**Check if user with the given token is executor or author of task with the given dateTimeTaskId */
...
...
planner-api/src/routers/copyTasks.ts
View file @
2d68f3fe
...
@@ -2,13 +2,13 @@ import express,{Router, Request, Response } from 'express';
...
@@ -2,13 +2,13 @@ import express,{Router, Request, Response } from 'express';
import
{
Task
}
from
'../models/Task'
;
import
{
Task
}
from
'../models/Task'
;
import
{
myDataSource
}
from
'../app-data-source'
;
import
{
myDataSource
}
from
'../app-data-source'
;
import
{
DateTimeTask
}
from
'../models/DateTimeTask'
;
import
{
DateTimeTask
}
from
'../models/DateTimeTask'
;
import
{
authAuthorOrExecutorOfDateTimeTask
,
authAuthorOrExecutorOfTask
}
from
'../helpers'
;
import
{
auth
,
auth
AuthorOrExecutorOfDateTimeTask
,
authAuthorOrExecutorOfTask
}
from
'../helpers'
;
const
router
:
Router
=
express
.
Router
();
const
router
:
Router
=
express
.
Router
();
const
dataSource
=
myDataSource
;
const
dataSource
=
myDataSource
;
/** make copy of task in calendar view */
/** make copy of task in calendar view */
router
.
post
(
"/make-copy"
,
authAuthorOrExecutorOfTask
,
async
(
req
:
Request
,
res
:
Response
):
Promise
<
Response
>=>
{
router
.
post
(
"/make-copy"
,
auth
,
auth
AuthorOrExecutorOfTask
,
async
(
req
:
Request
,
res
:
Response
):
Promise
<
Response
>=>
{
const
{
taskId
,
dateTimeDue
,
dateTimeStart
,
authorStatus
,
executorStatus
,
task
}
=
req
.
body
;
const
{
taskId
,
dateTimeDue
,
dateTimeStart
,
authorStatus
,
executorStatus
,
task
}
=
req
.
body
;
if
(
!
task
)
return
res
.
status
(
401
).
send
({
message
:
'task with possible user involved is not found'
})
if
(
!
task
)
return
res
.
status
(
401
).
send
({
message
:
'task with possible user involved is not found'
})
const
newDateTimeTask
=
new
DateTimeTask
();
const
newDateTimeTask
=
new
DateTimeTask
();
...
@@ -20,7 +20,7 @@ router.post("/make-copy",authAuthorOrExecutorOfTask, async(req:Request, res:Resp
...
@@ -20,7 +20,7 @@ router.post("/make-copy",authAuthorOrExecutorOfTask, async(req:Request, res:Resp
}
)
}
)
/** change date time of copy of task in calendar view */
/** change date time of copy of task in calendar view */
router
.
put
(
"/change-copy/:dateTimeTaskId"
,
authAuthorOrExecutorOfTask
,
async
(
req
:
Request
,
res
:
Response
):
Promise
<
Response
>=>
{
router
.
put
(
"/change-copy/:dateTimeTaskId"
,
auth
,
authAuthorOrExecutorOfTask
,
async
(
req
:
Request
,
res
:
Response
):
Promise
<
Response
>=>
{
const
{
dateTimeTaskId
}
=
req
.
params
const
{
dateTimeTaskId
}
=
req
.
params
const
{
executorStatus
,
authorStatus
,
task
,
dateTimeStart
,
dateTimeDue
,
description
,
title
,
priority
}
=
req
.
body
const
{
executorStatus
,
authorStatus
,
task
,
dateTimeStart
,
dateTimeDue
,
description
,
title
,
priority
}
=
req
.
body
if
(
authorStatus
){
if
(
authorStatus
){
...
...
planner-front/src/containers/MyTasks/MyTasks.js
View file @
2d68f3fe
...
@@ -41,7 +41,9 @@ export default function EnhancedTable() {
...
@@ -41,7 +41,9 @@ export default function EnhancedTable() {
if
(
tasks
&&
tasks
?.
length
>
0
)
{
if
(
tasks
&&
tasks
?.
length
>
0
)
{
setRecievedTasks
(
tasks
);
setRecievedTasks
(
tasks
);
}
}
},
[
tasks
?.
length
,
addTaskForm
,
setAddTaskForm
,
dispatch
]);
},
[
tasks
?.
length
,
addTaskForm
,
setAddTaskForm
,
dispatch
]);
console
.
log
(
'tasks '
,
tasks
,
'projects '
,
projects
)
console
.
log
(
'tasks '
,
tasks
,
'projects '
,
projects
)
...
@@ -177,6 +179,7 @@ export default function EnhancedTable() {
...
@@ -177,6 +179,7 @@ export default function EnhancedTable() {
if
(
projectIdListForTaskSelect
.
length
>
0
)
{
if
(
projectIdListForTaskSelect
.
length
>
0
)
{
tasksFilteredByProject
=
tasks
.
filter
(
task
=>
projectIdListForTaskSelect
.
includes
(
task
.
project
?.
id
))
tasksFilteredByProject
=
tasks
.
filter
(
task
=>
projectIdListForTaskSelect
.
includes
(
task
.
project
?.
id
))
}
}
console
.
log
(
'tasksFilteredByProject '
,
tasksFilteredByProject
)
setRecievedTasks
(
tasksFilteredByProject
)
setRecievedTasks
(
tasksFilteredByProject
)
setFilterProjectTumbler
(
true
)
setFilterProjectTumbler
(
true
)
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment