From 7da53d172f083dc2d8a7293bb02977a6e53abf9d Mon Sep 17 00:00:00 2001 From: Jeremy Clements <79224539+jeclrsg@users.noreply.github.com> Date: Mon, 1 Jul 2024 18:34:51 -0400 Subject: [PATCH] fix(comms): regenerate ws_access service with most recent changes corrects some of the unnecessarily expanded types Signed-off-by: Jeremy Clements <79224539+jeclrsg@users.noreply.github.com> --- .../wsdl/ws_access/v1.17/ws_access.ts | 268 ++++++------------ 1 file changed, 94 insertions(+), 174 deletions(-) diff --git a/packages/comms/src/services/wsdl/ws_access/v1.17/ws_access.ts b/packages/comms/src/services/wsdl/ws_access/v1.17/ws_access.ts index 1c78f7551a..1feb9f5e01 100644 --- a/packages/comms/src/services/wsdl/ws_access/v1.17/ws_access.ts +++ b/packages/comms/src/services/wsdl/ws_access/v1.17/ws_access.ts @@ -85,15 +85,9 @@ export namespace WsAccess { AccountName: string; IsGroup: boolean; IncludeGroup: boolean; - BasednNames: { - Item: string[]; - }; - Permissions: { - Permission: Permission[]; - }; - GroupPermissions: { - GroupPermission: GroupPermission[]; - }; + BasednNames: BasednNames; + Permissions: Permissions; + GroupPermissions: GroupPermissions; } export interface AccountPermissionsV2Request { @@ -209,11 +203,7 @@ export namespace WsAccess { } export interface DisableScopeScansResponse { - scopeScansStatus: { - isEnabled: boolean; - retcode: int; - retmsg: string; - }; + scopeScansStatus: scopeScansStatus; } export interface EnableScopeScansRequest { @@ -259,12 +249,8 @@ export namespace WsAccess { UserName: string; GroupName: string; toomany: boolean; - Users: { - User: User[]; - }; - Groups: { - Group: Group[]; - }; + Users: Users; + Groups: Groups; UserPermission: string; } @@ -273,9 +259,7 @@ export namespace WsAccess { } export interface GroupActionRequest { - groupnames?: { - Item?: string[]; - }; + groupnames?: groupnames; ActionType?: string; DeletePermission?: boolean; } @@ -315,9 +299,7 @@ export namespace WsAccess { export interface GroupMemberEditRequest { groupname?: string; action?: string; - usernames?: { - Item?: string[]; - }; + usernames?: usernames; } export interface GroupMemberEditResponse { @@ -405,38 +387,6 @@ export namespace WsAccess { retmsg: string; } - export interface PermissionAddRequest { - basedn?: string; - rtype?: string; - rtitle?: string; - rname?: string; - prefix?: string; - BasednName?: string; - AccountName?: string; - AccountType?: int; - } - - export interface Resources { - Item: string[]; - } - - export interface PermissionAddResponse { - basedn: string; - rtype: string; - rtitle: string; - rname: string; - prefix: string; - BasednName: string; - AccountName: string; - AccountType: int; - toomany: boolean; - Users: Users; - Groups: Groups; - Resources: { - Item: string[]; - }; - } - export interface BasednsRequest { } @@ -455,9 +405,7 @@ export namespace WsAccess { export interface BasednsResponse { NoSecMngr: boolean; - Basedns: { - Basedn: Basedn[]; - }; + Basedns: Basedns; } export interface names { @@ -467,9 +415,7 @@ export namespace WsAccess { export interface PermissionsResetRequest { BasednName?: string; prefix?: string; - names?: { - Item?: string[]; - }; + names?: names; allow_access?: boolean; allow_read?: boolean; allow_write?: boolean; @@ -487,28 +433,6 @@ export namespace WsAccess { retmsg: string; } - export interface PermissionsResetInputRequest { - basedn?: string; - rtype?: string; - rtitle?: string; - rname?: string; - prefix?: string; - names?: names; - } - - export interface PermissionsResetInputResponse { - basedn: string; - rtype: string; - rtitle: string; - rname: string; - prefix: string; - toomany: boolean; - Users: Users; - Groups: Groups; - Resources: Resources; - ResourceList: string; - } - export interface ws_accessPingRequest { } @@ -541,9 +465,7 @@ export namespace WsAccess { export interface QueryUserViewColumnsResponse { username: string; - viewcolumns: { - ViewColumn: ViewColumn[]; - }; + viewcolumns: viewcolumns; } export interface QueryViewColumnsRequest { @@ -571,9 +493,7 @@ export namespace WsAccess { export interface QueryViewMembersResponse { viewname: string; - viewmembers: { - ViewMember: ViewMember[]; - }; + viewmembers: viewmembers; } export interface QueryViewsRequest { @@ -590,9 +510,7 @@ export namespace WsAccess { } export interface QueryViewsResponse { - views: { - View: View[]; - }; + views: views; } export interface ResourceAddRequest { @@ -607,20 +525,6 @@ export namespace WsAccess { retmsg: string; } - export interface ResourceAddInputRequest { - basedn?: string; - rtype?: string; - rtitle?: string; - prefix?: string; - } - - export interface ResourceAddInputResponse { - basedn: string; - rtype: string; - rtitle: string; - prefix: string; - } - export interface ResourceDeleteRequest { BasednName?: string; prefix?: string; @@ -645,9 +549,27 @@ export namespace WsAccess { CacheHint?: long; } + export interface Permission2 { + account_name: string; + escaped_account_name: string; + account_type: int; + allow_access: boolean; + allow_read: boolean; + allow_write: boolean; + allow_full: boolean; + deny_access: boolean; + deny_read: boolean; + deny_write: boolean; + deny_full: boolean; + } + + export interface Permissions2 { + Permission: Permission2[]; + } + export interface ResourcePermissionQueryResponse { NoSecMngr: boolean; - Permissions: Permissions; + Permissions: Permissions2; TotalResourcePermissions: long; CacheHint: long; } @@ -659,7 +581,7 @@ export namespace WsAccess { } export interface ResourcePermissionsResponse { - Permissions: Permissions; + Permissions: Permissions2; } export interface ResourceQueryRequest { @@ -673,6 +595,16 @@ export namespace WsAccess { CacheHint?: long; } + export interface Resource { + name: string; + description: string; + isSpecial: boolean; + } + + export interface Resources { + Resource: Resource[]; + } + export interface ResourceQueryResponse { NoSecMngr: boolean; Resources: Resources; @@ -884,219 +816,207 @@ export class AccessServiceBase extends Service { super(optsConnection, "ws_access", "1.17"); } - AccountPermissions(request: WsAccess.AccountPermissionsRequest): Promise { + AccountPermissions(request: Partial): Promise { return this._connection.send("AccountPermissions", request, "json", false, undefined, "AccountPermissionsResponse"); } - AccountPermissionsV2(request: WsAccess.AccountPermissionsV2Request): Promise { + AccountPermissionsV2(request: Partial): Promise { return this._connection.send("AccountPermissionsV2", request, "json", false, undefined, "AccountPermissionsV2Response"); } - AddUser(request: WsAccess.AddUserRequest): Promise { + AddUser(request: Partial): Promise { return this._connection.send("AddUser", request, "json", false, undefined, "AddUserResponse"); } - AddView(request: WsAccess.AddViewRequest): Promise { + AddView(request: Partial): Promise { return this._connection.send("AddView", request, "json", false, undefined, "AddViewResponse"); } - AddViewColumn(request: WsAccess.AddViewColumnRequest): Promise { + AddViewColumn(request: Partial): Promise { return this._connection.send("AddViewColumn", request, "json", false, undefined, "AddViewColumnResponse"); } - AddViewMember(request: WsAccess.AddViewMemberRequest): Promise { + AddViewMember(request: Partial): Promise { return this._connection.send("AddViewMember", request, "json", false, undefined, "AddViewMemberResponse"); } - ClearPermissionsCache(request: WsAccess.ClearPermissionsCacheRequest): Promise { + ClearPermissionsCache(request: Partial): Promise { return this._connection.send("ClearPermissionsCache", request, "json", false, undefined, "ClearPermissionsCacheResponse"); } - DeleteView(request: WsAccess.DeleteViewRequest): Promise { + DeleteView(request: Partial): Promise { return this._connection.send("DeleteView", request, "json", false, undefined, "DeleteViewResponse"); } - DeleteViewColumn(request: WsAccess.DeleteViewColumnRequest): Promise { + DeleteViewColumn(request: Partial): Promise { return this._connection.send("DeleteViewColumn", request, "json", false, undefined, "DeleteViewColumnResponse"); } - DeleteViewMember(request: WsAccess.DeleteViewMemberRequest): Promise { + DeleteViewMember(request: Partial): Promise { return this._connection.send("DeleteViewMember", request, "json", false, undefined, "DeleteViewMemberResponse"); } - DisableScopeScans(request: WsAccess.DisableScopeScansRequest): Promise { + DisableScopeScans(request: Partial): Promise { return this._connection.send("DisableScopeScans", request, "json", false, undefined, "DisableScopeScansResponse"); } - EnableScopeScans(request: WsAccess.EnableScopeScansRequest): Promise { + EnableScopeScans(request: Partial): Promise { return this._connection.send("EnableScopeScans", request, "json", false, undefined, "EnableScopeScansResponse"); } - FilePermission(request: WsAccess.FilePermissionRequest): Promise { + FilePermission(request: Partial): Promise { return this._connection.send("FilePermission", request, "json", false, undefined, "FilePermissionResponse"); } - GroupAction(request: WsAccess.GroupActionRequest): Promise { + GroupAction(request: Partial): Promise { return this._connection.send("GroupAction", request, "json", false, undefined, "GroupActionResponse"); } - GroupAdd(request: WsAccess.GroupAddRequest): Promise { + GroupAdd(request: Partial): Promise { return this._connection.send("GroupAdd", request, "json", false, undefined, "GroupAddResponse"); } - GroupEdit(request: WsAccess.GroupEditRequest): Promise { + GroupEdit(request: Partial): Promise { return this._connection.send("GroupEdit", request, "json", false, undefined, "GroupEditResponse"); } - GroupMemberEdit(request: WsAccess.GroupMemberEditRequest): Promise { + GroupMemberEdit(request: Partial): Promise { return this._connection.send("GroupMemberEdit", request, "json", false, undefined, "GroupMemberEditResponse"); } - GroupMemberEditInput(request: WsAccess.GroupMemberEditInputRequest): Promise { + GroupMemberEditInput(request: Partial): Promise { return this._connection.send("GroupMemberEditInput", request, "json", false, undefined, "GroupMemberEditInputResponse"); } - GroupMemberQuery(request: WsAccess.GroupMemberQueryRequest): Promise { + GroupMemberQuery(request: Partial): Promise { return this._connection.send("GroupMemberQuery", request, "json", false, undefined, "GroupMemberQueryResponse"); } - GroupQuery(request: WsAccess.GroupQueryRequest): Promise { + GroupQuery(request: Partial): Promise { return this._connection.send("GroupQuery", request, "json", false, undefined, "GroupQueryResponse"); } - Groups(request: WsAccess.GroupRequest): Promise { + Groups(request: Partial): Promise { return this._connection.send("Groups", request, "json", false, undefined, "GroupResponse"); } - PermissionAction(request: WsAccess.PermissionActionRequest): Promise { + PermissionAction(request: Partial): Promise { return this._connection.send("PermissionAction", request, "json", false, undefined, "PermissionActionResponse"); } - PermissionAddInput(request: WsAccess.PermissionAddRequest): Promise { - return this._connection.send("PermissionAddInput", request, "json", false, undefined, "PermissionAddResponse"); - } - - Permissions(request: WsAccess.BasednsRequest): Promise { + Permissions(request: Partial): Promise { return this._connection.send("Permissions", request, "json", false, undefined, "BasednsResponse"); } - PermissionsReset(request: WsAccess.PermissionsResetRequest): Promise { + PermissionsReset(request: Partial): Promise { return this._connection.send("PermissionsReset", request, "json", false, undefined, "PermissionsResetResponse"); } - PermissionsResetInput(request: WsAccess.PermissionsResetInputRequest): Promise { - return this._connection.send("PermissionsResetInput", request, "json", false, undefined, "PermissionsResetInputResponse"); - } - - Ping(request: WsAccess.ws_accessPingRequest): Promise { + Ping(request: Partial): Promise { return this._connection.send("Ping", request, "json", false, undefined, "ws_accessPingResponse"); } - QueryScopeScansEnabled(request: WsAccess.QueryScopeScansEnabledRequest): Promise { + QueryScopeScansEnabled(request: Partial): Promise { return this._connection.send("QueryScopeScansEnabled", request, "json", false, undefined, "QueryScopeScansEnabledResponse"); } - QueryUserViewColumns(request: WsAccess.QueryUserViewColumnsRequest): Promise { + QueryUserViewColumns(request: Partial): Promise { return this._connection.send("QueryUserViewColumns", request, "json", false, undefined, "QueryUserViewColumnsResponse"); } - QueryViewColumns(request: WsAccess.QueryViewColumnsRequest): Promise { + QueryViewColumns(request: Partial): Promise { return this._connection.send("QueryViewColumns", request, "json", false, undefined, "QueryViewColumnsResponse"); } - QueryViewMembers(request: WsAccess.QueryViewMembersRequest): Promise { + QueryViewMembers(request: Partial): Promise { return this._connection.send("QueryViewMembers", request, "json", false, undefined, "QueryViewMembersResponse"); } - QueryViews(request: WsAccess.QueryViewsRequest): Promise { + QueryViews(request: Partial): Promise { return this._connection.send("QueryViews", request, "json", false, undefined, "QueryViewsResponse"); } - ResourceAdd(request: WsAccess.ResourceAddRequest): Promise { + ResourceAdd(request: Partial): Promise { return this._connection.send("ResourceAdd", request, "json", false, undefined, "ResourceAddResponse"); } - ResourceAddInput(request: WsAccess.ResourceAddInputRequest): Promise { - return this._connection.send("ResourceAddInput", request, "json", false, undefined, "ResourceAddInputResponse"); - } - - ResourceDelete(request: WsAccess.ResourceDeleteRequest): Promise { + ResourceDelete(request: Partial): Promise { return this._connection.send("ResourceDelete", request, "json", false, undefined, "ResourceDeleteResponse"); } - ResourcePermissionQuery(request: WsAccess.ResourcePermissionQueryRequest): Promise { + ResourcePermissionQuery(request: Partial): Promise { return this._connection.send("ResourcePermissionQuery", request, "json", false, undefined, "ResourcePermissionQueryResponse"); } - ResourcePermissions(request: WsAccess.ResourcePermissionsRequest): Promise { + ResourcePermissions(request: Partial): Promise { return this._connection.send("ResourcePermissions", request, "json", false, undefined, "ResourcePermissionsResponse"); } - ResourceQuery(request: WsAccess.ResourceQueryRequest): Promise { + ResourceQuery(request: Partial): Promise { return this._connection.send("ResourceQuery", request, "json", false, undefined, "ResourceQueryResponse"); } - Resources(request: WsAccess.ResourcesRequest): Promise { + Resources(request: Partial): Promise { return this._connection.send("Resources", request, "json", false, undefined, "ResourcesResponse"); } - UserAccountExport(request: WsAccess.UserAccountExportRequest): Promise { + UserAccountExport(request: Partial): Promise { return this._connection.send("UserAccountExport", request, "json", false, undefined, "UserAccountExportResponse"); } - UserAction(request: WsAccess.UserActionRequest): Promise { + UserAction(request: Partial): Promise { return this._connection.send("UserAction", request, "json", false, undefined, "UserActionResponse"); } - UserEdit(request: WsAccess.UserEditRequest): Promise { + UserEdit(request: Partial): Promise { return this._connection.send("UserEdit", request, "json", false, undefined, "UserEditResponse"); } - UserGroupEdit(request: WsAccess.UserGroupEditRequest): Promise { + UserGroupEdit(request: Partial): Promise { return this._connection.send("UserGroupEdit", request, "json", false, undefined, "UserGroupEditResponse"); } - UserGroupEditInput(request: WsAccess.UserGroupEditInputRequest): Promise { + UserGroupEditInput(request: Partial): Promise { return this._connection.send("UserGroupEditInput", request, "json", false, undefined, "UserGroupEditInputResponse"); } - UserInfoEdit(request: WsAccess.UserInfoEditRequest): Promise { + UserInfoEdit(request: Partial): Promise { return this._connection.send("UserInfoEdit", request, "json", false, undefined, "UserInfoEditResponse"); } - UserInfoEditInput(request: WsAccess.UserInfoEditInputRequest): Promise { + UserInfoEditInput(request: Partial): Promise { return this._connection.send("UserInfoEditInput", request, "json", false, undefined, "UserInfoEditInputResponse"); } - UserPosix(request: WsAccess.UserPosixRequest): Promise { + UserPosix(request: Partial): Promise { return this._connection.send("UserPosix", request, "json", false, undefined, "UserPosixResponse"); } - UserPosixInput(request: WsAccess.UserPosixInputRequest): Promise { + UserPosixInput(request: Partial): Promise { return this._connection.send("UserPosixInput", request, "json", false, undefined, "UserPosixInputResponse"); } - UserQuery(request: WsAccess.UserQueryRequest): Promise { + UserQuery(request: Partial): Promise { return this._connection.send("UserQuery", request, "json", false, undefined, "UserQueryResponse"); } - UserResetPass(request: WsAccess.UserResetPassRequest): Promise { + UserResetPass(request: Partial): Promise { return this._connection.send("UserResetPass", request, "json", false, undefined, "UserResetPassResponse"); } - UserResetPassInput(request: WsAccess.UserResetPassInputRequest): Promise { + UserResetPassInput(request: Partial): Promise { return this._connection.send("UserResetPassInput", request, "json", false, undefined, "UserResetPassInputResponse"); } - UserSudoers(request: WsAccess.UserSudoersRequest): Promise { + UserSudoers(request: Partial): Promise { return this._connection.send("UserSudoers", request, "json", false, undefined, "UserSudoersResponse"); } - UserSudoersInput(request: WsAccess.UserSudoersInputRequest): Promise { + UserSudoersInput(request: Partial): Promise { return this._connection.send("UserSudoersInput", request, "json", false, undefined, "UserSudoersInputResponse"); } - Users(request: WsAccess.UserRequest): Promise { + Users(request: Partial): Promise { return this._connection.send("Users", request, "json", false, undefined, "UserResponse"); }