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 OCS public link share update values logic #930

Merged
merged 6 commits into from
Jul 3, 2020
Merged

Fix OCS public link share update values logic #930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eefe912
Fix OCS public link share update values logic
Jul 2, 2020
7ee05e3
OCS Share response format expiration date as UTC
Jul 2, 2020
0bf4589
Public share token must be longer
Jul 2, 2020
8b4a222
Remove nasty colon
Jul 2, 2020
fba9c36
Adjust public link permission mappings
Jul 2, 2020
09afd0f
Public link JSON don't always reset password
Jul 2, 2020
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
3 changes: 2 additions & 1 deletion internal/http/services/owncloud/ocs/conversions/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,7 @@ func publicSharePermissions2OCSPermissions(sp *link.PublicSharePermissions) Perm
}

// TODO sort out mapping, this is just a first guess
// public link permissions to OCS permissions
func Permissions2OCSPermissions(p *provider.ResourcePermissions) Permissions {
PVince81 marked this conversation as resolved.
Show resolved Hide resolved
permissions := PermissionInvalid
if p != nil {
Expand All @@ -386,7 +387,7 @@ func Permissions2OCSPermissions(p *provider.ResourcePermissions) Permissions {
// timestamp is assumed to be UTC ... just human readable ...
// FIXME and ambiguous / error prone because there is no time zone ...
func timestampToExpiration(t *types.Timestamp) string {
return time.Unix(int64(t.Seconds), int64(t.Nanos)).Format("2006-01-02 15:05:05")
return time.Unix(int64(t.Seconds), int64(t.Nanos)).UTC().Format("2006-01-02 15:05:05")
}

const (
Expand Down
2 changes: 1 addition & 1 deletion internal/http/services/owncloud/ocs/conversions/permissions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func (p Permissions) Contain(other Permissions) bool {
return p&other != 0
}

// Permissions2Role performs permission conversions
// Permissions2Role performs permission conversions for user and federated shares
func Permissions2Role(p Permissions) string {
role := RoleLegacy
if p.Contain(PermissionRead) {
Expand Down
Loading