refactor: move proxies in identity

npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts

@@ -1,4 +1,5 @@
 import { ListService, PagedAndSortedResultRequestDto, PagedResultDto } from '@abp/ng.core';
+import { IdentityRoleDto, IdentityRoleService } from '@abp/ng.identity/proxy';
 import { ePermissionManagementComponents } from '@abp/ng.permission-management';
 import { Confirmation, ConfirmationService } from '@abp/ng.theme.shared';
 import {
@@ -10,8 +11,6 @@ import { Component, Injector, OnInit } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 import { finalize } from 'rxjs/operators';
 import { eIdentityComponents } from '../../enums/components';
-import { IdentityRoleService } from '../../proxy/identity/identity-role.service';
-import { IdentityRoleDto } from '../../proxy/identity/models';
 
 @Component({
   selector: 'abp-roles',

npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts

@@ -1,4 +1,10 @@
 import { ListService, PagedResultDto } from '@abp/ng.core';
+import {
+  GetIdentityUsersInput,
+  IdentityRoleDto,
+  IdentityUserDto,
+  IdentityUserService,
+} from '@abp/ng.identity/proxy';
 import { ePermissionManagementComponents } from '@abp/ng.permission-management';
 import { Confirmation, ConfirmationService } from '@abp/ng.theme.shared';
 import {
@@ -17,12 +23,6 @@ import {
 import { AbstractControl, FormArray, FormBuilder, FormGroup } from '@angular/forms';
 import { finalize, switchMap, tap } from 'rxjs/operators';
 import { eIdentityComponents } from '../../enums/components';
-import { IdentityUserService } from '../../proxy/identity/identity-user.service';
-import {
-  GetIdentityUsersInput,
-  IdentityRoleDto,
-  IdentityUserDto,
-} from '../../proxy/identity/models';
 
 @Component({
   selector: 'abp-users',

npm/ng-packs/packages/identity/src/lib/defaults/default-roles-entity-actions.ts

@@ -1,6 +1,6 @@
+import { IdentityRoleDto } from '@abp/ng.identity/proxy';
 import { EntityAction } from '@abp/ng.theme.shared/extensions';
 import { RolesComponent } from '../components/roles/roles.component';
-import { IdentityRoleDto } from '../proxy/identity/models';
 
 export const DEFAULT_ROLES_ENTITY_ACTIONS = EntityAction.createMany<IdentityRoleDto>([
   {

npm/ng-packs/packages/identity/src/lib/defaults/default-roles-entity-props.ts

@@ -1,7 +1,7 @@
 import { LocalizationService } from '@abp/ng.core';
+import { IdentityRoleDto } from '@abp/ng.identity/proxy';
 import { EntityProp, ePropType } from '@abp/ng.theme.shared/extensions';
 import { of } from 'rxjs';
-import { IdentityRoleDto } from '../proxy/identity/models';
 
 export const DEFAULT_ROLES_ENTITY_PROPS = EntityProp.createMany<IdentityRoleDto>([
   {

npm/ng-packs/packages/identity/src/lib/defaults/default-roles-form-props.ts

@@ -1,6 +1,6 @@
+import { IdentityRoleDto } from '@abp/ng.identity/proxy';
 import { ePropType, FormProp, PropData } from '@abp/ng.theme.shared/extensions';
 import { Validators } from '@angular/forms';
-import { IdentityRoleDto } from '../proxy/identity/models';
 
 export const DEFAULT_ROLES_CREATE_FORM_PROPS = FormProp.createMany<IdentityRoleDto>([
   {

npm/ng-packs/packages/identity/src/lib/defaults/default-roles-toolbar-actions.ts

@@ -1,6 +1,6 @@
+import { IdentityRoleDto } from '@abp/ng.identity/proxy';
 import { ToolbarAction } from '@abp/ng.theme.shared/extensions';
 import { RolesComponent } from '../components/roles/roles.component';
-import { IdentityRoleDto } from '../proxy/identity/models';
 
 export const DEFAULT_ROLES_TOOLBAR_ACTIONS = ToolbarAction.createMany<IdentityRoleDto[]>([
   {

npm/ng-packs/packages/identity/src/lib/defaults/default-users-entity-actions.ts

@@ -1,6 +1,6 @@
+import { IdentityUserDto } from '@abp/ng.identity/proxy';
 import { EntityAction } from '@abp/ng.theme.shared/extensions';
 import { UsersComponent } from '../components/users/users.component';
-import { IdentityUserDto } from '../proxy/identity/models';
 
 export const DEFAULT_USERS_ENTITY_ACTIONS = EntityAction.createMany<IdentityUserDto>([
   {

npm/ng-packs/packages/identity/src/lib/defaults/default-users-entity-props.ts

@@ -1,5 +1,5 @@
+import { IdentityUserDto } from '@abp/ng.identity/proxy';
 import { EntityProp, ePropType } from '@abp/ng.theme.shared/extensions';
-import { IdentityUserDto } from '../proxy/identity/models';
 
 export const DEFAULT_USERS_ENTITY_PROPS = EntityProp.createMany<IdentityUserDto>([
   {

npm/ng-packs/packages/identity/src/lib/defaults/default-users-form-props.ts

@@ -1,7 +1,7 @@
+import { IdentityUserDto } from '@abp/ng.identity/proxy';
 import { getPasswordValidators } from '@abp/ng.theme.shared';
 import { ePropType, FormProp } from '@abp/ng.theme.shared/extensions';
 import { Validators } from '@angular/forms';
-import { IdentityUserDto } from '../proxy/identity/models';
 
 export const DEFAULT_USERS_CREATE_FORM_PROPS = FormProp.createMany<IdentityUserDto>([
   {

npm/ng-packs/packages/identity/src/lib/defaults/default-users-toolbar-actions.ts

@@ -1,6 +1,6 @@
+import { IdentityUserDto } from '@abp/ng.identity/proxy';
 import { ToolbarAction } from '@abp/ng.theme.shared/extensions';
 import { UsersComponent } from '../components/users/users.component';
-import { IdentityUserDto } from '../proxy/identity/models';
 
 export const DEFAULT_USERS_TOOLBAR_ACTIONS = ToolbarAction.createMany<IdentityUserDto[]>([
   {

npm/ng-packs/packages/identity/src/lib/models/config-options.ts

@@ -1,3 +1,4 @@
+import { IdentityRoleDto, IdentityUserDto } from '@abp/ng.identity/proxy';
 import {
   CreateFormPropContributorCallback,
   EditFormPropContributorCallback,
@@ -6,7 +7,6 @@ import {
   ToolbarActionContributorCallback,
 } from '@abp/ng.theme.shared/extensions';
 import { eIdentityComponents } from '../enums/components';
-import { IdentityRoleDto, IdentityUserDto } from '../proxy/identity/models';
 
 export type IdentityEntityActionContributors = Partial<{
   [eIdentityComponents.Roles]: EntityActionContributorCallback<IdentityRoleDto>[];

npm/ng-packs/packages/identity/src/lib/proxy/identity/identity-role.service.ts

@@ -1,74 +0,0 @@
-import type { ListResultDto, PagedAndSortedResultRequestDto, PagedResultDto } from '@abp/ng.core';
-import { RestService } from '@abp/ng.core';
-import { Injectable } from '@angular/core';
-import type { IdentityRoleCreateDto, IdentityRoleDto, IdentityRoleUpdateDto } from './models';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class IdentityRoleService {
-  apiName = 'AbpIdentity';
-
-  create = (input: IdentityRoleCreateDto) =>
-    this.restService.request<any, IdentityRoleDto>(
-      {
-        method: 'POST',
-        url: '/api/identity/roles',
-        body: input,
-      },
-      { apiName: this.apiName },
-    );
-
-  delete = (id: string) =>
-    this.restService.request<any, void>(
-      {
-        method: 'DELETE',
-        url: `/api/identity/roles/${id}`,
-      },
-      { apiName: this.apiName },
-    );
-
-  get = (id: string) =>
-    this.restService.request<any, IdentityRoleDto>(
-      {
-        method: 'GET',
-        url: `/api/identity/roles/${id}`,
-      },
-      { apiName: this.apiName },
-    );
-
-  getAllList = () =>
-    this.restService.request<any, ListResultDto<IdentityRoleDto>>(
-      {
-        method: 'GET',
-        url: '/api/identity/roles/all',
-      },
-      { apiName: this.apiName },
-    );
-
-  getList = (input: PagedAndSortedResultRequestDto) =>
-    this.restService.request<any, PagedResultDto<IdentityRoleDto>>(
-      {
-        method: 'GET',
-        url: '/api/identity/roles',
-        params: {
-          sorting: input.sorting,
-          skipCount: input.skipCount,
-          maxResultCount: input.maxResultCount,
-        },
-      },
-      { apiName: this.apiName },
-    );
-
-  update = (id: string, input: IdentityRoleUpdateDto) =>
-    this.restService.request<any, IdentityRoleDto>(
-      {
-        method: 'PUT',
-        url: `/api/identity/roles/${id}`,
-        body: input,
-      },
-      { apiName: this.apiName },
-    );
-
-  constructor(private restService: RestService) {}
-}

npm/ng-packs/packages/identity/src/lib/proxy/identity/identity-user-lookup.service.ts

@@ -1,57 +0,0 @@
-import type { UserLookupCountInputDto, UserLookupSearchInputDto } from './models';
-import { RestService } from '@abp/ng.core';
-import type { ListResultDto } from '@abp/ng.core';
-import { Injectable } from '@angular/core';
-import type { UserData } from '../users/models';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class IdentityUserLookupService {
-  apiName = 'AbpIdentity';
-
-  findById = (id: string) =>
-    this.restService.request<any, UserData>(
-      {
-        method: 'GET',
-        url: `/api/identity/users/lookup/${id}`,
-      },
-      { apiName: this.apiName },
-    );
-
-  findByUserName = (userName: string) =>
-    this.restService.request<any, UserData>(
-      {
-        method: 'GET',
-        url: `/api/identity/users/lookup/by-username/${userName}`,
-      },
-      { apiName: this.apiName },
-    );
-
-  getCount = (input: UserLookupCountInputDto) =>
-    this.restService.request<any, number>(
-      {
-        method: 'GET',
-        url: '/api/identity/users/lookup/count',
-        params: { filter: input.filter },
-      },
-      { apiName: this.apiName },
-    );
-
-  search = (input: UserLookupSearchInputDto) =>
-    this.restService.request<any, ListResultDto<UserData>>(
-      {
-        method: 'GET',
-        url: '/api/identity/users/lookup/search',
-        params: {
-          filter: input.filter,
-          sorting: input.sorting,
-          skipCount: input.skipCount,
-          maxResultCount: input.maxResultCount,
-        },
-      },
-      { apiName: this.apiName },
-    );
-
-  constructor(private restService: RestService) {}
-}

npm/ng-packs/packages/identity/src/lib/proxy/identity/identity-user.service.ts

@@ -1,119 +0,0 @@
-import type {
-  GetIdentityUsersInput,
-  IdentityRoleDto,
-  IdentityUserCreateDto,
-  IdentityUserDto,
-  IdentityUserUpdateDto,
-  IdentityUserUpdateRolesDto,
-} from './models';
-import { RestService } from '@abp/ng.core';
-import type { ListResultDto, PagedResultDto } from '@abp/ng.core';
-import { Injectable } from '@angular/core';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class IdentityUserService {
-  apiName = 'AbpIdentity';
-
-  create = (input: IdentityUserCreateDto) =>
-    this.restService.request<any, IdentityUserDto>(
-      {
-        method: 'POST',
-        url: '/api/identity/users',
-        body: input,
-      },
-      { apiName: this.apiName },
-    );
-
-  delete = (id: string) =>
-    this.restService.request<any, void>(
-      {
-        method: 'DELETE',
-        url: `/api/identity/users/${id}`,
-      },
-      { apiName: this.apiName },
-    );
-
-  findByEmail = (email: string) =>
-    this.restService.request<any, IdentityUserDto>(
-      {
-        method: 'GET',
-        url: `/api/identity/users/by-email/${email}`,
-      },
-      { apiName: this.apiName },
-    );
-
-  findByUsername = (username: string) =>
-    this.restService.request<any, IdentityUserDto>(
-      {
-        method: 'GET',
-        url: '/api/identity/users/by-username/{userName}',
-      },
-      { apiName: this.apiName },
-    );
-
-  get = (id: string) =>
-    this.restService.request<any, IdentityUserDto>(
-      {
-        method: 'GET',
-        url: `/api/identity/users/${id}`,
-      },
-      { apiName: this.apiName },
-    );
-
-  getAssignableRoles = () =>
-    this.restService.request<any, ListResultDto<IdentityRoleDto>>(
-      {
-        method: 'GET',
-        url: '/api/identity/users/assignable-roles',
-      },
-      { apiName: this.apiName },
-    );
-
-  getList = (input: GetIdentityUsersInput) =>
-    this.restService.request<any, PagedResultDto<IdentityUserDto>>(
-      {
-        method: 'GET',
-        url: '/api/identity/users',
-        params: {
-          filter: input.filter,
-          sorting: input.sorting,
-          skipCount: input.skipCount,
-          maxResultCount: input.maxResultCount,
-        },
-      },
-      { apiName: this.apiName },
-    );
-
-  getRoles = (id: string) =>
-    this.restService.request<any, ListResultDto<IdentityRoleDto>>(
-      {
-        method: 'GET',
-        url: `/api/identity/users/${id}/roles`,
-      },
-      { apiName: this.apiName },
-    );
-
-  update = (id: string, input: IdentityUserUpdateDto) =>
-    this.restService.request<any, IdentityUserDto>(
-      {
-        method: 'PUT',
-        url: `/api/identity/users/${id}`,
-        body: input,
-      },
-      { apiName: this.apiName },
-    );
-
-  updateRoles = (id: string, input: IdentityUserUpdateRolesDto) =>
-    this.restService.request<any, void>(
-      {
-        method: 'PUT',
-        url: `/api/identity/users/${id}/roles`,
-        body: input,
-      },
-      { apiName: this.apiName },
-    );
-
-  constructor(private restService: RestService) {}
-}

npm/ng-packs/packages/identity/src/lib/proxy/identity/index.ts

@@ -1,5 +0,0 @@
-export * from './identity-role.service';
-export * from './identity-user-lookup.service';
-export * from './identity-user.service';
-export * from './models';
-export * from './profile.service';

npm/ng-packs/packages/identity/src/lib/proxy/identity/models.ts

@@ -1,99 +0,0 @@
-import type {
-  ExtensibleEntityDto,
-  ExtensibleFullAuditedEntityDto,
-  ExtensibleObject,
-  PagedAndSortedResultRequestDto,
-} from '@abp/ng.core';
-
-export interface ChangePasswordInput {
-  currentPassword: string;
-  newPassword: string;
-}
-
-export interface GetIdentityUsersInput extends PagedAndSortedResultRequestDto {
-  filter: string;
-}
-
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface IdentityRoleCreateDto extends IdentityRoleCreateOrUpdateDtoBase {}
-
-export interface IdentityRoleCreateOrUpdateDtoBase extends ExtensibleObject {
-  name: string;
-  isDefault: boolean;
-  isPublic: boolean;
-}
-
-export interface IdentityRoleDto extends ExtensibleEntityDto<string> {
-  name: string;
-  isDefault: boolean;
-  isStatic: boolean;
-  isPublic: boolean;
-  concurrencyStamp: string;
-}
-
-export interface IdentityRoleUpdateDto extends IdentityRoleCreateOrUpdateDtoBase {
-  concurrencyStamp: string;
-}
-
-export interface IdentityUserCreateDto extends IdentityUserCreateOrUpdateDtoBase {
-  password: string;
-}
-
-export interface IdentityUserCreateOrUpdateDtoBase extends ExtensibleObject {
-  userName: string;
-  name: string;
-  surname: string;
-  email: string;
-  phoneNumber: string;
-  lockoutEnabled: boolean;
-  roleNames: string[];
-}
-
-export interface IdentityUserDto extends ExtensibleFullAuditedEntityDto<string> {
-  tenantId?: string;
-  userName: string;
-  name: string;
-  surname: string;
-  email: string;
-  emailConfirmed: boolean;
-  phoneNumber: string;
-  phoneNumberConfirmed: boolean;
-  lockoutEnabled: boolean;
-  lockoutEnd?: string;
-  concurrencyStamp: string;
-}
-
-export interface IdentityUserUpdateDto extends IdentityUserCreateOrUpdateDtoBase {
-  password: string;
-  concurrencyStamp: string;
-}
-
-export interface IdentityUserUpdateRolesDto {
-  roleNames: string[];
-}
-
-export interface ProfileDto extends ExtensibleObject {
-  userName: string;
-  email: string;
-  name: string;
-  surname: string;
-  phoneNumber: string;
-  isExternal: boolean;
-  hasPassword: boolean;
-}
-
-export interface UpdateProfileDto extends ExtensibleObject {
-  userName: string;
-  email: string;
-  name: string;
-  surname: string;
-  phoneNumber: string;
-}
-
-export interface UserLookupCountInputDto {
-  filter: string;
-}
-
-export interface UserLookupSearchInputDto extends PagedAndSortedResultRequestDto {
-  filter: string;
-}

npm/ng-packs/packages/identity/src/lib/proxy/identity/profile.service.ts

@@ -1,41 +0,0 @@
-import type { ChangePasswordInput, ProfileDto, UpdateProfileDto } from './models';
-import { RestService } from '@abp/ng.core';
-import { Injectable } from '@angular/core';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ProfileService {
-  apiName = 'AbpIdentity';
-
-  changePassword = (input: ChangePasswordInput) =>
-    this.restService.request<any, void>(
-      {
-        method: 'POST',
-        url: '/api/identity/my-profile/change-password',
-        body: input,
-      },
-      { apiName: this.apiName },
-    );
-
-  get = () =>
-    this.restService.request<any, ProfileDto>(
-      {
-        method: 'GET',
-        url: '/api/identity/my-profile',
-      },
-      { apiName: this.apiName },
-    );
-
-  update = (input: UpdateProfileDto) =>
-    this.restService.request<any, ProfileDto>(
-      {
-        method: 'PUT',
-        url: '/api/identity/my-profile',
-        body: input,
-      },
-      { apiName: this.apiName },
-    );
-
-  constructor(private restService: RestService) {}
-}

npm/ng-packs/packages/identity/src/lib/proxy/users/index.ts

@@ -1 +0,0 @@
-export * from './models';

npm/ng-packs/packages/identity/src/lib/proxy/users/models.ts

@@ -1,11 +0,0 @@
-export interface UserData {
-  id: string;
-  tenantId?: string;
-  userName: string;
-  name: string;
-  surname: string;
-  email: string;
-  emailConfirmed: boolean;
-  phoneNumber: string;
-  phoneNumberConfirmed: boolean;
-}

npm/ng-packs/packages/identity/src/lib/tokens/extensions.token.ts

@@ -1,3 +1,4 @@
+import { IdentityRoleDto, IdentityUserDto } from '@abp/ng.identity/proxy';
 import {
   CreateFormPropContributorCallback,
   EditFormPropContributorCallback,
@@ -21,7 +22,6 @@ import {
 } from '../defaults/default-users-form-props';
 import { DEFAULT_USERS_TOOLBAR_ACTIONS } from '../defaults/default-users-toolbar-actions';
 import { eIdentityComponents } from '../enums/components';
-import { IdentityRoleDto, IdentityUserDto } from '../proxy/identity/models';
 
 export const DEFAULT_IDENTITY_ENTITY_ACTIONS = {
   [eIdentityComponents.Roles]: DEFAULT_ROLES_ENTITY_ACTIONS,

npm/ng-packs/packages/identity/src/public-api.ts

@@ -3,6 +3,4 @@ export * from './lib/enums';
 export * from './lib/guards';
 export * from './lib/identity.module';
 export * from './lib/models';
-export * from './lib/proxy/identity';
-export * from './lib/proxy/users';
 export * from './lib/tokens';