Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.whiskels.notifier.infrastructure.config.feign;

import feign.RequestInterceptor;
import org.springframework.context.annotation.Bean;
import org.springframework.core.env.Environment;
import org.springframework.http.HttpHeaders;

import java.util.Base64;


public class FeignCrmConfig {
private static final String USER_ENV_VAR = "API_USER_NAME";
private static final String PASSWORD_ENV_VAR = "API_USER_PASSWORD";

@Bean
public RequestInterceptor requestInterceptor(final Environment environment) {
String auth = STR."\{environment.getProperty(USER_ENV_VAR)}:\{environment.getProperty(PASSWORD_ENV_VAR)}";
return requestTemplate -> requestTemplate.header(HttpHeaders.AUTHORIZATION, STR."Basic \{Base64.getEncoder().encodeToString(auth.getBytes())}");
}

}

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.whiskels.notifier.reporting.service.customer.debt.fetch;

import com.whiskels.notifier.infrastructure.config.feign.FeignProxyConfig;
import com.whiskels.notifier.infrastructure.config.feign.FeignCrmConfig;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestMapping;
Expand All @@ -10,7 +10,7 @@


@ConditionalOnProperty(DEBT_URL)
@FeignClient(name = "debtClient", url = "${" + DEBT_URL + "}", configuration = FeignProxyConfig.class)
@FeignClient(name = "debtClient", url = "${" + DEBT_URL + "}", configuration = FeignCrmConfig.class)
public interface CustomerDebtFeignClient {
String DEBT_URL = "report.parameters.customer-debt.url";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.whiskels.notifier.reporting.service.customer.payment.fetch;

import com.whiskels.notifier.infrastructure.config.feign.FeignProxyConfig;
import com.whiskels.notifier.infrastructure.config.feign.FeignCrmConfig;
import com.whiskels.notifier.reporting.service.customer.payment.domain.FinancialOperation;
import feign.RequestInterceptor;
import org.springframework.beans.factory.annotation.Value;
Expand Down Expand Up @@ -30,7 +30,7 @@ public interface FinOperationFeignClient {
@RequestMapping(method = GET)
List<FinancialOperation> get();

@Import(FeignProxyConfig.class)
@Import(FeignCrmConfig.class)
class FinOperationRequestInterceptorConfig {
private static final DateTimeFormatter YEAR_MONTH_DAY_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.whiskels.notifier.reporting.service.employee.fetch;

import com.whiskels.notifier.infrastructure.config.feign.FeignProxyConfig;
import com.whiskels.notifier.infrastructure.config.feign.FeignCrmConfig;
import com.whiskels.notifier.reporting.service.employee.domain.Employee;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.cloud.openfeign.FeignClient;
Expand All @@ -13,7 +13,7 @@


@ConditionalOnProperty(EMPLOYEE_URL)
@FeignClient(name = "employeeClient", url = "${" + EMPLOYEE_URL + "}", configuration = FeignProxyConfig.class)
@FeignClient(name = "employeeClient", url = "${" + EMPLOYEE_URL + "}", configuration = FeignCrmConfig.class)
public interface EmployeeFeignClient {

@RequestMapping(method = GET)
Expand Down

This file was deleted.

Loading