Merge pull request #3369 from abpframework/feat/api-names

Added apiName variables to services that makes HTTP calls to backend

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

@@ -7,6 +7,8 @@ import { RegisterResponse, RegisterRequest, TenantIdResponse } from '../models';
   providedIn: 'root',
 })
 export class AccountService {
+  apiName = 'AbpAccount';
+
   constructor(private rest: RestService) {}
 
   findTenant(tenantName: string): Observable<TenantIdResponse> {
@@ -15,7 +17,7 @@ export class AccountService {
       url: `/api/abp/multi-tenancy/tenants/by-name/${tenantName}`,
     };
 
-    return this.rest.request<null, TenantIdResponse>(request);
+    return this.rest.request<null, TenantIdResponse>(request, { apiName: this.apiName });
   }
 
   register(body: RegisterRequest): Observable<RegisterResponse> {
@@ -25,6 +27,9 @@ export class AccountService {
       body,
     };
 
-    return this.rest.request<RegisterRequest, RegisterResponse>(request, { skipHandleError: true });
+    return this.rest.request<RegisterRequest, RegisterResponse>(request, {
+      skipHandleError: true,
+      apiName: this.apiName,
+    });
   }
 }

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

@@ -3,12 +3,18 @@ import { Observable } from 'rxjs';
 import { Rest } from '../models/rest';
 import { ApplicationConfiguration } from '../models/application-configuration';
 import { RestService } from './rest.service';
