Skip to content

Commit cfc4e0a

Browse files
mhmtyasrmhmtyasr
committed
Services bug fixed
1 parent 43c198f commit cfc4e0a

File tree

8 files changed

+80
-65
lines changed

8 files changed

+80
-65
lines changed

‎reactjs/src/lib/abp.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
declare namespace abp {
1+
export namespace abp {
22
let appPath: string;
33

44
let pageLoadTime: Date;

‎reactjs/src/services/account/accountService.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ class AccountService {
1313
isTenantAvaibleInput,
1414
);
1515
console.log(result);
16-
return result;
16+
return result.data;
1717
}
1818
public async register(registerInput: RegisterInput): Promise<RegisterOutput> {
1919
var result = await http.post(
2020
'services/app/Account/Register',
21-
registerInput,
21+
registerInput
2222
);
2323
console.log(result);
24-
return result;
24+
return result.data;
2525
}
2626
}
2727

‎reactjs/src/services/httpService.ts

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,24 @@ const http = axios.create({
66
timeout: 30000
77
});
88

9-
http.interceptors.request.use(
10-
function(config) {
11-
if (!!abp.auth.getToken()) {
12-
config.headers.common["Authorization"] = "Bearer " + abp.auth.getToken();
13-
}
14-
config.headers.common[".AspNetCore.Culture"] = abp.utils.getCookieValue(
15-
"Abp.Localization.CultureName"
16-
);
17-
config.headers.common[
18-
"Abp.TenantId"
19-
] = abp.multiTenancy.getTenantIdCookie();
20-
return config;
21-
},
22-
function(error) {
23-
return Promise.reject(error);
24-
}
25-
);
9+
// http.interceptors.request.use(
10+
// function (config) {
11+
// // if (!!abp.auth.getToken()) {
12+
// // config.headers.common["Authorization"] = "Bearer " + abp.auth.getToken();
13+
// // }
14+
// // config.headers.common[".AspNetCore.Culture"] = abp.utils.getCookieValue(
15+
// // "Abp.Localization.CultureName"
16+
// // );
17+
// // config.headers.common[
18+
// // "Abp.TenantId"
19+
// // ] = abp.multiTenancy.getTenantIdCookie();
20+
// // return config;
21+
// return null;
22+
// },
23+
// function (error) {
24+
// return Promise.reject(error);
25+
// }
26+
// );
2627
// TODO: Below code will be modified when react-toastify is added
2728
// let vm = new Vue({});
2829
http.interceptors.response.use(

‎reactjs/src/services/role/roleService.ts

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,61 +5,64 @@ import { UpdateRoleInput } from './dto/updateRoleInput';
55
import { UpdateRoleOutput } from './dto/updateRoleOutput';
66
import { EntityDto } from '../../model/entityDto';
77
import http from '../httpService';
8+
import { urlCreator } from '../servicesUrlCreator';
89

910
class RoleService {
1011
public async create(
1112
createRoleInput: CreateRoleInput,
1213
): Promise<CreateRoleOutput> {
13-
var result = await http.post('services/app/Role/Create', createRoleInput);
14+
var result = await http.post('services/app/Role/Create' + createRoleInput);
1415
console.log(result);
15-
return result;
16+
return result.data;
1617
}
1718
public async getRolesAsync(
1819
getRoleAsyncInput: GetRoleAsyncInput,
1920
): Promise<GetRoleAsyncOutput> {
2021
var result = await http.get(
21-
'services/app/Role/GetRolesAsync',
22-
getRoleAsyncInput,
22+
'services/app/Role/GetRolesAsync' + getRoleAsyncInput,
2323
);
2424
console.log(result);
25-
return result;
25+
return result.data;
2626
}
2727
public async update(
2828
updateRoleInput: UpdateRoleInput,
2929
): Promise<UpdateRoleOutput> {
3030
var result = await http.put('services/app/Role/Update', updateRoleInput);
3131
console.log(result);
32-
return result;
32+
return result.data;
3333
}
3434
public async Delete(entityDto: EntityDto) {
35-
var result = await http.delete('services/app/Role/Delete', entityDto);
35+
var result = await http.delete(
36+
urlCreator('services/app/Role/Delete', entityDto),
37+
);
3638
console.log(result);
37-
return result;
39+
return result.data;
3840
}
3941
public async getAllPermissions() {
4042
var result = await http.get('services/app/Role/GetAllPermissions');
4143
console.log(result);
42-
return result;
44+
return result.data;
4345
}
4446
public async getRoleForEdit(entityDto: EntityDto) {
45-
var result = await http.get('services/app/Role/GetRoleForEdit', entityDto);
47+
var result = await http.get(
48+
urlCreator('services/app/Role/GetRoleForEdit', entityDto),
49+
);
4650
console.log(result);
47-
return result;
51+
return result.data;
4852
}
4953
public async get(entityDto: EntityDto) {
50-
var result = await http.get('services/app/Role/Get', entityDto);
54+
var result = await http.get(urlCreator('services/app/Role/Get', entityDto));
5155
console.log(result);
52-
return result;
56+
return result.data;
5357
}
5458
public async getAll(
5559
pagedFilterAndSortedRequest: PagedFilterAndSortedRequest,
5660
) {
5761
var result = await http.get(
58-
'services/app/Role/GetAll',
59-
pagedFilterAndSortedRequest,
62+
urlCreator('services/app/Role/GetAll', pagedFilterAndSortedRequest),
6063
);
6164
console.log(result);
62-
return result;
65+
return result.data;
6366
}
6467
}
6568

‎reactjs/src/services/servicesUrlCreator.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export function urlCreator(url: string, parameters: any) {
2+
return url + parameters;
3+
}

‎reactjs/src/services/tenant/tenantService.ts

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import UpdateTenantOutput from './dto/updateTenantOutput';
66
import { EntityDto } from 'src/model/entityDto';
77
import { PagedResultDto } from 'src/model/pagedResultDto';
88
import http from '../httpService';
9+
import { urlCreator } from '../servicesUrlCreator';
910

1011
class TenantService {
1112
public async create(
@@ -16,38 +17,38 @@ class TenantService {
1617
createTenantInput,
1718
);
1819
console.log(result);
19-
return result;
20+
return result.data;
2021
}
2122
public async delete(entityDto: EntityDto) {
22-
var result = await http.delete('services/app/Tenant/Delete', entityDto);
23+
var result = await http.delete(
24+
urlCreator('services/app/Tenant/Delete', entityDto)
25+
);
2326
console.log(result);
24-
return result;
27+
return result.data;
2528
}
2629
public async get(entityDto: EntityDto): Promise<GetTenantOutput> {
27-
var result = await http.get('services/app/Tenant/Get', entityDto);
30+
var result = await http.get(
31+
urlCreator('services/app/Tenant/Get', entityDto)
32+
);
2833
console.log(result);
29-
return result;
34+
return result.data;
3035
}
3136
public async getAll(
3237
pagedFilterAndSortedRequest: PagedFilterAndSortedRequest,
3338
): Promise<PagedResultDto<GetAllTenantOutput>> {
34-
var result = await http.get(
35-
'services/app/Tenant/GetAll',
36-
pagedFilterAndSortedRequest,
37-
);
39+
var result = await http.get(urlCreator('services/app/Tenant/GetAll', pagedFilterAndSortedRequest));
3840
console.log(result);
39-
return result;
41+
return result.data;
4042
}
4143

4244
public async update(
4345
updateTenantInput: UpdateTenantInput,
4446
): Promise<UpdateTenantOutput> {
4547
var result = await http.get(
46-
'services/app/Tenant/Update',
47-
updateTenantInput,
48+
urlCreator('services/app/Tenant/Update', updateTenantInput)
4849
);
4950
console.log(result);
50-
return result;
51+
return result.data;
5152
}
5253
}
5354

‎reactjs/src/services/tokenAuth/tokenAuthService.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
import { AuthenticationInput } from './dto/authenticationInput';
22
import { AuthenticationOutput } from './dto/authenticationOutput';
33
import http from '../httpService';
4+
import { urlCreator } from '../servicesUrlCreator';
45

56
class TokenAuth {
67
public async authenticate(
78
authenticationInput: AuthenticationInput,
89
): Promise<AuthenticationOutput> {
9-
var result = await http.get('TokenAuth/Authenticate', authenticationInput);
10+
var result = await http.get(
11+
urlCreator('TokenAuth/Authenticate', authenticationInput),
12+
);
1013
console.log(result);
11-
return result;
14+
return result.data;
1215
}
1316
}
1417

‎reactjs/src/services/user/userService.ts

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,51 +4,55 @@ import { ChangeLanguagaInput } from './dto/changeLanguageInput';
44
import { GetUserOutput } from './dto/getUserOutput';
55
import { EntityDto } from '../../model/entityDto';
66
import http from '../httpService';
7+
import { urlCreator } from '../servicesUrlCreator';
8+
import { GetAllUserOutput } from './dto/getAllUserOutput';
9+
import { PagedResultDto } from 'src/model/pagedResultDto';
710

811
class UserService {
912
public async create(createUserInput: CreateUserInput) {
1013
var result = await http.post('services/app/User/Create', createUserInput);
1114
console.log(result);
12-
return result;
15+
return result.data;
1316
}
1417
public async update(updateUserInput: UpdateUserInput) {
1518
var result = await http.put('services/app/User/Update', updateUserInput);
1619
console.log(result);
17-
return result;
20+
return result.data;
1821
}
1922
public async delete(entityDto: EntityDto) {
20-
var result = await http.delete('services/app/User/Delete', entityDto);
23+
var result = await http.delete(
24+
urlCreator('services/app/User/Delete', entityDto),
25+
);
2126
console.log(result);
22-
return result;
27+
return result.data;
2328
}
2429
public async getRoles() {
2530
var result = await http.get('services/app/User/GetRoles');
2631
console.log(result);
27-
return result;
32+
return result.data;
2833
}
2934
public async changeLanguage(changeLanguageInput: ChangeLanguagaInput) {
3035
var result = await http.post(
3136
'services/app/User/ChangeLanguage',
3237
changeLanguageInput,
3338
);
3439
console.log(result);
35-
return result;
40+
return result.data;
3641
}
3742
public async get(entityDto: EntityDto): Promise<GetUserOutput> {
38-
var result = await http.get('services/app/User/Get', entityDto);
43+
var result = await http.get(urlCreator('services/app/User/Get', entityDto));
3944
console.log(result);
40-
return result;
45+
return result.data;
4146
}
4247

4348
public async GetAll(
44-
pagedFilterAndSortedRequest: PagedFilterAndSortedRequest, //: Promise<PagedResultDto<GetAllUserOutput>>
45-
) {
49+
pagedFilterAndSortedRequest: PagedFilterAndSortedRequest
50+
): Promise<PagedResultDto<GetAllUserOutput>> {
4651
var result = await http.get(
47-
'services/app/User/GetAll',
48-
pagedFilterAndSortedRequest,
52+
urlCreator('services/app/User/GetAll', pagedFilterAndSortedRequest)
4953
);
5054
console.log(result);
51-
return result;
55+
return result.data;
5256
}
5357
}
5458

0 commit comments

Comments
 (0)