Browse Source

refactor: api urls & fix redirect url

pull/1562/head
mehmet-erim 7 years ago
parent
commit
3ec673ddb3
  1. 4
      npm/ng-packs/packages/account/src/lib/components/login/login.component.ts
  2. 6
      npm/ng-packs/packages/core/src/lib/services/profile.service.ts
  3. 20
      npm/ng-packs/packages/identity/src/lib/services/identity.service.ts
  4. 14
      npm/ng-packs/packages/tenant-management/src/lib/services/tenant-management.service.ts

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

@ -49,8 +49,8 @@ export class LoginComponent {
.pipe( .pipe(
switchMap(() => this.store.dispatch(new ConfigGetAppConfiguration())), switchMap(() => this.store.dispatch(new ConfigGetAppConfiguration())),
tap(() => { tap(() => {
const redirectUrl = (window.history.state || {}).redirectUrl || (this.options || {}).redirectUrl; const redirectUrl = snq(() => window.history.state).redirectUrl || (this.options || {}).redirectUrl || '/';
this.store.dispatch(new Navigate([redirectUrl || '/'])); this.store.dispatch(new Navigate([redirectUrl]));
}), }),
catchError(err => { catchError(err => {
this.toasterService.error(snq(() => err.error.error_description, 'An error occured.'), 'Error'); this.toasterService.error(snq(() => err.error.error_description, 'An error occured.'), 'Error');

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

@ -12,7 +12,7 @@ export class ProfileService {
get(): Observable<Profile.Response> { get(): Observable<Profile.Response> {
const request: Rest.Request<null> = { const request: Rest.Request<null> = {
method: 'GET', method: 'GET',
url: '/api/identity/profile', url: '/api/identity/my-profile',
}; };
return this.rest.request<null, Profile.Response>(request); return this.rest.request<null, Profile.Response>(request);
@ -21,7 +21,7 @@ export class ProfileService {
update(body: Profile.Response): Observable<Profile.Response> { update(body: Profile.Response): Observable<Profile.Response> {
const request: Rest.Request<Profile.Response> = { const request: Rest.Request<Profile.Response> = {
method: 'PUT', method: 'PUT',
url: '/api/identity/profile', url: '/api/identity/my-profile',
body, body,
}; };
@ -31,7 +31,7 @@ export class ProfileService {
changePassword(body: Profile.ChangePasswordRequest): Observable<null> { changePassword(body: Profile.ChangePasswordRequest): Observable<null> {
const request: Rest.Request<Profile.ChangePasswordRequest> = { const request: Rest.Request<Profile.ChangePasswordRequest> = {
method: 'POST', method: 'POST',
url: '/api/identity/profile/changePassword', url: '/api/identity/my-profile/changePassword',
body, body,
}; };

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

@ -12,7 +12,7 @@ export class IdentityService {
getRoles(): Observable<Identity.RoleResponse> { getRoles(): Observable<Identity.RoleResponse> {
const request: Rest.Request<null> = { const request: Rest.Request<null> = {
method: 'GET', method: 'GET',
url: '/api/identity/role', url: '/api/identity/roles',
}; };
return this.rest.request<null, Identity.RoleResponse>(request); return this.rest.request<null, Identity.RoleResponse>(request);
@ -21,7 +21,7 @@ export class IdentityService {
getRoleById(id: string): Observable<Identity.RoleItem> { getRoleById(id: string): Observable<Identity.RoleItem> {
const request: Rest.Request<null> = { const request: Rest.Request<null> = {
method: 'GET', method: 'GET',
url: `/api/identity/role/${id}`, url: `/api/identity/roles/${id}`,
}; };
return this.rest.request<null, Identity.RoleItem>(request); return this.rest.request<null, Identity.RoleItem>(request);
@ -30,7 +30,7 @@ export class IdentityService {
deleteRole(id: string): Observable<Identity.RoleItem> { deleteRole(id: string): Observable<Identity.RoleItem> {
const request: Rest.Request<null> = { const request: Rest.Request<null> = {
method: 'DELETE', method: 'DELETE',
url: `/api/identity/role/${id}`, url: `/api/identity/roles/${id}`,
}; };
return this.rest.request<null, Identity.RoleItem>(request); return this.rest.request<null, Identity.RoleItem>(request);
@ -39,7 +39,7 @@ export class IdentityService {
addRole(body: Identity.RoleSaveRequest): Observable<Identity.RoleItem> { addRole(body: Identity.RoleSaveRequest): Observable<Identity.RoleItem> {
const request: Rest.Request<Identity.RoleSaveRequest> = { const request: Rest.Request<Identity.RoleSaveRequest> = {
method: 'POST', method: 'POST',
url: '/api/identity/role', url: '/api/identity/roles',
body, body,
}; };
@ -47,7 +47,7 @@ export class IdentityService {
} }
updateRole(body: Identity.RoleItem): Observable<Identity.RoleItem> { updateRole(body: Identity.RoleItem): Observable<Identity.RoleItem> {
const url = `/api/identity/role/${body.id}`; const url = `/api/identity/roles/${body.id}`;
delete body.id; delete body.id;
const request: Rest.Request<Identity.RoleItem> = { const request: Rest.Request<Identity.RoleItem> = {
@ -62,7 +62,7 @@ export class IdentityService {
getUsers(params = {} as ABP.PageQueryParams): Observable<Identity.UserResponse> { getUsers(params = {} as ABP.PageQueryParams): Observable<Identity.UserResponse> {
const request: Rest.Request<null> = { const request: Rest.Request<null> = {
method: 'GET', method: 'GET',
url: '/api/identity/user', url: '/api/identity/users',
params, params,
}; };
@ -72,7 +72,7 @@ export class IdentityService {
getUserById(id: string): Observable<Identity.UserItem> { getUserById(id: string): Observable<Identity.UserItem> {
const request: Rest.Request<null> = { const request: Rest.Request<null> = {
method: 'GET', method: 'GET',
url: `/api/identity/user/${id}`, url: `/api/identity/users/${id}`,
}; };
return this.rest.request<null, Identity.UserItem>(request); return this.rest.request<null, Identity.UserItem>(request);
@ -81,7 +81,7 @@ export class IdentityService {
getUserRoles(id: string): Observable<Identity.RoleResponse> { getUserRoles(id: string): Observable<Identity.RoleResponse> {
const request: Rest.Request<null> = { const request: Rest.Request<null> = {
method: 'GET', method: 'GET',
url: `/api/identity/user/${id}/roles`, url: `/api/identity/users/${id}/roles`,
}; };
return this.rest.request<null, Identity.RoleResponse>(request); return this.rest.request<null, Identity.RoleResponse>(request);
@ -90,7 +90,7 @@ export class IdentityService {
deleteUser(id: string): Observable<null> { deleteUser(id: string): Observable<null> {
const request: Rest.Request<null> = { const request: Rest.Request<null> = {
method: 'DELETE', method: 'DELETE',
url: `/api/identity/user/${id}`, url: `/api/identity/users/${id}`,
}; };
return this.rest.request<null, null>(request); return this.rest.request<null, null>(request);
@ -99,7 +99,7 @@ export class IdentityService {
addUser(body: Identity.UserSaveRequest): Observable<Identity.UserItem> { addUser(body: Identity.UserSaveRequest): Observable<Identity.UserItem> {
const request: Rest.Request<Identity.UserSaveRequest> = { const request: Rest.Request<Identity.UserSaveRequest> = {
method: 'POST', method: 'POST',
url: '/api/identity/user', url: '/api/identity/users',
body, body,
}; };

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

@ -12,7 +12,7 @@ export class TenantManagementService {
get(): Observable<TenantManagement.Response> { get(): Observable<TenantManagement.Response> {
const request: Rest.Request<null> = { const request: Rest.Request<null> = {
method: 'GET', method: 'GET',
url: '/api/multi-tenancy/tenant', url: '/api/multi-tenancy/tenants',
}; };
return this.rest.request<null, TenantManagement.Response>(request); return this.rest.request<null, TenantManagement.Response>(request);
@ -21,7 +21,7 @@ export class TenantManagementService {
getById(id: string): Observable<ABP.BasicItem> { getById(id: string): Observable<ABP.BasicItem> {
const request: Rest.Request<null> = { const request: Rest.Request<null> = {
method: 'GET', method: 'GET',
url: `/api/multi-tenancy/tenant/${id}`, url: `/api/multi-tenancy/tenants/${id}`,
}; };
return this.rest.request<null, ABP.BasicItem>(request); return this.rest.request<null, ABP.BasicItem>(request);
@ -30,7 +30,7 @@ export class TenantManagementService {
delete(id: string): Observable<null> { delete(id: string): Observable<null> {
const request: Rest.Request<null> = { const request: Rest.Request<null> = {
method: 'DELETE', method: 'DELETE',
url: `/api/multi-tenancy/tenant/${id}`, url: `/api/multi-tenancy/tenants/${id}`,
}; };
return this.rest.request<null, null>(request); return this.rest.request<null, null>(request);
@ -39,7 +39,7 @@ export class TenantManagementService {
add(body: TenantManagement.AddRequest): Observable<ABP.BasicItem> { add(body: TenantManagement.AddRequest): Observable<ABP.BasicItem> {
const request: Rest.Request<TenantManagement.AddRequest> = { const request: Rest.Request<TenantManagement.AddRequest> = {
method: 'POST', method: 'POST',
url: `/api/multi-tenancy/tenant`, url: `/api/multi-tenancy/tenants`,
body, body,
}; };
@ -47,7 +47,7 @@ export class TenantManagementService {
} }
update(body: TenantManagement.UpdateRequest): Observable<ABP.BasicItem> { update(body: TenantManagement.UpdateRequest): Observable<ABP.BasicItem> {
const url = `/api/multi-tenancy/tenant/${body.id}`; const url = `/api/multi-tenancy/tenants/${body.id}`;
delete body.id; delete body.id;
const request: Rest.Request<TenantManagement.UpdateRequest> = { const request: Rest.Request<TenantManagement.UpdateRequest> = {
@ -60,7 +60,7 @@ export class TenantManagementService {
} }
getDefaultConnectionString(id: string): Observable<string> { getDefaultConnectionString(id: string): Observable<string> {
const url = `/api/multi-tenancy/tenant/${id}/defaultConnectionString`; const url = `/api/multi-tenancy/tenants/${id}/defaultConnectionString`;
const request: Rest.Request<TenantManagement.DefaultConnectionStringRequest> = { const request: Rest.Request<TenantManagement.DefaultConnectionStringRequest> = {
method: 'GET', method: 'GET',
@ -71,7 +71,7 @@ export class TenantManagementService {
} }
updateDefaultConnectionString(payload: TenantManagement.DefaultConnectionStringRequest): Observable<any> { updateDefaultConnectionString(payload: TenantManagement.DefaultConnectionStringRequest): Observable<any> {
const url = `/api/multi-tenancy/tenant/${payload.id}/defaultConnectionString`; const url = `/api/multi-tenancy/tenants/${payload.id}/defaultConnectionString`;
const request: Rest.Request<TenantManagement.DefaultConnectionStringRequest> = { const request: Rest.Request<TenantManagement.DefaultConnectionStringRequest> = {
method: 'PUT', method: 'PUT',

Loading…
Cancel
Save