Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 17 additions & 2 deletions KeeperSdk/src/sharedFolders/shareFolder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,18 @@ export type ShareFolderInput = {
action?: ShareFolderActionInput
manageRecords?: boolean
manageUsers?: boolean
records?: string[]
expireAt?: number
expireIn?: number
}

export type ShareFolderUserStatus = {
email: string
success: boolean
status: string
message?: string
isNew?: boolean
expiration?: number
}

export type ShareFolderResult = {
Expand Down Expand Up @@ -428,8 +433,11 @@ async function shareWithSharedFolder(
: sharedFolder.defaultManageRecords
const newUserManageUsers = isBoolean(input.manageUsers) ? input.manageUsers : sharedFolder.defaultManageUsers

const emailToIsNew = new Map<string, boolean>()

for (const email of emails) {
if (existingMembers.has(email)) {
emailToIsNew.set(email, false)
usersToUpdate.push({
username: email,
manageRecords: toSetBoolean(input.manageRecords),
Expand Down Expand Up @@ -477,6 +485,7 @@ async function shareWithSharedFolder(
continue
}

emailToIsNew.set(email, true)
usersToAdd.push({
username: email,
manageRecords: toSetBoolean(newUserManageRecords),
Expand Down Expand Up @@ -524,18 +533,24 @@ async function shareWithSharedFolder(
for (const addUserStatus of innerResponse?.sharedFolderAddUserStatus || []) {
const status = addUserStatus.status || ShareFolderUserResultStatus.Unknown
const success = status === FolderResultStatus.Success || status === FolderResultStatus.Invited
const email = addUserStatus.username || ''
userResults.push({
email: addUserStatus.username || '',
email,
success,
status,
isNew: emailToIsNew.get(email) ?? true,
expiration: input.expireAt,
})
}
for (const updateUserStatus of innerResponse?.sharedFolderUpdateUserStatus || []) {
const status = updateUserStatus.status || ShareFolderUserResultStatus.Unknown
const email = updateUserStatus.username || ''
userResults.push({
email: updateUserStatus.username || '',
email,
success: status === FolderResultStatus.Success,
status,
isNew: emailToIsNew.get(email) ?? false,
expiration: input.expireAt,
})
}

Expand Down
1 change: 1 addition & 0 deletions KeeperSdk/src/sharing/Sharing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export type ShareRecordResult = {
success: boolean
status: string
message: string
isNew?: boolean
}

export type RemoveShareInput = {
Expand Down
Loading