LumeWeb
/
libs5-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: need to update directory struct so that EncryptionKey is nullable, and URI and Key are omitted if empty

This commit is contained in:
Derrick Hammer 2024-01-18 10:01:56 -05:00
parent 68200ae626
commit 113f24f4d8
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
metadata/directory_reference.go
View File

@ -12,20 +12,20 @@ type DirectoryReference struct {
Name string `json:"name"` Name string `json:"name"`
EncryptedWriteKey Base64UrlBinary `json:"encryptedWriteKey,string"` EncryptedWriteKey Base64UrlBinary `json:"encryptedWriteKey,string"`
PublicKey Base64UrlBinary `json:"publicKey,string"` PublicKey Base64UrlBinary `json:"publicKey,string"`
EncryptionKey Base64UrlBinary `json:"encryptionKey,string"` EncryptionKey *Base64UrlBinary `json:"encryptionKey,string"`
Ext map[string]interface{} `json:"ext"` Ext map[string]interface{} `json:"ext"`
URI string `json:"uri"` URI string `json:"uri,omitempty"`
Key string `json:"key"` Key string `json:"key,omitempty"`
Size int64 `json:"size"` Size int64 `json:"size"`
} }
func NewDirectoryReference(created uint64, name string, encryptedWriteKey, publicKey, encryptionKey []byte, ext map[string]interface{}) *DirectoryReference { func NewDirectoryReference(created uint64, name string, encryptedWriteKey, publicKey, encryptionKey Base64UrlBinary, ext map[string]interface{}) *DirectoryReference {
return &DirectoryReference{ return &DirectoryReference{
Created: created, Created: created,
Name: name, Name: name,
EncryptedWriteKey: encryptedWriteKey, EncryptedWriteKey: encryptedWriteKey,
PublicKey: publicKey, PublicKey: publicKey,
EncryptionKey: encryptionKey, EncryptionKey: &encryptionKey,
Ext: ext, Ext: ext,
URI: "", URI: "",
Key: "", Key: "",
@ -80,7 +80,7 @@ func (dr *DirectoryReference) DecodeMsgpack(dec *msgpack.Decoder) error {
case int8(4): case int8(4):
dr.EncryptedWriteKey = value.([]byte) dr.EncryptedWriteKey = value.([]byte)
case int8(5): case int8(5):
dr.EncryptionKey = value.([]byte) dr.EncryptionKey = value.(*Base64UrlBinary)
case int8(6): case int8(6):
dr.Ext = value.(map[string]interface{}) dr.Ext = value.(map[string]interface{})
} }