@abpjs/identity 3.2.0 → 4.0.0

package/dist/index.mjs

@@ -33,9 +33,9 @@ var eIdentityRouteNames = {
 
 // src/config/providers/route.provider.ts
 import { getRoutesService, eLayoutType } from "@abpjs/core";
-function configureRoutes(routes) {
+function configureRoutes(routesService) {
   return () => {
-    routes.add([
+    routesService.add([
       {
         path: "/identity",
         name: eIdentityRouteNames.IdentityManagement,
@@ -66,8 +66,8 @@ var IDENTITY_ROUTE_PROVIDERS = {
   configureRoutes
 };
 function initializeIdentityRoutes() {
-  const routes = getRoutesService();
-  const addRoutes = configureRoutes(routes);
+  const routesService = getRoutesService();
+  const addRoutes = configureRoutes(routesService);
   addRoutes();
 }
 
@@ -393,192 +393,23 @@ var ProfileService = class {
   }
 };
 
-// src/services/identity.service.ts
-var IdentityService = class {
-  constructor(rest) {
-    /**
-     * The API name used for REST requests.
-     * @since 2.4.0
-     */
-    this.apiName = "default";
-    this.rest = rest;
-  }
-  // ========================
-  // Role Operations
-  // ========================
-  /**
-   * Get all roles with optional pagination/filtering (v0.9.0)
-   * @param params - Optional query parameters for pagination and filtering
-   * @returns Promise with paginated role response
-   */
-  getRoles(params = {}) {
-    return this.rest.request({
-      method: "GET",
-      url: "/api/identity/roles",
-      params
-    });
-  }
-  /**
-   * Get all roles without pagination.
-   * Fetches all roles in a single request.
-   * @since 2.4.0
-   * @returns Promise with all roles
-   */
-  getAllRoles() {
-    return this.rest.request({
-      method: "GET",
-      url: "/api/identity/roles/all"
-    });
-  }
-  /**
-   * Get a role by ID
-   * @param id - The role ID
-   * @returns Promise with the role item
-   */
-  getRoleById(id) {
-    return this.rest.request({
-      method: "GET",
-      url: `/api/identity/roles/${id}`
-    });
-  }
-  /**
-   * Delete a role
-   * @param id - The role ID to delete
-   * @returns Promise with the deleted role
-   */
-  deleteRole(id) {
-    return this.rest.request({
-      method: "DELETE",
-      url: `/api/identity/roles/${id}`
-    });
-  }
-  /**
-   * Create a new role
-   * @param body - The role data to create
-   * @returns Promise with the created role
-   */
-  createRole(body) {
-    return this.rest.request({
-      method: "POST",
-      url: "/api/identity/roles",
-      body
-    });
-  }
-  /**
-   * Update an existing role
-   * @param id - The role ID to update
-   * @param body - The updated role data
-   * @returns Promise with the updated role
-   */
-  updateRole(id, body) {
-    return this.rest.request({
-      method: "PUT",
-      url: `/api/identity/roles/${id}`,
-      body
-    });
-  }
-  // ========================
-  // User Operations
-  // ========================
-  /**
-   * Get users with pagination and filtering
-   * @param params - Query parameters for pagination and filtering
-   * @returns Promise with paginated user response
-   */
-  getUsers(params = {}) {
-    return this.rest.request({
-      method: "GET",
-      url: "/api/identity/users",
-      params
-    });
-  }
-  /**
-   * Get a user by ID
-   * @param id - The user ID
-   * @returns Promise with the user item
-   */
-  getUserById(id) {
-    return this.rest.request({
-      method: "GET",
-      url: `/api/identity/users/${id}`
-    });
-  }
-  /**
-   * Get roles assigned to a user
-   * @param id - The user ID
-   * @returns Promise with the user's roles
-   */
-  getUserRoles(id) {
-    return this.rest.request({
-      method: "GET",
-      url: `/api/identity/users/${id}/roles`
-    });
-  }
-  /**
-   * Get all roles that can be assigned to users.
-   * This returns the list of available roles for user assignment.
-   * @since 3.0.0
-   * @returns Promise with assignable roles
-   */
-  getUserAssignableRoles() {
-    return this.rest.request({
-      method: "GET",
-      url: "/api/identity/users/assignable-roles"
-    });
-  }
-  /**
-   * Delete a user
-   * @param id - The user ID to delete
-   * @returns Promise resolving when complete
-   */
-  deleteUser(id) {
-    return this.rest.request({
-      method: "DELETE",
-      url: `/api/identity/users/${id}`
-    });
-  }
-  /**
-   * Create a new user
-   * @param body - The user data to create
-   * @returns Promise with the created user
-   */
-  createUser(body) {
-    return this.rest.request({
-      method: "POST",
-      url: "/api/identity/users",
-      body
-    });
-  }
-  /**
-   * Update an existing user
-   * @param id - The user ID to update
-   * @param body - The updated user data
-   * @returns Promise with the updated user
-   */
-  updateUser(id, body) {
-    return this.rest.request({
-      method: "PUT",
-      url: `/api/identity/users/${id}`,
-      body
-    });
-  }
-};
-
 // src/services/identity-state.service.ts
 var IdentityStateService = class {
-  constructor(identityService) {
+  constructor(identityRoleService, identityUserService) {
     // Internal state
     this.roles = [];
     this.rolesTotalCount = 0;
     this.users = [];
     this.usersTotalCount = 0;
-    this.identityService = identityService;
+    this.identityRoleService = identityRoleService;
+    this.identityUserService = identityUserService;
   }
   // ========================
   // State Getters
   // ========================
   /**
    * Get the current roles from state
+   * @updated 4.0.0 - Returns IdentityRoleDto[] instead of Identity.RoleItem[]
    */
   getRoles() {
     return this.roles;
@@ -591,6 +422,7 @@ var IdentityStateService = class {
   }
   /**
    * Get the current users from state
+   * @updated 4.0.0 - Returns IdentityUserDto[] instead of Identity.UserItem[]
    */
   getUsers() {
     return this.users;
@@ -606,12 +438,12 @@ var IdentityStateService = class {
   // ========================
   /**
    * Fetch roles and update internal state
-   * @param params - Optional query parameters for pagination/filtering
+   * @param params - Optional pagination/sorting parameters
    */
   async dispatchGetRoles(params) {
-    const response = await this.identityService.getRoles(params);
-    this.roles = response.items;
-    this.rolesTotalCount = response.totalCount;
+    const response = await this.identityRoleService.getList(params || {});
+    this.roles = response.items ?? [];
+    this.rolesTotalCount = response.totalCount ?? 0;
     return response;
   }
   /**
@@ -619,23 +451,22 @@ var IdentityStateService = class {
    * @param id - The role ID
    */
   async dispatchGetRoleById(id) {
-    return this.identityService.getRoleById(id);
+    return this.identityRoleService.get(id);
   }
   /**
    * Delete a role and refresh the list
    * @param id - The role ID to delete
    */
   async dispatchDeleteRole(id) {
-    const result = await this.identityService.deleteRole(id);
+    await this.identityRoleService.delete(id);
     await this.dispatchGetRoles();
-    return result;
   }
   /**
    * Create a new role and refresh the list
    * @param body - The role data to create
    */
   async dispatchCreateRole(body) {
-    const result = await this.identityService.createRole(body);
+    const result = await this.identityRoleService.create(body);
     await this.dispatchGetRoles();
     return result;
   }
@@ -644,7 +475,7 @@ var IdentityStateService = class {
    * @param payload - Object containing id and updated role data
    */
   async dispatchUpdateRole(payload) {
-    const result = await this.identityService.updateRole(payload.id, payload.body);
+    const result = await this.identityRoleService.update(payload.id, payload.body);
     await this.dispatchGetRoles();
     return result;
   }
@@ -656,9 +487,9 @@ var IdentityStateService = class {
    * @param params - Optional query parameters for pagination/filtering
    */
   async dispatchGetUsers(params) {
-    const response = await this.identityService.getUsers(params);
-    this.users = response.items;
-    this.usersTotalCount = response.totalCount;
+    const response = await this.identityUserService.getList(params || {});
+    this.users = response.items ?? [];
+    this.usersTotalCount = response.totalCount ?? 0;
     return response;
   }
   /**
@@ -666,14 +497,14 @@ var IdentityStateService = class {
    * @param id - The user ID
    */
   async dispatchGetUserById(id) {
-    return this.identityService.getUserById(id);
+    return this.identityUserService.get(id);
   }
   /**
    * Delete a user and refresh the list
    * @param id - The user ID to delete
    */
   async dispatchDeleteUser(id) {
-    await this.identityService.deleteUser(id);
+    await this.identityUserService.delete(id);
     await this.dispatchGetUsers();
   }
   /**
@@ -681,7 +512,7 @@ var IdentityStateService = class {
    * @param body - The user data to create
    */
   async dispatchCreateUser(body) {
-    const result = await this.identityService.createUser(body);
+    const result = await this.identityUserService.create(body);
     await this.dispatchGetUsers();
     return result;
   }
@@ -690,7 +521,7 @@ var IdentityStateService = class {
    * @param payload - Object containing id and updated user data
    */
   async dispatchUpdateUser(payload) {
-    const result = await this.identityService.updateUser(payload.id, payload.body);
+    const result = await this.identityUserService.update(payload.id, payload.body);
     await this.dispatchGetUsers();
     return result;
   }
@@ -699,7 +530,7 @@ var IdentityStateService = class {
    * @param id - The user ID
    */
   async dispatchGetUserRoles(id) {
-    return this.identityService.getUserRoles(id);
+    return this.identityUserService.getRoles(id);
   }
 };
 
@@ -708,7 +539,7 @@ import { useState, useCallback, useMemo } from "react";
 import { useRestService } from "@abpjs/core";
 function useRoles() {
   const restService = useRestService();
-  const service = useMemo(() => new IdentityService(restService), [restService]);
+  const service = useMemo(() => new IdentityRoleService(restService), [restService]);
   const [roles, setRoles] = useState([]);
   const [totalCount, setTotalCount] = useState(0);
   const [selectedRole, setSelectedRole] = useState(null);
@@ -720,7 +551,7 @@ function useRoles() {
     setIsLoading(true);
     setError(null);
     try {
-      const response = await service.getRoles(params);
+      const response = await service.getList(params || {});
       setRoles(response.items || []);
       setTotalCount(response.totalCount || 0);
       setIsLoading(false);
@@ -737,7 +568,7 @@ function useRoles() {
       setIsLoading(true);
       setError(null);
       try {
-        const role = await service.getRoleById(id);
+        const role = await service.get(id);
         setSelectedRole(role);
         setIsLoading(false);
         return { success: true };
@@ -755,7 +586,7 @@ function useRoles() {
       setIsLoading(true);
       setError(null);
       try {
-        await service.createRole(role);
+        await service.create(role);
         await fetchRoles();
         return { success: true };
       } catch (err) {
@@ -772,7 +603,7 @@ function useRoles() {
       setIsLoading(true);
       setError(null);
       try {
-        await service.updateRole(id, role);
+        await service.update(id, role);
         await fetchRoles();
         return { success: true };
       } catch (err) {
@@ -789,7 +620,7 @@ function useRoles() {
       setIsLoading(true);
       setError(null);
       try {
-        await service.deleteRole(id);
+        await service.delete(id);
         await fetchRoles();
         return { success: true };
       } catch (err) {
@@ -832,13 +663,14 @@ function useRoles() {
 import { useState as useState2, useCallback as useCallback2, useMemo as useMemo2 } from "react";
 import { useRestService as useRestService2 } from "@abpjs/core";
 var DEFAULT_PAGE_QUERY = {
+  filter: "",
   sorting: "userName",
   skipCount: 0,
   maxResultCount: 10
 };
 function useUsers() {
   const restService = useRestService2();
-  const service = useMemo2(() => new IdentityService(restService), [restService]);
+  const service = useMemo2(() => new IdentityUserService(restService), [restService]);
   const [users, setUsers] = useState2([]);
   const [totalCount, setTotalCount] = useState2(0);
   const [selectedUser, setSelectedUser] = useState2(null);
@@ -854,7 +686,7 @@ function useUsers() {
       setError(null);
       const queryParams = params || pageQuery;
       try {
-        const response = await service.getUsers(queryParams);
+        const response = await service.getList(queryParams);
         setUsers(response.items || []);
         setTotalCount(response.totalCount || 0);
         setIsLoading(false);
@@ -873,7 +705,7 @@ function useUsers() {
       setIsLoading(true);
       setError(null);
       try {
-        const user = await service.getUserById(id);
+        const user = await service.get(id);
         setSelectedUser(user);
         setIsLoading(false);
         return { success: true };
@@ -891,7 +723,7 @@ function useUsers() {
       setIsLoading(true);
       setError(null);
       try {
-        const response = await service.getUserRoles(id);
+        const response = await service.getRoles(id);
         setSelectedUserRoles(response.items || []);
         setIsLoading(false);
         return { success: true };
@@ -909,7 +741,7 @@ function useUsers() {
       setIsLoading(true);
       setError(null);
       try {
-        await service.createUser(user);
+        await service.create(user);
         await fetchUsers();
         return { success: true };
       } catch (err) {
@@ -926,7 +758,7 @@ function useUsers() {
       setIsLoading(true);
       setError(null);
       try {
-        await service.updateUser(id, user);
+        await service.update(id, user);
         await fetchUsers();
         return { success: true };
       } catch (err) {
@@ -943,7 +775,7 @@ function useUsers() {
       setIsLoading(true);
       setError(null);
       try {
-        await service.deleteUser(id);
+        await service.delete(id);
         await fetchUsers();
         return { success: true };
       } catch (err) {
@@ -1122,11 +954,15 @@ function RolesComponent({
     const roleData = {
       name: formState.name.trim(),
       isDefault: formState.isDefault,
-      isPublic: formState.isPublic
+      isPublic: formState.isPublic,
+      extraProperties: {}
     };
     let result;
     if (selectedRole?.id) {
-      result = await updateRole(selectedRole.id, roleData);
+      result = await updateRole(selectedRole.id, {
+        ...roleData,
+        concurrencyStamp: selectedRole.concurrencyStamp
+      });
       if (result.success) {
         onRoleUpdated?.({ ...selectedRole, ...roleData });
       }
@@ -1286,7 +1122,6 @@ var DEFAULT_FORM_STATE2 = {
   phoneNumber: "",
   password: "",
   lockoutEnabled: true,
-  twoFactorEnabled: true,
   roleNames: []
 };
 function getPasswordRuleLabel(rule, t) {
@@ -1351,7 +1186,7 @@ function UsersComponent({
   useEffect2(() => {
     const newQuery = {
       ...pageQuery,
-      filter: debouncedSearchTerm || void 0,
+      filter: debouncedSearchTerm || "",
       skipCount: 0
     };
     setPageQuery(newQuery);
@@ -1382,7 +1217,6 @@ function UsersComponent({
         phoneNumber: selectedUser.phoneNumber || "",
         password: "",
         lockoutEnabled: selectedUser.lockoutEnabled ?? true,
-        twoFactorEnabled: selectedUser.twoFactorEnabled ?? true,
         roleNames: selectedRoleNames
       });
     }
@@ -1418,12 +1252,15 @@ function UsersComponent({
       phoneNumber: formState.phoneNumber.trim(),
       password: formState.password,
       lockoutEnabled: formState.lockoutEnabled,
-      twoFactorEnabled: formState.twoFactorEnabled,
-      roleNames: formState.roleNames
+      roleNames: formState.roleNames,
+      extraProperties: {}
     };
     let result;
     if (selectedUser?.id) {
-      result = await updateUser(selectedUser.id, userData);
+      result = await updateUser(selectedUser.id, {
+        ...userData,
+        concurrencyStamp: selectedUser.concurrencyStamp
+      });
       if (result.success) {
         onUserUpdated?.({
           ...selectedUser,
@@ -1436,10 +1273,8 @@ function UsersComponent({
         onUserCreated?.({
           ...userData,
           id: "",
-          tenantId: "",
           emailConfirmed: false,
           phoneNumberConfirmed: false,
-          isLockedOut: false,
           concurrencyStamp: ""
         });
       }
@@ -1649,14 +1484,6 @@ function UsersComponent({
                 onChange: (e) => handleInputChange("lockoutEnabled", e.target.checked),
                 children: t("AbpIdentity::DisplayName:LockoutEnabled")
               }
-            ),
-            /* @__PURE__ */ jsx2(
-              Checkbox2,
-              {
-                checked: formState.twoFactorEnabled,
-                onChange: (e) => handleInputChange("twoFactorEnabled", e.target.checked),
-                children: t("AbpIdentity::DisplayName:TwoFactorEnabled")
-              }
             )
           ] }) }),
           /* @__PURE__ */ jsx2(Tabs.Content, { value: "roles", children: /* @__PURE__ */ jsxs2(VStack2, { gap: 2, align: "stretch", pt: 4, children: [
@@ -1722,7 +1549,6 @@ export {
   IDENTITY_ROUTE_PATHS,
   IDENTITY_ROUTE_PROVIDERS,
   IdentityRoleService,
-  IdentityService,
   IdentityStateService,
   IdentityUserLookupService,
   IdentityUserService,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abpjs/identity",
-  "version": "3.2.0",
+  "version": "4.0.0",
   "description": "ABP Framework identity components for React - translated from @abp/ng.identity",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -25,12 +25,12 @@
   "dependencies": {
     "@chakra-ui/react": "^3.2.0",
     "@emotion/react": "^11.11.0",
-    "@abpjs/core": "3.2.0",
-    "@abpjs/permission-management": "3.2.0",
-    "@abpjs/theme-shared": "3.2.0"
+    "@abpjs/core": "4.0.0",
+    "@abpjs/theme-shared": "4.0.0",
+    "@abpjs/permission-management": "4.0.0"
   },
   "devDependencies": {
-    "@abp/ng.identity": "3.2.0",
+    "@abp/ng.identity": "4.0.0",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.6.1",