Merge branch 'dev' into bs5

docs/en/Tutorials/Part-1.md

@@ -34,6 +34,11 @@ This tutorial has multiple versions based on your **UI** and **Database** prefer
 * [Blazor UI with EF Core](https://github.com/abpframework/abp-samples/tree/master/BookStore-Blazor-EfCore)
 * [Angular UI with MongoDB](https://github.com/abpframework/abp-samples/tree/master/BookStore-Angular-MongoDb)
 
+> If you encounter the "filename too long" or "unzip error" on Windows, it's probably related to the Windows maximum file path limitation. Windows has a maximum file path limitation of 250 characters. To solve this, [enable the long path option in Windows 10](https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=cmd#enable-long-paths-in-windows-10-version-1607-and-later).
+
+> If you face long path errors related to Git, try the following command to enable long paths in Windows. See https://github.com/msysgit/msysgit/wiki/Git-cannot-create-a-file-or-directory-with-a-long-path
+> `git config --system core.longpaths true`
+
 {{if UI == "MVC" && DB == "EF"}}
 
 ### Video Tutorial

docs/en/Tutorials/Part-10.md

@@ -34,6 +34,11 @@ This tutorial has multiple versions based on your **UI** and **Database** prefer
 * [Blazor UI with EF Core](https://github.com/abpframework/abp-samples/tree/master/BookStore-Blazor-EfCore)
 * [Angular UI with MongoDB](https://github.com/abpframework/abp-samples/tree/master/BookStore-Angular-MongoDb)
 
+> If you encounter the "filename too long" or "unzip error" on Windows, it's probably related to the Windows maximum file path limitation. Windows has a maximum file path limitation of 250 characters. To solve this, [enable the long path option in Windows 10](https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=cmd#enable-long-paths-in-windows-10-version-1607-and-later).
+
+> If you face long path errors related to Git, try the following command to enable long paths in Windows. See https://github.com/msysgit/msysgit/wiki/Git-cannot-create-a-file-or-directory-with-a-long-path
+> `git config --system core.longpaths true`
+
 ## Introduction
 
 We have created `Book` and `Author` functionalities for the book store application. However, currently there is no relation between these entities.

docs/en/Tutorials/Part-2.md

@@ -34,6 +34,11 @@ This tutorial has multiple versions based on your **UI** and **Database** prefer
 * [Blazor UI with EF Core](https://github.com/abpframework/abp-samples/tree/master/BookStore-Blazor-EfCore)
 * [Angular UI with MongoDB](https://github.com/abpframework/abp-samples/tree/master/BookStore-Angular-MongoDb)
 
+> If you encounter the "filename too long" or "unzip error" on Windows, it's probably related to the Windows maximum file path limitation. Windows has a maximum file path limitation of 250 characters. To solve this, [enable the long path option in Windows 10](https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=cmd#enable-long-paths-in-windows-10-version-1607-and-later).
+
+> If you face long path errors related to Git, try the following command to enable long paths in Windows. See https://github.com/msysgit/msysgit/wiki/Git-cannot-create-a-file-or-directory-with-a-long-path
+> `git config --system core.longpaths true`
+
 {{if UI == "MVC" && DB == "EF"}}
 
 ### Video Tutorial
@@ -85,6 +90,8 @@ acme.bookStore.books.book.create({
     });
 ````
 
+> If you downloaded the source code of the tutorial and following the steps from the sample, you should also pass the `authorId` parameter to the create method for **creating a new book**.
+
 You should see a message in the console something like that:
 
 ````text

docs/en/Tutorials/Part-3.md

@@ -34,6 +34,11 @@ This tutorial has multiple versions based on your **UI** and **Database** prefer
 * [Blazor UI with EF Core](https://github.com/abpframework/abp-samples/tree/master/BookStore-Blazor-EfCore)
 * [Angular UI with MongoDB](https://github.com/abpframework/abp-samples/tree/master/BookStore-Angular-MongoDb)
 
+> If you encounter the "filename too long" or "unzip error" on Windows, it's probably related to the Windows maximum file path limitation. Windows has a maximum file path limitation of 250 characters. To solve this, [enable the long path option in Windows 10](https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=cmd#enable-long-paths-in-windows-10-version-1607-and-later).
+
+> If you face long path errors related to Git, try the following command to enable long paths in Windows. See https://github.com/msysgit/msysgit/wiki/Git-cannot-create-a-file-or-directory-with-a-long-path
+> `git config --system core.longpaths true`
+
 {{if UI == "MVC" && DB == "EF"}}
 
 ### Video Tutorial

docs/en/Tutorials/Part-4.md

@@ -34,6 +34,11 @@ This tutorial has multiple versions based on your **UI** and **Database** prefer
 * [Blazor UI with EF Core](https://github.com/abpframework/abp-samples/tree/master/BookStore-Blazor-EfCore)
 * [Angular UI with MongoDB](https://github.com/abpframework/abp-samples/tree/master/BookStore-Angular-MongoDb)
 
+> If you encounter the "filename too long" or "unzip error" on Windows, it's probably related to the Windows maximum file path limitation. Windows has a maximum file path limitation of 250 characters. To solve this, [enable the long path option in Windows 10](https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=cmd#enable-long-paths-in-windows-10-version-1607-and-later).
+
+> If you face long path errors related to Git, try the following command to enable long paths in Windows. See https://github.com/msysgit/msysgit/wiki/Git-cannot-create-a-file-or-directory-with-a-long-path
+> `git config --system core.longpaths true`
+
 {{if UI == "MVC" && DB == "EF"}}
 
 ### Video Tutorial

docs/en/Tutorials/Part-5.md

@@ -34,6 +34,11 @@ This tutorial has multiple versions based on your **UI** and **Database** prefer
 * [Blazor UI with EF Core](https://github.com/abpframework/abp-samples/tree/master/BookStore-Blazor-EfCore)
 * [Angular UI with MongoDB](https://github.com/abpframework/abp-samples/tree/master/BookStore-Angular-MongoDb)
 
+> If you encounter the "filename too long" or "unzip error" on Windows, it's probably related to the Windows maximum file path limitation. Windows has a maximum file path limitation of 250 characters. To solve this, [enable the long path option in Windows 10](https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=cmd#enable-long-paths-in-windows-10-version-1607-and-later).
+
+> If you face long path errors related to Git, try the following command to enable long paths in Windows. See https://github.com/msysgit/msysgit/wiki/Git-cannot-create-a-file-or-directory-with-a-long-path
+> `git config --system core.longpaths true`
+
 {{if UI == "MVC" && DB == "EF"}}
 
 ### Video Tutorial
@@ -627,4 +632,4 @@ private async Task ConfigureMainMenuAsync(MenuConfigurationContext context)
 
 ## The Next Part
 
-See the [next part](Part-6.md) of this tutorial.
+See the [next part](Part-6.md) of this tutorial.

docs/en/Tutorials/Part-6.md

@@ -34,6 +34,11 @@ This tutorial has multiple versions based on your **UI** and **Database** prefer
 * [Blazor UI with EF Core](https://github.com/abpframework/abp-samples/tree/master/BookStore-Blazor-EfCore)
 * [Angular UI with MongoDB](https://github.com/abpframework/abp-samples/tree/master/BookStore-Angular-MongoDb)
 
+> If you encounter the "filename too long" or "unzip error" on Windows, it's probably related to the Windows maximum file path limitation. Windows has a maximum file path limitation of 250 characters. To solve this, [enable the long path option in Windows 10](https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=cmd#enable-long-paths-in-windows-10-version-1607-and-later).
+
+> If you face long path errors related to Git, try the following command to enable long paths in Windows. See https://github.com/msysgit/msysgit/wiki/Git-cannot-create-a-file-or-directory-with-a-long-path
+> `git config --system core.longpaths true`
+
 ## Introduction
 
 In the previous parts, we've used the ABP infrastructure to easily build some services;
@@ -270,4 +275,4 @@ This part covered the domain layer of the authors functionality of the book stor
 
 ## The Next Part
 
-See the [next part](Part-7.md) of this tutorial.
+See the [next part](Part-7.md) of this tutorial.

docs/en/Tutorials/Part-7.md

@@ -34,6 +34,11 @@ This tutorial has multiple versions based on your **UI** and **Database** prefer
 * [Blazor UI with EF Core](https://github.com/abpframework/abp-samples/tree/master/BookStore-Blazor-EfCore)
 * [Angular UI with MongoDB](https://github.com/abpframework/abp-samples/tree/master/BookStore-Angular-MongoDb)
 
+> If you encounter the "filename too long" or "unzip error" on Windows, it's probably related to the Windows maximum file path limitation. Windows has a maximum file path limitation of 250 characters. To solve this, [enable the long path option in Windows 10](https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=cmd#enable-long-paths-in-windows-10-version-1607-and-later).
+
+> If you face long path errors related to Git, try the following command to enable long paths in Windows. See https://github.com/msysgit/msysgit/wiki/Git-cannot-create-a-file-or-directory-with-a-long-path
+> `git config --system core.longpaths true`
+
 ## Introduction
 
 This part explains how to configure the database integration for the `Author` entity introduced in the previous part.

docs/en/Tutorials/Part-8.md

@@ -34,6 +34,11 @@ This tutorial has multiple versions based on your **UI** and **Database** prefer
 * [Blazor UI with EF Core](https://github.com/abpframework/abp-samples/tree/master/BookStore-Blazor-EfCore)
 * [Angular UI with MongoDB](https://github.com/abpframework/abp-samples/tree/master/BookStore-Angular-MongoDb)
 
+> If you encounter the "filename too long" or "unzip error" on Windows, it's probably related to the Windows maximum file path limitation. Windows has a maximum file path limitation of 250 characters. To solve this, [enable the long path option in Windows 10](https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=cmd#enable-long-paths-in-windows-10-version-1607-and-later).
+
+> If you face long path errors related to Git, try the following command to enable long paths in Windows. See https://github.com/msysgit/msysgit/wiki/Git-cannot-create-a-file-or-directory-with-a-long-path
+> `git config --system core.longpaths true`
+
 ## Introduction
 
 This part explains to create an application layer for the `Author` entity created before.

docs/en/Tutorials/Part-9.md

@@ -34,6 +34,11 @@ This tutorial has multiple versions based on your **UI** and **Database** prefer
 * [Blazor UI with EF Core](https://github.com/abpframework/abp-samples/tree/master/BookStore-Blazor-EfCore)
 * [Angular UI with MongoDB](https://github.com/abpframework/abp-samples/tree/master/BookStore-Angular-MongoDb)
 
+> If you encounter the "filename too long" or "unzip error" on Windows, it's probably related to the Windows maximum file path limitation. Windows has a maximum file path limitation of 250 characters. To solve this, [enable the long path option in Windows 10](https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=cmd#enable-long-paths-in-windows-10-version-1607-and-later).
+
+> If you face long path errors related to Git, try the following command to enable long paths in Windows. See https://github.com/msysgit/msysgit/wiki/Git-cannot-create-a-file-or-directory-with-a-long-path
+> `git config --system core.longpaths true`
+
 ## Introduction
 
 This part explains how to create a CRUD page for the `Author` entity introduced in the previous parts.

framework/src/Volo.Abp.Swashbuckle/Volo/Abp/Swashbuckle/Conventions/AbpSwaggerClientProxyServiceConvention.cs

@@ -217,7 +217,7 @@ namespace Volo.Abp.Swashbuckle.Conventions
             var key =
                 $"{appServiceType.FullName}." +
                 $"{action.ActionMethod.Name}." +
-                $"{string.Join("-", action.Parameters.Select(x => x.ParameterType.FullName))}";
+                $"{string.Join("-", action.Parameters.Select(x => TypeHelper.GetFullNameHandlingNullableAndGenerics(x.ParameterType)))}";
 
             var actionApiDescriptionModel = ClientProxyApiDescriptionFinder.FindAction(key);
             if (actionApiDescriptionModel == null)

modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Menus/MenuItemAdminAppService.cs

@@ -64,6 +64,11 @@ namespace Volo.CmsKit.Admin.Menus
                     CurrentTenant.Id
                 );
 
+            if (input.PageId.HasValue)
+            {
+                MenuManager.SetPageUrl(menuItem, await PageRepository.GetAsync(input.PageId.Value));
+            }
+            
             await MenuItemRepository.InsertAsync(menuItem);
 
             return ObjectMapper.Map<MenuItem, MenuItemDto>(menuItem);

npm/ng-packs/.eslintrc.json

@@ -10,7 +10,7 @@
           "error",
           {
             "enforceBuildableLibDependency": true,
-            "allow": [],
+            "allow": ["@abp/**/proxy"],
             "depConstraints": [
               {
                 "sourceTag": "*",
@@ -20,7 +20,7 @@
           }
         ]
       }
-    },  
+    },
     {
       "files": ["*.ts", "*.tsx"],
       "extends": ["plugin:@nrwl/nx/typescript"],

npm/ng-packs/nx.json

@@ -31,13 +31,13 @@
     "appsDir": ""
   },
   "projects": {
-    "account": {
+    "account-core": {
       "tags": [],
       "implicitDependencies": ["core", "theme-shared"]
     },
-    "account-core": {
+    "account": {
       "tags": [],
-      "implicitDependencies": ["core", "theme-shared"]
+      "implicitDependencies": ["core", "theme-shared", "account-core", "identity"]
     },
     "components": {
       "tags": [],

npm/ng-packs/packages/account-core/proxy/ng-package.json

@@ -0,0 +1,7 @@
+{
+  "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
+  "dest": "../../../dist/packages/account-core/proxy",
+  "lib": {
+    "entryFile": "src/public-api.ts"
+  }
+}

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

@@ -0,0 +1,2 @@
+export * from './proxy/account';
+export * from './proxy/identity';

npm/ng-packs/packages/account-core/proxy/src/lib/proxy/account/account.service.ts

@@ -0,0 +1,37 @@
+import type { RegisterDto, ResetPasswordDto, SendPasswordResetCodeDto } from './models';
+import { RestService } from '@abp/ng.core';
+import { Injectable } from '@angular/core';
+import type { IdentityUserDto } from '../identity/models';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class AccountService {
+  apiName = 'AbpAccount';
+
+  register = (input: RegisterDto) =>
+    this.restService.request<any, IdentityUserDto>({
+      method: 'POST',
+      url: '/api/account/register',
+      body: input,
+    },
+    { apiName: this.apiName });
+
+  resetPassword = (input: ResetPasswordDto) =>
+    this.restService.request<any, void>({
+      method: 'POST',
+      url: '/api/account/reset-password',
+      body: input,
+    },
+    { apiName: this.apiName });
+
+  sendPasswordResetCode = (input: SendPasswordResetCodeDto) =>
+    this.restService.request<any, void>({
+      method: 'POST',
+      url: '/api/account/send-password-reset-code',
+      body: input,
+    },
+    { apiName: this.apiName });
+
+  constructor(private restService: RestService) {}
+}

npm/ng-packs/packages/account-core/proxy/src/lib/proxy/account/web/areas/account/controllers/account.service.ts

@@ -0,0 +1,35 @@
+import type { AbpLoginResult, UserLoginInfo } from './models/models';
+import { RestService } from '@abp/ng.core';
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class AccountService {
+  apiName = 'AbpAccount';
+
+  checkPasswordByLogin = (login: UserLoginInfo) =>
+    this.restService.request<any, AbpLoginResult>({
+      method: 'POST',
+      url: '/api/account/check-password',
+      body: login,
+    },
+    { apiName: this.apiName });
+
+  loginByLogin = (login: UserLoginInfo) =>
+    this.restService.request<any, AbpLoginResult>({
+      method: 'POST',
+      url: '/api/account/login',
+      body: login,
+    },
+    { apiName: this.apiName });
+
+  logout = () =>
+    this.restService.request<any, void>({
+      method: 'GET',
+      url: '/api/account/logout',
+    },
+    { apiName: this.apiName });
+
+  constructor(private restService: RestService) {}
+}

npm/ng-packs/packages/account-core/proxy/src/public-api.ts

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

npm/ng-packs/packages/account/ng-package.json

@@ -4,5 +4,5 @@
   "lib": {
     "entryFile": "src/public-api.ts"
   },
-  "allowedNonPeerDependencies": ["@abp/ng.theme.shared"]
+  "allowedNonPeerDependencies": ["@abp/ng.theme.shared", "@abp/ng.identity", "@abp/ng.account.core"]
 }

npm/ng-packs/packages/account/package.json

@@ -8,6 +8,8 @@
   },
   "dependencies": {
     "@abp/ng.theme.shared": "~4.4.2",
+    "@abp/ng.identity": "~4.4.2",
+    "@abp/ng.account.core": "~4.4.2",
     "tslib": "^2.0.0"
   },
   "publishConfig": {

npm/ng-packs/packages/account/src/lib/components/change-password/change-password.component.ts

@@ -1,4 +1,4 @@
-import { ProfileService } from '@abp/ng.core';
+import { ProfileService } from '@abp/ng.identity/proxy';
 import { getPasswordValidators, ToasterService } from '@abp/ng.theme.shared';
 import { Component, Injector, OnInit } from '@angular/core';
 import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';

npm/ng-packs/packages/account/src/lib/components/forgot-password/forgot-password.component.ts

@@ -1,7 +1,7 @@
+import { AccountService } from '@abp/ng.account.core/proxy';
 import { Component } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { finalize } from 'rxjs/operators';
-import { AccountService } from '../../proxy/account/account.service';
 
 @Component({
   selector: 'abp-forgot-password',

npm/ng-packs/packages/account/src/lib/components/manage-profile/manage-profile.component.ts

@@ -1,4 +1,4 @@
-import { ProfileService } from '@abp/ng.core';
+import { ProfileService } from '@abp/ng.identity/proxy';
 import { fadeIn } from '@abp/ng.theme.shared';
 import { transition, trigger, useAnimation } from '@angular/animations';
 import { Component, OnInit } from '@angular/core';

npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings.component.ts

@@ -1,4 +1,4 @@
-import { ProfileService } from '@abp/ng.core';
+import { ProfileService } from '@abp/ng.identity/proxy';
 import { ToasterService } from '@abp/ng.theme.shared';
 import { Component, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';

npm/ng-packs/packages/account/src/lib/components/register/register.component.ts

@@ -1,3 +1,4 @@
+import { AccountService, RegisterDto } from '@abp/ng.account.core/proxy';
 import { AuthService, ConfigStateService } from '@abp/ng.core';
 import { getPasswordValidators, ToasterService } from '@abp/ng.theme.shared';
 import { Component, Injector, OnInit } from '@angular/core';
@@ -5,9 +6,8 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { throwError } from 'rxjs';
 import { catchError, finalize, switchMap } from 'rxjs/operators';
 import { eAccountComponents } from '../../enums/components';
-import { AccountService } from '../../proxy/account/account.service';
-import { RegisterDto } from '../../proxy/account/models';
 import { getRedirectUrl } from '../../utils/auth-utils';
+
 const { maxLength, required, email } = Validators;
 
 @Component({

npm/ng-packs/packages/account/src/lib/components/reset-password/reset-password.component.ts

@@ -1,10 +1,10 @@
+import { AccountService } from '@abp/ng.account.core/proxy';
 import { getPasswordValidators } from '@abp/ng.theme.shared';
 import { Component, Injector, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { comparePasswords, Validation } from '@ngx-validate/core';
 import { finalize } from 'rxjs/operators';
-import { AccountService } from '../../proxy/account/account.service';
 
 const PASSWORD_FIELDS = ['password', 'confirmPassword'];
 

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

@@ -1,43 +0,0 @@
-import type { RegisterDto, ResetPasswordDto, SendPasswordResetCodeDto } from './models';
-import { RestService } from '@abp/ng.core';
-import { Injectable } from '@angular/core';
-import type { IdentityUserDto } from '../identity/models';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class AccountService {
-  apiName = 'AbpAccount';
-
-  register = (input: RegisterDto) =>
-    this.restService.request<any, IdentityUserDto>(
-      {
-        method: 'POST',
-        url: '/api/account/register',
-        body: input,
-      },
-      { apiName: this.apiName },
-    );
-
-  resetPassword = (input: ResetPasswordDto) =>
-    this.restService.request<any, void>(
-      {
-        method: 'POST',
-        url: '/api/account/reset-password',
-        body: input,
-      },
-      { apiName: this.apiName },
-    );
-
-  sendPasswordResetCode = (input: SendPasswordResetCodeDto) =>
-    this.restService.request<any, void>(
-      {
-        method: 'POST',
-        url: '/api/account/send-password-reset-code',
-        body: input,
-      },
-      { apiName: this.apiName },
-    );
-
-  constructor(private restService: RestService) {}
-}

npm/ng-packs/packages/account/src/lib/proxy/account/web/areas/account/controllers/account.service.ts

@@ -1,41 +0,0 @@
-import type { AbpLoginResult, UserLoginInfo } from './models/models';
-import { RestService } from '@abp/ng.core';
-import { Injectable } from '@angular/core';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class AccountService {
-  apiName = 'AbpAccount';
-
-  checkPasswordByLogin = (login: UserLoginInfo) =>
-    this.restService.request<any, AbpLoginResult>(
-      {
-        method: 'POST',
-        url: '/api/account/check-password',
-        body: login,
-      },
-      { apiName: this.apiName },
-    );
-
-  loginByLogin = (login: UserLoginInfo) =>
-    this.restService.request<any, AbpLoginResult>(
-      {
-        method: 'POST',
-        url: '/api/account/login',
-        body: login,
-      },
-      { apiName: this.apiName },
-    );
-
-  logout = () =>
-    this.restService.request<any, void>(
-      {
-        method: 'GET',
-        url: '/api/account/logout',
-      },
-      { apiName: this.apiName },
-    );
-
-  constructor(private restService: RestService) {}
-}

npm/ng-packs/packages/account/src/lib/services/manage-profile.state.service.ts

@@ -1,4 +1,5 @@
-import { InternalStore, ProfileDto } from '@abp/ng.core';
+import { InternalStore } from '@abp/ng.core';
+import { ProfileDto } from '@abp/ng.identity/proxy';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 

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

@@ -5,5 +5,3 @@ export * from './lib/guards';
 export * from './lib/models';
 export * from './lib/services';
 export * from './lib/tokens';
-export * from './lib/proxy/account';
-export * from './lib/proxy/identity';

npm/ng-packs/packages/core/src/lib/models/index.ts

@@ -3,7 +3,6 @@ export * from './common';
 export * from './dtos';
 export * from './environment';
 export * from './localization';
-export * from './profile';
 export * from './replaceable-components';
 export * from './rest';
 export * from './session';

npm/ng-packs/packages/core/src/lib/models/profile.ts

@@ -1,26 +0,0 @@
-import { ExtensibleObject } from './dtos';
-
-export interface ChangePasswordInput {
-  currentPassword: string;
-  newPassword: string;
-}
-
-export interface ProfileDto extends ExtensibleObject {
-  userName: string;
-  email: string;
-  name: string;
-  surname: string;
-  phoneNumber: string;
-  isExternal?: boolean;
-  hasPassword?: boolean;
-  emailConfirmed?: boolean;
-  phoneNumberConfirmed?: boolean;
-}
-
-export interface UpdateProfileDto extends ExtensibleObject {
-  userName: string;
-  email: string;
-  name: string;
-  surname: string;
-  phoneNumber: string;
-}

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

@@ -10,7 +10,6 @@ export * from './list.service';
 export * from './localization.service';
 export * from './multi-tenancy.service';
 export * from './permission.service';
-export * from './profile.service';
 export * from './replaceable-components.service';
 export * from './resource-wait.service';
 export * from './rest.service';

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

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

npm/ng-packs/packages/core/src/lib/tests/profile.service.spec.ts

@@ -1,59 +0,0 @@
-import { createHttpFactory, HttpMethod, SpectatorHttp, SpyObject } from '@ngneat/spectator/jest';
-import { UpdateProfileDto } from '../models';
-import {
-  EnvironmentService,
-  HttpErrorReporterService,
-  ProfileService,
-  RestService,
-} from '../services';
-import { CORE_OPTIONS } from '../tokens';
-
-describe('ProfileService', () => {
-  let spectator: SpectatorHttp<ProfileService>;
-  let environmentService: SpyObject<EnvironmentService>;
-
-  const createHttp = createHttpFactory({
-    service: ProfileService,
-    providers: [RestService, HttpErrorReporterService, { provide: CORE_OPTIONS, useValue: {} }],
-    mocks: [EnvironmentService],
-  });
-
-  beforeEach(() => {
-    spectator = createHttp();
-    environmentService = spectator.inject(EnvironmentService);
-    const getApiUrlSpy = jest.spyOn(environmentService, 'getApiUrl');
-    getApiUrlSpy.mockReturnValue('https://abp.io');
-  });
-
-  it('should send a GET to my-profile API', () => {
-    spectator.service.get().subscribe();
-    spectator.expectOne('https://abp.io/api/identity/my-profile', HttpMethod.GET);
-  });
-
-  it('should send a POST to change-password API', () => {
-    const mock = { currentPassword: 'test', newPassword: 'test' };
-    spectator.service.changePassword(mock).subscribe();
-    const req = spectator.expectOne(
-      'https://abp.io/api/identity/my-profile/change-password',
-      HttpMethod.POST,
-    );
-    expect(req.request.body).toEqual(mock);
-  });
-
-  it('should send a PUT to my-profile API', () => {
-    const mock = {
-      email: 'info@volosoft.com',
-      userName: 'admin',
-      name: 'John',
-      surname: 'Doe',
-      phoneNumber: '+123456',
-      isExternal: false,
-      hasPassword: false,
-      extraProperties: {},
-    } as UpdateProfileDto;
-
-    spectator.service.update(mock).subscribe();
-    const req = spectator.expectOne('https://abp.io/api/identity/my-profile', HttpMethod.PUT);
-    expect(req.request.body).toEqual(mock);
-  });
-});

npm/ng-packs/packages/feature-management/proxy/ng-package.json

@@ -0,0 +1,7 @@
+{
+  "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
+  "dest": "../../../dist/packages/feature-management/proxy",
+  "lib": {
+    "entryFile": "src/public-api.ts"
+  }
+}

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

@@ -0,0 +1,2 @@
+export * from './proxy/feature-management';
+export * from './proxy/validation';

npm/ng-packs/packages/feature-management/proxy/src/lib/proxy/feature-management/features.service.ts

@@ -0,0 +1,29 @@
+import type { GetFeatureListResultDto, UpdateFeaturesDto } from './models';
+import { RestService } from '@abp/ng.core';
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class FeaturesService {
+  apiName = 'AbpFeatureManagement';
+
+  get = (providerName: string, providerKey: string) =>
+    this.restService.request<any, GetFeatureListResultDto>({
+      method: 'GET',
+      url: '/api/feature-management/features',
+      params: { providerName, providerKey },
+    },
+    { apiName: this.apiName });
+
+  update = (providerName: string, providerKey: string, input: UpdateFeaturesDto) =>
+    this.restService.request<any, void>({
+      method: 'PUT',
+      url: '/api/feature-management/features',
+      params: { providerName, providerKey },
+      body: input,
+    },
+    { apiName: this.apiName });
+
+  constructor(private restService: RestService) {}
+}

npm/ng-packs/packages/feature-management/src/lib/proxy/feature-management/models.ts → npm/ng-packs/packages/feature-management/proxy/src/lib/proxy/feature-management/models.ts

@@ -1,25 +1,25 @@
 import type { IStringValueType } from '../validation/string-values/models';
 
 export interface FeatureDto {
-  name: string;
-  displayName: string;
-  value: string;
+  name?: string;
+  displayName?: string;
+  value?: string;
   provider: FeatureProviderDto;
-  description: string;
+  description?: string;
   valueType: IStringValueType;
   depth: number;
-  parentName: string;
+  parentName?: string;
 }
 
 export interface FeatureGroupDto {
-  name: string;
-  displayName: string;
+  name?: string;
+  displayName?: string;
   features: FeatureDto[];
 }
 
 export interface FeatureProviderDto {
-  name: string;
-  key: string;
+  name?: string;
+  key?: string;
 }
 
 export interface GetFeatureListResultDto {
@@ -27,8 +27,8 @@ export interface GetFeatureListResultDto {
 }
 
 export interface UpdateFeatureDto {
-  name: string;
-  value: string;
+  name?: string;
+  value?: string;
 }
 
 export interface UpdateFeaturesDto {

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

@@ -0,0 +1,3 @@
+import * as FeatureManagement from './feature-management';
+import * as Validation from './validation';
+export { FeatureManagement, Validation };

npm/ng-packs/packages/feature-management/proxy/src/lib/proxy/validation/index.ts

@@ -0,0 +1,2 @@
+import * as StringValues from './string-values';
+export { StringValues };

npm/ng-packs/packages/feature-management/src/lib/proxy/validation/string-values/models.ts → npm/ng-packs/packages/feature-management/proxy/src/lib/proxy/validation/string-values/models.ts

@@ -1,14 +1,13 @@
-/* eslint-disable @typescript-eslint/ban-types */
 
 export interface IStringValueType {
-  name: string;
+  name?: string;
   item: object;
   properties: Record<string, object>;
   validator: IValueValidator;
 }
 
 export interface IValueValidator {
-  name: string;
+  name?: string;
   item: object;
   properties: Record<string, object>;
 }

npm/ng-packs/packages/feature-management/proxy/src/public-api.ts

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

npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.ts

@@ -1,14 +1,14 @@
 import { ConfigStateService, TrackByService } from '@abp/ng.core';
-import { LocaleDirection } from '@abp/ng.theme.shared';
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { finalize } from 'rxjs/operators';
-import { FeatureManagement } from '../../models/feature-management';
-import { FeaturesService } from '../../proxy/feature-management/features.service';
 import {
   FeatureDto,
   FeatureGroupDto,
+  FeaturesService,
   UpdateFeatureDto,
-} from '../../proxy/feature-management/models';
+} from '@abp/ng.feature-management/proxy';
+import { LocaleDirection } from '@abp/ng.theme.shared';
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { finalize } from 'rxjs/operators';
+import { FeatureManagement } from '../../models/feature-management';
 
 enum ValueTypes {
   ToggleStringValueType = 'ToggleStringValueType',

npm/ng-packs/packages/feature-management/src/lib/proxy/feature-management/features.service.ts

@@ -1,33 +0,0 @@
-import type { GetFeatureListResultDto, UpdateFeaturesDto } from './models';
-import { RestService } from '@abp/ng.core';
-import { Injectable } from '@angular/core';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class FeaturesService {
-  apiName = 'AbpFeatureManagement';
-
-  get = (providerName: string, providerKey: string) =>
-    this.restService.request<any, GetFeatureListResultDto>(
-      {
-        method: 'GET',
-        url: '/api/feature-management/features',
-        params: { providerName, providerKey },
-      },
-      { apiName: this.apiName },
-    );
-
-  update = (providerName: string, providerKey: string, input: UpdateFeaturesDto) =>
-    this.restService.request<any, void>(
-      {
-        method: 'PUT',
-        url: '/api/feature-management/features',
-        params: { providerName, providerKey },
-        body: input,
-      },
-      { apiName: this.apiName },
-    );
-
-  constructor(private restService: RestService) {}
-}

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

@@ -1,2 +0,0 @@
-export * as FeatureManagement from './feature-management';
-export * as Validation from './validation';

npm/ng-packs/packages/feature-management/src/lib/proxy/validation/index.ts

@@ -1 +0,0 @@
-export * as StringValues from './string-values';

npm/ng-packs/packages/feature-management/src/public-api.ts

@@ -2,5 +2,3 @@ export * from './lib/components';
 export * from './lib/directives';
 export * from './lib/enums/components';
 export * from './lib/feature-management.module';
-export * from './lib/proxy/feature-management';
-export * from './lib/proxy/validation/string-values';

npm/ng-packs/packages/identity/proxy/ng-package.json

@@ -0,0 +1,7 @@
+{
+  "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
+  "dest": "../../../dist/packages/identity/proxy",
+  "lib": {
+    "entryFile": "src/public-api.ts"
+  }
+}

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

@@ -0,0 +1,2 @@
+export * from './proxy/identity';
+export * from './proxy/users';

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

@@ -0,0 +1,58 @@
+import type { GetIdentityRolesInput, IdentityRoleCreateDto, IdentityRoleDto, IdentityRoleUpdateDto } 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 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: GetIdentityRolesInput) =>
+    this.restService.request<any, PagedResultDto<IdentityRoleDto>>({
+      method: 'GET',
+      url: '/api/identity/roles',
+      params: { filter: input.filter, 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/proxy/src/lib/proxy/identity/identity-user-lookup.service.ts

@@ -0,0 +1,44 @@
+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/proxy/src/lib/proxy/identity/identity-user.service.ts

@@ -0,0 +1,87 @@
+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/models.ts → npm/ng-packs/packages/identity/proxy/src/lib/proxy/identity/models.ts

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

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

@@ -0,0 +1,35 @@
+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/proxy/src/lib/proxy/index.ts

@@ -0,0 +1,3 @@
+import * as Identity from './identity';
+import * as Users from './users';
+export { Identity, Users };

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

@@ -0,0 +1,12 @@
+
+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/proxy/src/public-api.ts

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

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/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/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';