+import { Store } from '@ngxs/store';
+import { ConfigState } from '../states/config.state';
 
 @Injectable({
   providedIn: 'root',
 })
 export class ApplicationConfigurationService {
-  constructor(private rest: RestService) {}
+  get apiName(): string {
+    return this.store.selectSnapshot(ConfigState.getDeep('environment.application.name'));
+  }
+
+  constructor(private rest: RestService, private store: Store) {}
 
   getConfiguration(): Observable<ApplicationConfiguration.Response> {
     const request: Rest.Request<null> = {
@@ -16,6 +22,8 @@ export class ApplicationConfigurationService {
       url: '/api/abp/application-configuration',
     };
 
-    return this.rest.request<null, ApplicationConfiguration.Response>(request);
+    return this.rest.request<null, ApplicationConfiguration.Response>(request, {
+      apiName: this.apiName,
+    });
   }
 }

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

@@ -7,6 +7,8 @@ import { Profile, Rest } from '../models';
   providedIn: 'root',
 })
 export class ProfileService {
+  apiName = 'AbpIdentity';
+
   constructor(private rest: RestService) {}
 
   get(): Observable<Profile.Response> {
@@ -15,7 +17,7 @@ export class ProfileService {
       url: '/api/identity/my-profile',
     };
 
-    return this.rest.request<null, Profile.Response>(request);
+    return this.rest.request<null, Profile.Response>(request, { apiName: this.apiName });
   }
 
   update(body: Profile.Response): Observable<Profile.Response> {
@@ -25,16 +27,24 @@ export class ProfileService {
       body,
     };
 
-    return this.rest.request<Profile.Response, Profile.Response>(request);
+    return this.rest.request<Profile.Response, Profile.Response>(request, {
+      apiName: this.apiName,
+    });
   }
 
-  changePassword(body: Profile.ChangePasswordRequest, skipHandleError: boolean = false): Observable<null> {
+  changePassword(
+    body: Profile.ChangePasswordRequest,
+    skipHandleError: boolean = false,
+  ): Observable<null> {
     const request: Rest.Request<Profile.ChangePasswordRequest> = {
       method: 'POST',
       url: '/api/identity/my-profile/change-password',
       body,
     };
 
-    return this.rest.request<Profile.ChangePasswordRequest, null>(request, { skipHandleError });
+    return this.rest.request<Profile.ChangePasswordRequest, null>(request, {
+      skipHandleError,
+      apiName: this.apiName,
+    });
   }
 }

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

@@ -81,7 +81,7 @@ export class ConfigState {
 
   static getApiUrl(key?: string) {
     const selector = createSelector([ConfigState], (state: Config.State): string => {
-      return state.environment.apis[key || 'default'].url;
+      return (state.environment.apis[key || 'default'] || state.environment.apis.default).url;
     });
 
     return selector;

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

@@ -8,6 +8,8 @@ import { FeatureManagement } from '../models';
   providedIn: 'root',
 })
 export class FeatureManagementService {
+  apiName = 'FeatureManagement';
+
   constructor(private rest: RestService, private store: Store) {}
 
   getFeatures(params: FeatureManagement.Provider): Observable<FeatureManagement.Features> {
@@ -16,7 +18,9 @@ export class FeatureManagementService {
       url: '/api/abp/features',
       params,
     };
-    return this.rest.request<FeatureManagement.Provider, FeatureManagement.Features>(request);
+    return this.rest.request<FeatureManagement.Provider, FeatureManagement.Features>(request, {
+      apiName: this.apiName,
+    });
   }
 
   updateFeatures({
@@ -30,6 +34,6 @@ export class FeatureManagementService {
       body: { features },
       params: { providerKey, providerName },
     };
-    return this.rest.request<FeatureManagement.Features, null>(request);
+    return this.rest.request<FeatureManagement.Features, null>(request, { apiName: this.apiName });
   }
 }

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

@@ -7,6 +7,8 @@ import { Identity } from '../models/identity';
   providedIn: 'root',
 })
 export class IdentityService {
+  apiName = 'AbpIdentity';
+
   constructor(private rest: RestService) {}
 
   getRoles(params = {} as ABP.PageQueryParams): Observable<Identity.RoleResponse> {
@@ -16,7 +18,7 @@ export class IdentityService {
       params,
     };
 
-    return this.rest.request<null, Identity.RoleResponse>(request);
+    return this.rest.request<null, Identity.RoleResponse>(request, { apiName: this.apiName });
   }
 
   getAllRoles(): Observable<Identity.RoleResponse> {
@@ -25,7 +27,7 @@ export class IdentityService {
       url: '/api/identity/roles/all',
     };
 
-    return this.rest.request<null, Identity.RoleResponse>(request);
+    return this.rest.request<null, Identity.RoleResponse>(request, { apiName: this.apiName });
   }
 
   getRoleById(id: string): Observable<Identity.RoleItem> {
@@ -34,7 +36,7 @@ export class IdentityService {
       url: `/api/identity/roles/${id}`,
     };
 
-    return this.rest.request<null, Identity.RoleItem>(request);
+    return this.rest.request<null, Identity.RoleItem>(request, { apiName: this.apiName });
   }
 
   deleteRole(id: string): Observable<Identity.RoleItem> {
@@ -43,7 +45,7 @@ export class IdentityService {
       url: `/api/identity/roles/${id}`,
     };
 
-    return this.rest.request<null, Identity.RoleItem>(request);
+    return this.rest.request<null, Identity.RoleItem>(request, { apiName: this.apiName });
   }
 
   createRole(body: Identity.RoleSaveRequest): Observable<Identity.RoleItem> {
@@ -53,7 +55,9 @@ export class IdentityService {
       body,
     };
 
-    return this.rest.request<Identity.RoleSaveRequest, Identity.RoleItem>(request);
+    return this.rest.request<Identity.RoleSaveRequest, Identity.RoleItem>(request, {
+      apiName: this.apiName,
+    });
   }
 
   updateRole(body: Identity.RoleItem): Observable<Identity.RoleItem> {
@@ -66,7 +70,9 @@ export class IdentityService {
       body,
     };
 
-    return this.rest.request<Identity.RoleItem, Identity.RoleItem>(request);
+    return this.rest.request<Identity.RoleItem, Identity.RoleItem>(request, {
+      apiName: this.apiName,
+    });
   }
 
   getUsers(params = {} as ABP.PageQueryParams): Observable<Identity.UserResponse> {
@@ -76,7 +82,7 @@ export class IdentityService {
       params,
     };
 
-    return this.rest.request<null, Identity.UserResponse>(request);
+    return this.rest.request<null, Identity.UserResponse>(request, { apiName: this.apiName });
   }
 
   getUserById(id: string): Observable<Identity.UserItem> {
@@ -85,7 +91,7 @@ export class IdentityService {
       url: `/api/identity/users/${id}`,
     };
 
-    return this.rest.request<null, Identity.UserItem>(request);
+    return this.rest.request<null, Identity.UserItem>(request, { apiName: this.apiName });
   }
 
   getUserRoles(id: string): Observable<Identity.RoleResponse> {
@@ -94,7 +100,7 @@ export class IdentityService {
       url: `/api/identity/users/${id}/roles`,
     };
 
-    return this.rest.request<null, Identity.RoleResponse>(request);
+    return this.rest.request<null, Identity.RoleResponse>(request, { apiName: this.apiName });
   }
 
   deleteUser(id: string): Observable<null> {
@@ -103,7 +109,7 @@ export class IdentityService {
       url: `/api/identity/users/${id}`,
     };
 
-    return this.rest.request<null, null>(request);
+    return this.rest.request<null, null>(request, { apiName: this.apiName });
   }
 
   createUser(body: Identity.UserSaveRequest): Observable<Identity.UserItem> {
@@ -113,7 +119,9 @@ export class IdentityService {
       body,
     };
 
-    return this.rest.request<Identity.UserSaveRequest, Identity.UserItem>(request);
+    return this.rest.request<Identity.UserSaveRequest, Identity.UserItem>(request, {
+      apiName: this.apiName,
+    });
   }
 
   updateUser(body: Identity.UserItem): Observable<Identity.UserItem> {
@@ -126,6 +134,8 @@ export class IdentityService {
       body,
     };
 
-    return this.rest.request<Identity.UserItem, Identity.UserItem>(request);
+    return this.rest.request<Identity.UserItem, Identity.UserItem>(request, {
+      apiName: this.apiName,
+    });
   }
 }

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

