Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
ZeusWPI
Cat
Commits
db828547
Commit
db828547
authored
Feb 14, 2019
by
flynn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
more logs?
parent
517c2e53
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
src/clj/cat/routes/home.clj
src/clj/cat/routes/home.clj
+8
-3
src/clj/cat/routes/oauth.clj
src/clj/cat/routes/oauth.clj
+1
-0
No files found.
src/clj/cat/routes/home.clj
View file @
db828547
...
...
@@ -59,7 +59,7 @@
users
)))
rel-requests-out
(
seq
(
db/get-relation-requests-from-user
{
:from_id
(
:id
user
)}))
rel-requests-in
(
seq
(
db/get-relation-requests-to-user
{
:to_id
(
:id
user
)}))]
;
(log/info (str "Session: " (:session req)))
(
log/info
(
str
"Session: "
(
:session
req
)))
;(log/info (str "Relation requests: \n OUTGOING: " rel-requests-out "\n INCOMING: " rel-requests-in))
;(log/info (str "User relations: " user-relations))
;(log/info (str "Other Users: " other_users))
...
...
@@ -115,11 +115,16 @@
(
response-wrong-parameters
))))
; STATUS ENUM: (open, accepted, rejected)
(
POST
"/request_relation"
req
(
let
[
data
(
:params
req
)
[
err
result
]
(
st/validate
data
request_relation-schema
)]
(
let
[
data
(
:params
req
)
[
err
result
]
(
st/validate
data
request_relation-schema
)
from-id
(
get-in
req
[
:session
:user
:id
])]
(
if
(
nil?
from-id
)
(
response/found
(
error-page
{
:status
400
:title
"No user id found in session"
})))
(
log/info
"Post to "
(
:uri
req
)
"\n with data "
result
)
(
if
(
nil?
err
)
(
do
(
db/create-relation-request!
{
:from_id
(
get-in
req
[
:session
:user
:id
])
(
db/create-relation-request!
{
:from_id
from-id
:to_id
(
:to_id
result
)
:status
"open"
})
(
response/found
"/"
))
...
...
src/clj/cat/routes/oauth.clj
View file @
db828547
...
...
@@ -9,6 +9,7 @@
})
(
defn
set-user!
[
user
session
redirect-url
]
(
log/info
"Set user in session: "
user
)
(
let
[
new-session
(
->
session
(
assoc
:user
user
)
(
cond->
(
contains?
admins
(
:id
user
))
...
...
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