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.

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

Jump to bottom

fix(sipi): Don't expect API v1 status code (DSP-1114) #1763

Merged
merged 14 commits into from Dec 4, 2020
Merged

fix(sipi): Don't expect API v1 status code (DSP-1114) #1763

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
be75de1
fix(sipi): Don't expect API v1 status code.
Nov 26, 2020
c1146df
fix(sipi): Add some debugging.
Nov 26, 2020
b311ee1
style(sipi): Remove newline.
Nov 26, 2020
47baf52
Merge branch 'main' into fix/DSP-1114-sipi
Dec 1, 2020
bd5401a
fix: move sipi init scripts to the scripts folder
subotic Dec 1, 2020
8af166a
test(sipi): Try to fix test.
Dec 1, 2020
ae3d3d2
Merge branch 'main' into fix/DSP-1114-sipi
Dec 1, 2020
d9fe7cd
fix: sipi testcontainer config
subotic Dec 1, 2020
8c3e43e
Merge branch 'fix/DSP-1114-sipi' of github.com:dasch-swiss/knora-api …
subotic Dec 1, 2020
bad6587
test(sipi): Uncomment test.
Dec 2, 2020
f345669
fix: testcontainer deprecation
subotic Dec 2, 2020
9fbecd0
Merge branch 'main' into fix/DSP-1114-sipi
Dec 3, 2020
2aab29c
fix(test): Don't pass loopback interface to Sipi.
Dec 4, 2020
0c285ae
test: Fix build errors.
Dec 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 0 additions & 6 deletions sipi/config/sipi.init-knora.lua
View file
Open in desktop
Expand Up @@ -115,14 +115,8 @@ function pre_flight(prefix, identifier, cookie)
return 'deny'
end

server.log("pre_flight - status: " .. response_json.status, server.loglevel.LOG_DEBUG)
server.log("pre_flight - permission code: " .. response_json.permissionCode, server.loglevel.LOG_DEBUG)

if response_json.status ~= 0 then
-- something went wrong with the request, Knora returned a non zero status
return 'deny'
end

if response_json.permissionCode == 0 then
-- no view permission on file
return 'deny'
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/scala/org/knora/webapi/messages/admin/responder/sipimessages/SipiMessagesADM.scala
View file
Open in desktop
Expand Up @@ -45,7 +45,7 @@ case class SipiFileInfoGetRequestADM(projectID: String,
requestingUser: UserADM) extends SipiResponderRequestADM

/**
* Represents the Knora API v1 JSON response to a request for a information about a `FileValue`.
* Represents the JSON response to a request for a information about a `FileValue`.
*
* @param permissionCode a code representing the user's maximum permission on the file.
* @param restrictedViewSettings the project's restricted view settings.
Expand Down