Skip to content

Update sessions to be a list #292

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.

Sign up for GitHub

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

Closed
ZohebShaikh wants to merge 1 commit into from
Closed

Update sessions to be a list #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions policy/diamond/policy/session/session.rego
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,11 @@ write_to_beamline_visit if {
matches_beamline
}

user_sessions contains session if {
subject := token.claims.fedid
user_sessions contains user_session if {
some session in data.diamond.data.sessions
access_session(subject, session.proposal_number, session.visit_number)
access_session(token.claims.fedid, session.proposal_number, session.visit_number)
user_session := sprintf(
"\"proposal_number\": %d, \"visit_number\": %d, \"beamline\": %s",
[session.proposal_number, session.visit_number, session.beamline],
)
}
12 changes: 6 additions & 6 deletions policy/diamond/policy/session/session_test.rego
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,18 +186,18 @@ test_user_session_tags if {
session.user_sessions == set() with data.diamond.data as diamond_data
with data.diamond.policy.token.claims as {"fedid": "oscar"}
session.user_sessions == {
{"proposal_number": 1, "visit_number": 2, "beamline": "b07"},
{"proposal_number": 1, "visit_number": 1, "beamline": "i03"},
"\"proposal_number\": 1, \"visit_number\": 2, \"beamline\": b07",
"\"proposal_number\": 1, \"visit_number\": 1, \"beamline\": i03",
} with data.diamond.data as diamond_data
with data.diamond.policy.token.claims as {"fedid": "alice"}
session.user_sessions == {
{"proposal_number": 1, "visit_number": 2, "beamline": "b07"},
{"proposal_number": 1, "visit_number": 1, "beamline": "i03"},
"\"proposal_number\": 1, \"visit_number\": 2, \"beamline\": b07",
"\"proposal_number\": 1, \"visit_number\": 1, \"beamline\": i03",
} with data.diamond.data as diamond_data
with data.diamond.policy.token.claims as {"fedid": "bob"}
session.user_sessions == {
{"proposal_number": 1, "visit_number": 2, "beamline": "b07"},
{"proposal_number": 1, "visit_number": 1, "beamline": "i03"},
"\"proposal_number\": 1, \"visit_number\": 2, \"beamline\": b07",
"\"proposal_number\": 1, \"visit_number\": 1, \"beamline\": i03",
} with data.diamond.data as diamond_data
with data.diamond.policy.token.claims as {"fedid": "carol"}
}
Loading