Skip to content
Open
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
14 changes: 14 additions & 0 deletions KeeperSdk/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,11 @@ export type {
AliasUserInput,
AliasUserResult,
FormattedUserStatus,
AddUsersToTeamsInput,
RemoveUsersFromTeamsInput,
TeamUserItemResult,
TeamUserResult,
FormattedTeamUserTable,
} from './users/userTypes'

export { EnterpriseUserStatus } from './users/userTypes'
Expand All @@ -361,6 +366,15 @@ export {
AliasOperation,
} from './users/aliasUser'

export {
addUsersToTeams,
removeUsersFromTeams,
formatTeamUserResult,
renderTeamUserAsciiTable,
TeamUserStatus,
TeamUserSkipReason,
} from './users/teamUser'

export { UserManager } from './users/UserManager'

export type {
Expand Down
2 changes: 2 additions & 0 deletions KeeperSdk/src/teams/enterpriseData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ export type EnterpriseTeamRecord = {
restrict_share?: boolean
restrict_sharing?: boolean
encrypted_data?: string
encrypted_team_key?: string
}

export type EnterpriseTeamUserLink = {
Expand Down Expand Up @@ -458,6 +459,7 @@ export class EnterpriseDataManager implements EnterpriseDataManagerApi {
restrict_share: message.restrictShare === true,
}
if (message.encryptedData) team.encrypted_data = message.encryptedData
if (message.encryptedTeamKey) team.encrypted_team_key = message.encryptedTeamKey
return team
}

Expand Down
19 changes: 17 additions & 2 deletions KeeperSdk/src/teams/teamUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,33 @@ export function validateTeamName(name: string): void {

export function resolveExistingTeams(
teams: EnterpriseTeamRecord[],
identifiers: string[]
identifiers: string[],
queuedTeams: EnterpriseTeamRecord[] = []
): EnterpriseTeamRecord[] {
const byUid = new Map<string, EnterpriseTeamRecord>()
const byLowerName = new Map<string, EnterpriseTeamRecord[]>()
for (const team of teams) {
if (team.team_uid) byUid.set(team.team_uid, team)
if (!team.team_uid) continue
byUid.set(team.team_uid, team)
const key = (team.name || '').trim().toLowerCase()
if (!key) continue
const existing = byLowerName.get(key)
if (existing) existing.push(team)
else byLowerName.set(key, [team])
}
for (const team of queuedTeams) {
if (!team.team_uid || byUid.has(team.team_uid)) continue
const resolved: EnterpriseTeamRecord = {
team_uid: team.team_uid,
name: team.name,
node_id: team.node_id ?? 0,
...(team.encrypted_team_key ? { encrypted_team_key: team.encrypted_team_key } : {}),
}
byUid.set(team.team_uid, resolved)
const key = (team.name || '').trim().toLowerCase()
if (!key || byLowerName.has(key)) continue
byLowerName.set(key, [resolved])
}

const found = new Map<string, EnterpriseTeamRecord>()
const missing: string[] = []
Expand Down
21 changes: 21 additions & 0 deletions KeeperSdk/src/users/UserManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { updateUsers, formatUpdateUserResult, renderUpdateUserAsciiTable } from
import { deleteUsers, formatDeleteUserResult, renderDeleteUserAsciiTable } from './deleteUser'
import { actionUsers, formatUserActionResult, renderUserActionAsciiTable } from './actionUser'
import { aliasUser } from './aliasUser'
import { addUsersToTeams, removeUsersFromTeams, formatTeamUserResult, renderTeamUserAsciiTable } from './teamUser'
import { listUsers, formatUsersTable, renderUsersAsciiTable } from './listUsers'
import { viewUser, formatUserView, userViewTable } from './viewUser'
import type {
Expand All @@ -31,6 +32,10 @@ import type {
FormattedUserActionTable,
AliasUserInput,
AliasUserResult,
AddUsersToTeamsInput,
RemoveUsersFromTeamsInput,
TeamUserResult,
FormattedTeamUserTable,
} from './userTypes'

export type AuthProvider = () => Auth
Expand Down Expand Up @@ -118,6 +123,22 @@ export class UserManager {
return aliasUser(this.requireAuth(), input)
}

public async addUsersToTeams(input: AddUsersToTeamsInput): Promise<TeamUserResult> {
return addUsersToTeams(this.requireAuth(), input)
}

public async removeUsersFromTeams(input: RemoveUsersFromTeamsInput): Promise<TeamUserResult> {
return removeUsersFromTeams(this.requireAuth(), input)
}

public formatTeamUserResult(result: TeamUserResult): FormattedTeamUserTable {
return formatTeamUserResult(result)
}

public renderTeamUserAsciiTable(table: FormattedTeamUserTable): string {
return renderTeamUserAsciiTable(table)
}

private requireAuth(): Auth {
const auth = this.authProvider()
if (!auth) {
Expand Down
Loading
Loading