@@ -7,16 +7,23 @@ import { PermissionManagement } from '../models/permission-management';
   providedIn: 'root',
 })
 export class PermissionManagementService {
+  apiName = 'AbpPermissionManagement';
+
   constructor(private rest: RestService) {}
 
-  getPermissions(params: PermissionManagement.GrantedProvider): Observable<PermissionManagement.Response> {
+  getPermissions(
+    params: PermissionManagement.GrantedProvider,
+  ): Observable<PermissionManagement.Response> {
     const request: Rest.Request<PermissionManagement.GrantedProvider> = {
       method: 'GET',
       url: '/api/abp/permissions',
       params,
     };
 
-    return this.rest.request<PermissionManagement.GrantedProvider, PermissionManagement.Response>(request);
+    return this.rest.request<PermissionManagement.GrantedProvider, PermissionManagement.Response>(
+      request,
+      { apiName: this.apiName },
+    );
   }
 
   updatePermissions({
@@ -31,6 +38,8 @@ export class PermissionManagementService {
       params: { providerKey, providerName },
     };
 
-    return this.rest.request<PermissionManagement.UpdateRequest, null>(request);
+    return this.rest.request<PermissionManagement.UpdateRequest, null>(request, {
+      apiName: this.apiName,
+    });
   }
 }

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

@@ -7,6 +7,8 @@ import { TenantManagement } from '../models/tenant-management';
   providedIn: 'root',
 })
 export class TenantManagementService {
+  apiName = 'AbpTenantManagement';
+
   constructor(private rest: RestService) {}
 
   getTenant(params = {} as ABP.PageQueryParams): Observable<TenantManagement.Response> {
@@ -16,7 +18,7 @@ export class TenantManagementService {
       params,
     };
 
-    return this.rest.request<null, TenantManagement.Response>(request);
+    return this.rest.request<null, TenantManagement.Response>(request, { apiName: this.apiName });
   }
 
   getTenantById(id: string): Observable<ABP.BasicItem> {
@@ -25,7 +27,7 @@ export class TenantManagementService {
       url: `/api/multi-tenancy/tenants/${id}`,
     };
 
-    return this.rest.request<null, ABP.BasicItem>(request);
+    return this.rest.request<null, ABP.BasicItem>(request, { apiName: this.apiName });
   }
 
   deleteTenant(id: string): Observable<null> {
@@ -34,7 +36,7 @@ export class TenantManagementService {
       url: `/api/multi-tenancy/tenants/${id}`,
     };
 
-    return this.rest.request<null, null>(request);
+    return this.rest.request<null, null>(request, { apiName: this.apiName });
   }
 
   createTenant(body: TenantManagement.AddRequest): Observable<ABP.BasicItem> {
@@ -44,7 +46,9 @@ export class TenantManagementService {
       body,
     };
 
-    return this.rest.request<TenantManagement.AddRequest, ABP.BasicItem>(request);
+    return this.rest.request<TenantManagement.AddRequest, ABP.BasicItem>(request, {
+      apiName: this.apiName,
+    });
   }
 
   updateTenant(body: TenantManagement.UpdateRequest): Observable<ABP.BasicItem> {
@@ -57,7 +61,9 @@ export class TenantManagementService {
       body,
     };
 
-    return this.rest.request<TenantManagement.UpdateRequest, ABP.BasicItem>(request);
+    return this.rest.request<TenantManagement.UpdateRequest, ABP.BasicItem>(request, {
+      apiName: this.apiName,
+    });
   }
 
   getDefaultConnectionString(id: string): Observable<string> {
@@ -68,7 +74,9 @@ export class TenantManagementService {
       responseType: Rest.ResponseType.Text,
       url,
     };
-    return this.rest.request<TenantManagement.DefaultConnectionStringRequest, string>(request);
+    return this.rest.request<TenantManagement.DefaultConnectionStringRequest, string>(request, {
+      apiName: this.apiName,
+    });
   }
 
   updateDefaultConnectionString(
@@ -81,7 +89,9 @@ export class TenantManagementService {
       url,
       params: { defaultConnectionString: payload.defaultConnectionString },
     };
-    return this.rest.request<TenantManagement.DefaultConnectionStringRequest, any>(request);
+    return this.rest.request<TenantManagement.DefaultConnectionStringRequest, any>(request, {
+      apiName: this.apiName,
+    });
   }
 
   deleteDefaultConnectionString(id: string): Observable<string> {
@@ -91,6 +101,8 @@ export class TenantManagementService {
       method: 'DELETE',
       url,
     };
-    return this.rest.request<TenantManagement.DefaultConnectionStringRequest, any>(request);
+    return this.rest.request<TenantManagement.DefaultConnectionStringRequest, any>(request, {
+      apiName: this.apiName,
+    });
   }
 }