Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
b66e85a
rewritten new share endpoint according to new ocm specs
gmgigi96 Jan 30, 2023
0802220
add go validator dependency
gmgigi96 Jan 30, 2023
f46b0c4
add new share to ocm client
gmgigi96 Jan 30, 2023
8eb474b
defined ocm repository
gmgigi96 Jan 30, 2023
ddfe37e
rewrote ocm core
gmgigi96 Feb 1, 2023
61df93c
rewrote ocm share provider
gmgigi96 Feb 1, 2023
75753ac
removed commented code
gmgigi96 Feb 1, 2023
4bef665
fixed app provider with new cs3apis
gmgigi96 Feb 2, 2023
cbe2c78
rewrote ocmshareprovider
gmgigi96 Feb 2, 2023
34fe2cd
fix commands
gmgigi96 Feb 2, 2023
4527da1
add share type
gmgigi96 Feb 2, 2023
f0eba5e
add token
gmgigi96 Feb 2, 2023
a51f50d
add expiration time to ocm shares
gmgigi96 Feb 2, 2023
17887a8
refactor
gmgigi96 Feb 2, 2023
4d6e591
do not set ctime and mtime of share in json driver
gmgigi96 Feb 2, 2023
7917435
set ctime and mtime of ocm share on creation
gmgigi96 Feb 2, 2023
f7faa3d
pass user obj
gmgigi96 Feb 2, 2023
2f56d72
removed old files
gmgigi96 Feb 2, 2023
3cce463
refactored nextcloud ocm share driver
gmgigi96 Feb 2, 2023
1ed8c94
removed unused variable
gmgigi96 Feb 2, 2023
6fea1bb
add commands to get info about ocm share
gmgigi96 Feb 3, 2023
fc858b1
generate crypto secure random string
gmgigi96 Feb 3, 2023
3d33767
fixes in json pkg
gmgigi96 Feb 3, 2023
d1d3f7c
fix linting
gmgigi96 Feb 3, 2023
4c20045
add randutil pkg
gmgigi96 Feb 3, 2023
4db441e
fixes
gmgigi96 Feb 6, 2023
2c48b56
expose recipient display name
gmgigi96 Feb 6, 2023
94b05df
fixes in json parsing
gmgigi96 Feb 8, 2023
5b9c17a
fix function name
gmgigi96 Feb 8, 2023
453c2b7
add helper functions for tests
gmgigi96 Feb 8, 2023
9977fea
fix response when creating new ocm share
gmgigi96 Feb 8, 2023
86ff859
fix errors in ocm share provider (still internal error)
gmgigi96 Feb 8, 2023
6a9c5f0
improved spawn revad daemons for testing. it's possible now define fi…
gmgigi96 Feb 8, 2023
a7f5580
defined integration tests for ocm shares
gmgigi96 Feb 8, 2023
719e37e
fixes in other tests
gmgigi96 Feb 8, 2023
f5a0ad5
use fork for go cs3 bindings
gmgigi96 Feb 8, 2023
770d919
fix typo
gmgigi96 Feb 8, 2023
a4ec227
fix linter
gmgigi96 Feb 8, 2023
0a2f57a
add changelog
gmgigi96 Feb 8, 2023
5101998
Merge branch 'master-upstream' into ocm-share
gmgigi96 Feb 8, 2023
c50d425
fix linter x2
gmgigi96 Feb 8, 2023
1a1b2e7
return correct errors according to specs
gmgigi96 Feb 8, 2023
174c247
add other tests and bugfixes
gmgigi96 Feb 8, 2023
e3d00d6
fix linter
gmgigi96 Feb 8, 2023
7880fdb
fix cmd for creating ocm shares
gmgigi96 Feb 8, 2023
64a7f55
Merge branch 'master' into ocm-share
gmgigi96 Feb 14, 2023
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
Prev Previous commit
Next Next commit
fix response when creating new ocm share
  • Loading branch information
gmgigi96 committed Feb 8, 2023
commit 9977feaec65e3e1e91493a8177f0d54413f1c1d5
7 changes: 4 additions & 3 deletions internal/http/services/ocmd/shares.go
Original file line number Diff line number Diff line change
Expand Up @@ -177,12 +177,13 @@ func (h *sharesHandler) CreateShare(w http.ResponseWriter, r *http.Request) {
return
}

response := map[string]any{}

if h.exposeRecipientDisplayName {
json.NewEncoder(w).Encode(map[string]any{
"recipientDisplayName": userRes.User.DisplayName,
})
response["recipientDisplayName"] = userRes.User.DisplayName
}

_ = json.NewEncoder(w).Encode(response)
w.WriteHeader(http.StatusCreated)
}

Expand Down