chore: remove legacy identity types and service

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

@@ -36,7 +36,6 @@ import {
   IdentityRoleDto,
   IdentityUserDto,
 } from '../../proxy/identity/models';
-import { IdentityService } from '../../services/identity.service';
 import { IdentityState } from '../../states/identity.state';
 
 @Component({
@@ -88,7 +87,6 @@ export class UsersComponent implements OnInit {
     private confirmationService: ConfirmationService,
     private fb: FormBuilder,
     private store: Store,
-    private identityService: IdentityService,
     private identityUserService: IdentityUserService,
   ) {}
 

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

@@ -1,4 +1,4 @@
-import { ABP, PagedResultDto } from '@abp/ng.core';
+import { PagedResultDto } from '@abp/ng.core';
 import { IdentityRoleDto, IdentityUserDto } from '../proxy/identity/models';
 
 export namespace Identity {
@@ -9,65 +9,4 @@ export namespace Identity {
     selectedUser: IdentityUserDto;
     selectedUserRoles: IdentityRoleDto[];
   }
-
-  /**
-   * @deprecated To be deleted in v4.0.
-   */
-  export type RoleResponse = ABP.PagedResponse<RoleItem>;
-
-  /**
-   * @deprecated To be deleted in v4.0.
-   */
-  export interface RoleSaveRequest {
-    name: string;
-    isDefault: boolean;
-    isPublic: boolean;
-  }
-
-  /**
-   * @deprecated To be deleted in v4.0.
-   */
-  export interface RoleItem extends RoleSaveRequest {
-    isStatic: boolean;
-    concurrencyStamp: string;
-    id: string;
-  }
-
-  /**
-   * @deprecated To be deleted in v4.0.
-   */
-  export type UserResponse = ABP.PagedResponse<UserItem>;
-
-  /**
-   * @deprecated To be deleted in v4.0.
-   */
-  export interface UserItem extends User {
-    tenantId: string;
-    emailConfirmed: boolean;
-    phoneNumberConfirmed: boolean;
-    isLockedOut: boolean;
-    concurrencyStamp: string;
-    id: string;
-  }
-
-  /**
-   * @deprecated To be deleted in v4.0.
-   */
-  export interface User {
-    userName: string;
-    name: string;
-    surname: string;
-    email: string;
-    phoneNumber: string;
-    twoFactorEnabled: true;
-    lockoutEnabled: true;
-  }
-
-  /**
-   * @deprecated To be deleted in v4.0.
-   */
-  export interface UserSaveRequest extends User {
-    password: string;
-    roleNames: string[];
-  }
 }

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

@@ -1,150 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
-import { RestService, Rest, ABP } from '@abp/ng.core';
-import { Identity } from '../models/identity';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class IdentityService {
-  apiName = 'AbpIdentity';
-
-  constructor(private rest: RestService) {}
-
-  getRoles(params = {} as ABP.PageQueryParams): Observable<Identity.RoleResponse> {
-    const request: Rest.Request<null> = {
-      method: 'GET',
-      url: '/api/identity/roles',
-      params,
-    };
-
-    return this.rest.request<null, Identity.RoleResponse>(request, { apiName: this.apiName });
-  }
-
-  getAllRoles(): Observable<Identity.RoleResponse> {
-    const request: Rest.Request<null> = {
-      method: 'GET',
-      url: '/api/identity/roles/all',
-    };
-
-    return this.rest.request<null, Identity.RoleResponse>(request, { apiName: this.apiName });
-  }
-
-  getRoleById(id: string): Observable<Identity.RoleItem> {
-    const request: Rest.Request<null> = {
-      method: 'GET',
-      url: `/api/identity/roles/${id}`,
-    };
-
-    return this.rest.request<null, Identity.RoleItem>(request, { apiName: this.apiName });
-  }
-
-  deleteRole(id: string): Observable<Identity.RoleItem> {
-    const request: Rest.Request<null> = {
-      method: 'DELETE',
-      url: `/api/identity/roles/${id}`,
-    };
-
-    return this.rest.request<null, Identity.RoleItem>(request, { apiName: this.apiName });
-  }
-
-  createRole(body: Identity.RoleSaveRequest): Observable<Identity.RoleItem> {
-    const request: Rest.Request<Identity.RoleSaveRequest> = {
-      method: 'POST',
-      url: '/api/identity/roles',
-      body,
-    };
-
-    return this.rest.request<Identity.RoleSaveRequest, Identity.RoleItem>(request, {
-      apiName: this.apiName,
-    });
-  }
-
-  updateRole(body: Identity.RoleItem): Observable<Identity.RoleItem> {
-    const url = `/api/identity/roles/${body.id}`;
-    delete body.id;
-
-    const request: Rest.Request<Identity.RoleItem> = {
-      method: 'PUT',
-      url,
-      body,
-    };
-
-    return this.rest.request<Identity.RoleItem, Identity.RoleItem>(request, {
-      apiName: this.apiName,
-    });
-  }
-
-  getUsers(params = {} as ABP.PageQueryParams): Observable<Identity.UserResponse> {
-    const request: Rest.Request<null> = {
-      method: 'GET',
-      url: '/api/identity/users',
-      params,
-    };
-
-    return this.rest.request<null, Identity.UserResponse>(request, { apiName: this.apiName });
-  }
-
-  getUserById(id: string): Observable<Identity.UserItem> {
-    const request: Rest.Request<null> = {
-      method: 'GET',
-      url: `/api/identity/users/${id}`,
-    };
-
-    return this.rest.request<null, Identity.UserItem>(request, { apiName: this.apiName });
-  }
-
-  getUserRoles(id: string): Observable<Identity.RoleResponse> {
-    const request: Rest.Request<null> = {
-      method: 'GET',
-      url: `/api/identity/users/${id}/roles`,
-    };
-
-    return this.rest.request<null, Identity.RoleResponse>(request, { apiName: this.apiName });
-  }
-
-  getUserAssingableRoles(): Observable<Identity.RoleResponse> {
-    const request: Rest.Request<null> = {
-      method: 'GET',
-      url: '/api/identity/users/assignable-roles',
-    };
-
-    return this.rest.request<null, Identity.RoleResponse>(request, { apiName: this.apiName });
-  }
-
-  deleteUser(id: string): Observable<null> {
-    const request: Rest.Request<null> = {
-      method: 'DELETE',
-      url: `/api/identity/users/${id}`,
-    };
-
-    return this.rest.request<null, null>(request, { apiName: this.apiName });
-  }
-
-  createUser(body: Identity.UserSaveRequest): Observable<Identity.UserItem> {
-    const request: Rest.Request<Identity.UserSaveRequest> = {
-      method: 'POST',
-      url: '/api/identity/users',
-      body,
-    };
-
-    return this.rest.request<Identity.UserSaveRequest, Identity.UserItem>(request, {
-      apiName: this.apiName,
-    });
-  }
-
-  updateUser(body: Identity.UserItem): Observable<Identity.UserItem> {
-    const url = `/api/identity/users/${body.id}`;
-    delete body.id;
-
-    const request: Rest.Request<Identity.UserItem> = {
-      method: 'PUT',
-      url,
-      body,
-    };
-
-    return this.rest.request<Identity.UserItem, Identity.UserItem>(request, {
-      apiName: this.apiName,
-    });
-  }
-}

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

@@ -1,2 +1 @@
-export * from './identity.service';
 export * from './identity-state.service';

npm/ng-packs/packages/identity/src/lib/states/identity.state.ts

@@ -17,7 +17,7 @@ import {
 import { Identity } from '../models/identity';
 import { IdentityRoleService } from '../proxy/identity/identity-role.service';
 import { IdentityUserService } from '../proxy/identity/identity-user.service';
-import { IdentityUserDto } from '../proxy/identity/models';
+import { IdentityRoleDto, IdentityUserDto } from '../proxy/identity/models';
 
 @State<Identity.State>({
   name: 'IdentityState',
@@ -26,7 +26,7 @@ import { IdentityUserDto } from '../proxy/identity/models';
 @Injectable()
 export class IdentityState {
   @Selector()
-  static getRoles({ roles }: Identity.State): Identity.RoleItem[] {
+  static getRoles({ roles }: Identity.State): IdentityRoleDto[] {
     return roles.items || [];
   }