From 84f34480d6c498178182f1a5f5dc048a038046a8 Mon Sep 17 00:00:00 2001 From: Arman Ozak Date: Thu, 12 Nov 2020 09:59:04 +0300 Subject: [PATCH] chore: remove legacy identity types and service --- .../lib/components/users/users.component.ts | 2 - .../identity/src/lib/models/identity.ts | 63 +------- .../src/lib/services/identity.service.ts | 150 ------------------ .../identity/src/lib/services/index.ts | 1 - .../identity/src/lib/states/identity.state.ts | 4 +- 5 files changed, 3 insertions(+), 217 deletions(-) delete mode 100644 npm/ng-packs/packages/identity/src/lib/services/identity.service.ts diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts index c302b14cea..3588ad02b0 100644 --- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts +++ b/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, ) {} diff --git a/npm/ng-packs/packages/identity/src/lib/models/identity.ts b/npm/ng-packs/packages/identity/src/lib/models/identity.ts index b4c527b0e7..115e0b488f 100644 --- a/npm/ng-packs/packages/identity/src/lib/models/identity.ts +++ b/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; - - /** - * @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; - - /** - * @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[]; - } } diff --git a/npm/ng-packs/packages/identity/src/lib/services/identity.service.ts b/npm/ng-packs/packages/identity/src/lib/services/identity.service.ts deleted file mode 100644 index 7413079279..0000000000 --- a/npm/ng-packs/packages/identity/src/lib/services/identity.service.ts +++ /dev/null @@ -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 { - const request: Rest.Request = { - method: 'GET', - url: '/api/identity/roles', - params, - }; - - return this.rest.request(request, { apiName: this.apiName }); - } - - getAllRoles(): Observable { - const request: Rest.Request = { - method: 'GET', - url: '/api/identity/roles/all', - }; - - return this.rest.request(request, { apiName: this.apiName }); - } - - getRoleById(id: string): Observable { - const request: Rest.Request = { - method: 'GET', - url: `/api/identity/roles/${id}`, - }; - - return this.rest.request(request, { apiName: this.apiName }); - } - - deleteRole(id: string): Observable { - const request: Rest.Request = { - method: 'DELETE', - url: `/api/identity/roles/${id}`, - }; - - return this.rest.request(request, { apiName: this.apiName }); - } - - createRole(body: Identity.RoleSaveRequest): Observable { - const request: Rest.Request = { - method: 'POST', - url: '/api/identity/roles', - body, - }; - - return this.rest.request(request, { - apiName: this.apiName, - }); - } - - updateRole(body: Identity.RoleItem): Observable { - const url = `/api/identity/roles/${body.id}`; - delete body.id; - - const request: Rest.Request = { - method: 'PUT', - url, - body, - }; - - return this.rest.request(request, { - apiName: this.apiName, - }); - } - - getUsers(params = {} as ABP.PageQueryParams): Observable { - const request: Rest.Request = { - method: 'GET', - url: '/api/identity/users', - params, - }; - - return this.rest.request(request, { apiName: this.apiName }); - } - - getUserById(id: string): Observable { - const request: Rest.Request = { - method: 'GET', - url: `/api/identity/users/${id}`, - }; - - return this.rest.request(request, { apiName: this.apiName }); - } - - getUserRoles(id: string): Observable { - const request: Rest.Request = { - method: 'GET', - url: `/api/identity/users/${id}/roles`, - }; - - return this.rest.request(request, { apiName: this.apiName }); - } - - getUserAssingableRoles(): Observable { - const request: Rest.Request = { - method: 'GET', - url: '/api/identity/users/assignable-roles', - }; - - return this.rest.request(request, { apiName: this.apiName }); - } - - deleteUser(id: string): Observable { - const request: Rest.Request = { - method: 'DELETE', - url: `/api/identity/users/${id}`, - }; - - return this.rest.request(request, { apiName: this.apiName }); - } - - createUser(body: Identity.UserSaveRequest): Observable { - const request: Rest.Request = { - method: 'POST', - url: '/api/identity/users', - body, - }; - - return this.rest.request(request, { - apiName: this.apiName, - }); - } - - updateUser(body: Identity.UserItem): Observable { - const url = `/api/identity/users/${body.id}`; - delete body.id; - - const request: Rest.Request = { - method: 'PUT', - url, - body, - }; - - return this.rest.request(request, { - apiName: this.apiName, - }); - } -} diff --git a/npm/ng-packs/packages/identity/src/lib/services/index.ts b/npm/ng-packs/packages/identity/src/lib/services/index.ts index 8f15a1ebe1..d29e295c98 100644 --- a/npm/ng-packs/packages/identity/src/lib/services/index.ts +++ b/npm/ng-packs/packages/identity/src/lib/services/index.ts @@ -1,2 +1 @@ -export * from './identity.service'; export * from './identity-state.service'; diff --git a/npm/ng-packs/packages/identity/src/lib/states/identity.state.ts b/npm/ng-packs/packages/identity/src/lib/states/identity.state.ts index 565315bfb6..f67661e0d1 100644 --- a/npm/ng-packs/packages/identity/src/lib/states/identity.state.ts +++ b/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({ 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 || []; }