admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup default values and leftover methods in environmentService (#4550)

Browse Source 
* Cleanup default values and leftover methods in environmentService

* Adress remainings configService calls
This commit is contained in:
Félix Malfait
2024-03-18 17:09:39 +01:00
committed by GitHub
parent 1cc8bdd3e9
commit bdbd77c696
15 changed files with 110 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/twenty-server/src/engine/api/rest/api-rest.service.ts
View File

@ -8,6 +8,7 @@ import { ApiRestQueryBuilderFactory } from 'src/engine/api/rest/api-rest-query-b
import { TokenService } from 'src/engine/modules/auth/services/token.service';
import { ApiRestResponse } from 'src/engine/api/rest/types/api-rest-response.type';
import { ApiRestQuery } from 'src/engine/api/rest/types/api-rest-query.type';
import { getServerUrl } from 'src/utils/get-server-url';
@Injectable()
export class ApiRestService {
@ -22,7 +23,10 @@ export class ApiRestService {
request: Request,
data: ApiRestQuery,
): Promise<ApiRestResponse> {
const baseUrl = this.environmentService.getBaseUrl(request);
const baseUrl = getServerUrl(
request,
this.environmentService.get('SERVER_URL'),
);
try {
return await this.httpService.axiosRef.post(`${baseUrl}/graphql`, data, {

6
packages/twenty-server/src/engine/api/rest/metadata-rest.service.ts
View File

@ -7,6 +7,7 @@ import { ApiRestQuery } from 'src/engine/api/rest/types/api-rest-query.type';
import { TokenService } from 'src/engine/modules/auth/services/token.service';
import { parseMetadataPath } from 'src/engine/api/rest/api-rest-query-builder/utils/parse-path.utils';
import { capitalize } from 'src/utils/capitalize';
import { getServerUrl } from 'src/utils/get-server-url';
@Injectable()
export class ApiRestMetadataService {
@ -18,7 +19,10 @@ export class ApiRestMetadataService {
) {}
async callMetadata(request, data: ApiRestQuery) {
const baseUrl = this.environmentService.getBaseUrl(request);
const baseUrl = getServerUrl(
request,
this.environmentService.get('SERVER_URL'),
);
try {
return await this.httpService.axiosRef.post(`${baseUrl}/metadata`, data, {