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

Th add user map sync down #68

Merged
merged 2 commits into from
Jan 29, 2025
Merged

Th add user map sync down #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
007c45e
added add/remove users prop in sync and added check in removed shared…
THeflinKeeper Jan 28, 2025
35e5463
upped version
THeflinKeeper Jan 28, 2025
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
4 changes: 2 additions & 2 deletions keeperapi/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion keeperapi/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@keeper-security/keeperapi",
"description": "Keeper API Javascript SDK",
"version": "16.0.68",
"version": "16.0.69",
"browser": "dist/index.es.js",
"main": "dist/index.cjs.js",
"types": "dist/node/index.d.ts",
Expand Down
36 changes: 30 additions & 6 deletions keeperapi/src/vault.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ export type VaultStorage = KeyStorage & {
removeDependencies(dependencies: RemovedDependencies): Promise<void>
clear(): Promise<void>
get<T extends VaultStorageKind>(kind: T, uid?: string): Promise<VaultStorageResult<T>>
delete(kind: VaultStorageKind, uid: string): Promise<void>
delete(kind: VaultStorageKind, uid: string | Uint8Array): Promise<void>
}

export type VaultStorageData = DProfilePic | DContinuationToken | DRecord | DRecordMetadata | DRecordNonSharedData | DTeam | DSharedFolder | DSharedFolderUser | DSharedFolderTeam | DSharedFolderRecord | DSharedFolderFolder | DUserFolder | DProfile | DReusedPasswords | DBWRecord | DBWSecurityData | DSecurityScoreData
export type VaultStorageData = DProfilePic | DContinuationToken | DRecord | DRecordMetadata | DRecordNonSharedData | DTeam | DSharedFolder | DSharedFolderUser | DSharedFolderTeam | DSharedFolderRecord | DSharedFolderFolder | DUserFolder | DProfile | DReusedPasswords | DBWRecord | DBWSecurityData | DSecurityScoreData | DUser

export type VaultStorageKind = 'profilePic' | 'record' | 'metadata' | 'non_shared_data' | 'team' | 'shared_folder' | 'shared_folder_user' | 'shared_folder_team' | 'shared_folder_record' | 'shared_folder_folder' | 'user_folder' | 'profile' | 'continuationToken' | 'reused_passwords' | 'bw_record' | 'bw_security_data' | 'security_score_data'
export type VaultStorageKind = 'profilePic' | 'record' | 'metadata' | 'non_shared_data' | 'team' | 'shared_folder' | 'shared_folder_user' | 'shared_folder_team' | 'shared_folder_record' | 'shared_folder_folder' | 'user_folder' | 'profile' | 'continuationToken' | 'reused_passwords' | 'bw_record' | 'bw_security_data' | 'security_score_data' | 'user'

export type VaultStorageResult<T extends VaultStorageKind> = (
T extends 'continuationToken' ? DContinuationToken :
Expand Down Expand Up @@ -201,6 +201,12 @@ export type DSecurityScoreData = {
revision: number,
}

export type DUser = {
kind: 'user',
accountUid?:Uint8Array | null,
username?:string | null,
}

export type DContinuationToken = {
kind?: 'continuationToken'
token: string
Expand Down Expand Up @@ -284,6 +290,16 @@ const mapKeyType = (keyType: Records.RecordKeyType): { keyId: string, encryption
return {keyId, encryptionType}
}

export const processUsers = async (users: Vault.IUser[], storage: VaultStorage) => {
for (const user of users) {
await storage.put({
kind: 'user',
accountUid: user.accountUid,
username: user.username,
})
}
}

export const processTeams = async (teams: NN<ITeam>[], storage: VaultStorage, dependencies: Dependencies) => {
const teamKeys: UnwrapKeyMap = {}
const teamPrivateKeys: UnwrapKeyMap = {}
Expand Down Expand Up @@ -1048,6 +1064,8 @@ export const syncDown = async (options: SyncDownOptions): Promise<SyncResult> =>
networkTime += requestTime
const dependencies = {}

await processUsers(resp.users, storage)

await processTeams(resp.teams as NN<ITeam>[], storage, dependencies)

await processUserFolders(resp.userFolders, storage, dependencies)
Expand Down Expand Up @@ -1118,10 +1136,12 @@ export const syncDown = async (options: SyncDownOptions): Promise<SyncResult> =>
for await (const folder of resp.removedSharedFolders) {
const folderUid = webSafe64FromBytes(folder)
await getDependencies(folderUid, storage, removedSFDependencies)
removedDependencies[folderUid] = '*'
if(!removedDependencies[folderUid]){
removedDependencies[folderUid] = '*'
}
await storage.delete('shared_folder', folderUid)
}
for (const removedSFDependency of removedSFDependencies) {
for await (const removedSFDependency of removedSFDependencies) {
switch (removedSFDependency.kind) {
case "record":
await storage.delete('record', removedSFDependency.uid)
Expand All @@ -1132,6 +1152,10 @@ export const syncDown = async (options: SyncDownOptions): Promise<SyncResult> =>
break;
}
}
for await (const user of resp.removedUsers) {
await storage.delete('user', user)
}

await storage.removeDependencies(removedDependencies)

continuationToken = resp.continuationToken || undefined
Expand All @@ -1153,4 +1177,4 @@ export const syncDown = async (options: SyncDownOptions): Promise<SyncResult> =>
result.networkTime = formatTimeDiff(new Date(networkTime))
result.totalTime = formatTimeDiff(new Date(Date.now() - result.started.getTime()))
return result
}
}