ver. 0.269: ShopPaymentMethod refactor + Apilo keepalive
This commit is contained in:
@@ -110,20 +110,83 @@ class IntegrationsRepository
|
||||
return true;
|
||||
}
|
||||
|
||||
public function apiloGetAccessToken(): ?string
|
||||
public function apiloGetAccessToken( int $refreshLeadSeconds = 300 ): ?string
|
||||
{
|
||||
$settings = $this->getSettings( 'apilo' );
|
||||
|
||||
if ( empty( $settings['access-token-expire-at'] ) || empty( $settings['access-token'] ) )
|
||||
$hasRefreshCredentials = !empty( $settings['refresh-token'] )
|
||||
&& !empty( $settings['client-id'] )
|
||||
&& !empty( $settings['client-secret'] );
|
||||
|
||||
$accessToken = trim( (string)($settings['access-token'] ?? '') );
|
||||
$accessTokenExpireAt = trim( (string)($settings['access-token-expire-at'] ?? '') );
|
||||
|
||||
if ( $accessToken !== '' && $accessTokenExpireAt !== '' ) {
|
||||
if ( !$this->shouldRefreshAccessToken( $accessTokenExpireAt, $refreshLeadSeconds ) ) {
|
||||
return $accessToken;
|
||||
}
|
||||
}
|
||||
|
||||
if ( !$hasRefreshCredentials ) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$expireAt = new \DateTime( $settings['access-token-expire-at'] );
|
||||
$now = new \DateTime( date( 'Y-m-d H:i:s' ) );
|
||||
if (
|
||||
!empty( $settings['refresh-token-expire-at'] ) &&
|
||||
!$this->isFutureDate( (string)$settings['refresh-token-expire-at'] )
|
||||
) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if ( $expireAt >= $now )
|
||||
return $settings['access-token'];
|
||||
return $this->refreshApiloAccessToken( $settings );
|
||||
}
|
||||
|
||||
// Token expired - refresh
|
||||
/**
|
||||
* Keepalive tokenu Apilo do uzycia w CRON.
|
||||
* Odswieza token, gdy wygasa lub jest bliski wygasniecia.
|
||||
*
|
||||
* @return array{success:bool,skipped:bool,message:string}
|
||||
*/
|
||||
public function apiloKeepalive( int $refreshLeadSeconds = 300 ): array
|
||||
{
|
||||
$settings = $this->getSettings( 'apilo' );
|
||||
|
||||
if ( (int)($settings['enabled'] ?? 0) !== 1 ) {
|
||||
return [
|
||||
'success' => false,
|
||||
'skipped' => true,
|
||||
'message' => 'Apilo disabled.',
|
||||
];
|
||||
}
|
||||
|
||||
if ( empty( $settings['client-id'] ) || empty( $settings['client-secret'] ) ) {
|
||||
return [
|
||||
'success' => false,
|
||||
'skipped' => true,
|
||||
'message' => 'Missing Apilo credentials.',
|
||||
];
|
||||
}
|
||||
|
||||
$token = $this->apiloGetAccessToken( $refreshLeadSeconds );
|
||||
if ( !$token ) {
|
||||
return [
|
||||
'success' => false,
|
||||
'skipped' => false,
|
||||
'message' => 'Unable to refresh Apilo token.',
|
||||
];
|
||||
}
|
||||
|
||||
$this->saveSetting( 'apilo', 'token-keepalive-at', date( 'Y-m-d H:i:s' ) );
|
||||
|
||||
return [
|
||||
'success' => true,
|
||||
'skipped' => false,
|
||||
'message' => 'Apilo token keepalive OK.',
|
||||
];
|
||||
}
|
||||
|
||||
private function refreshApiloAccessToken( array $settings ): ?string
|
||||
{
|
||||
$postData = [
|
||||
'grantType' => 'refresh_token',
|
||||
'token' => $settings['refresh-token'],
|
||||
@@ -147,17 +210,102 @@ class IntegrationsRepository
|
||||
curl_close( $ch );
|
||||
$response = json_decode( $response, true );
|
||||
|
||||
if ( empty( $response['accessToken'] ) )
|
||||
if ( empty( $response['accessToken'] ) ) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$this->saveSetting( 'apilo', 'access-token', $response['accessToken'] );
|
||||
$this->saveSetting( 'apilo', 'refresh-token', $response['refreshToken'] );
|
||||
$this->saveSetting( 'apilo', 'access-token-expire-at', $response['accessTokenExpireAt'] );
|
||||
$this->saveSetting( 'apilo', 'refresh-token-expire-at', $response['refreshTokenExpireAt'] );
|
||||
$this->saveSetting( 'apilo', 'refresh-token', $response['refreshToken'] ?? ( $settings['refresh-token'] ?? '' ) );
|
||||
$this->saveSetting( 'apilo', 'access-token-expire-at', $response['accessTokenExpireAt'] ?? null );
|
||||
$this->saveSetting( 'apilo', 'refresh-token-expire-at', $response['refreshTokenExpireAt'] ?? null );
|
||||
|
||||
return $response['accessToken'];
|
||||
}
|
||||
|
||||
private function shouldRefreshAccessToken( string $expiresAtRaw, int $leadSeconds = 300 ): bool
|
||||
{
|
||||
try {
|
||||
$expiresAt = new \DateTime( $expiresAtRaw );
|
||||
} catch ( \Exception $e ) {
|
||||
return true;
|
||||
}
|
||||
|
||||
$threshold = new \DateTime( date( 'Y-m-d H:i:s', time() + max( 0, $leadSeconds ) ) );
|
||||
return $expiresAt <= $threshold;
|
||||
}
|
||||
|
||||
private function isFutureDate( string $dateRaw ): bool
|
||||
{
|
||||
try {
|
||||
$date = new \DateTime( $dateRaw );
|
||||
} catch ( \Exception $e ) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return $date > new \DateTime( date( 'Y-m-d H:i:s' ) );
|
||||
}
|
||||
|
||||
/**
|
||||
* Sprawdza aktualny stan integracji Apilo i zwraca komunikat dla UI.
|
||||
*
|
||||
* @return array{is_valid:bool,severity:string,message:string}
|
||||
*/
|
||||
public function apiloIntegrationStatus(): array
|
||||
{
|
||||
$settings = $this->getSettings( 'apilo' );
|
||||
|
||||
$missing = [];
|
||||
foreach ( [ 'client-id', 'client-secret' ] as $field ) {
|
||||
if ( trim( (string)($settings[$field] ?? '') ) === '' )
|
||||
$missing[] = $field;
|
||||
}
|
||||
|
||||
if ( !empty( $missing ) ) {
|
||||
return [
|
||||
'is_valid' => false,
|
||||
'severity' => 'danger',
|
||||
'message' => 'Brakuje konfiguracji Apilo: ' . implode( ', ', $missing ) . '.',
|
||||
];
|
||||
}
|
||||
|
||||
$accessToken = trim( (string)($settings['access-token'] ?? '') );
|
||||
$authorizationCode = trim( (string)($settings['authorization-code'] ?? '') );
|
||||
|
||||
if ( $accessToken === '' ) {
|
||||
if ( $authorizationCode === '' ) {
|
||||
return [
|
||||
'is_valid' => false,
|
||||
'severity' => 'warning',
|
||||
'message' => 'Brak authorization-code i access-token. Wpisz kod autoryzacji i uruchom autoryzacje.',
|
||||
];
|
||||
}
|
||||
|
||||
return [
|
||||
'is_valid' => false,
|
||||
'severity' => 'warning',
|
||||
'message' => 'Brak access-token. Uruchom autoryzacje Apilo.',
|
||||
];
|
||||
}
|
||||
|
||||
$token = $this->apiloGetAccessToken();
|
||||
if ( !$token ) {
|
||||
return [
|
||||
'is_valid' => false,
|
||||
'severity' => 'danger',
|
||||
'message' => 'Token Apilo jest niewazny lub wygasl i nie udal sie refresh. Wykonaj ponowna autoryzacje.',
|
||||
];
|
||||
}
|
||||
|
||||
$expiresAt = trim( (string)($settings['access-token-expire-at'] ?? '') );
|
||||
$suffix = $expiresAt !== '' ? ( ' Token wazny do: ' . $expiresAt . '.' ) : '';
|
||||
|
||||
return [
|
||||
'is_valid' => true,
|
||||
'severity' => 'success',
|
||||
'message' => 'Integracja Apilo jest aktywna.' . $suffix,
|
||||
];
|
||||
}
|
||||
|
||||
// ── Apilo API fetch lists ───────────────────────────────────
|
||||
|
||||
private const APILO_ENDPOINTS = [
|
||||
@@ -179,13 +327,45 @@ class IntegrationsRepository
|
||||
* @param string $type platform|status|carrier|payment
|
||||
*/
|
||||
public function apiloFetchList( string $type ): bool
|
||||
{
|
||||
$result = $this->apiloFetchListResult( $type );
|
||||
return !empty( $result['success'] );
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetch list from Apilo API and return detailed status for UI.
|
||||
*
|
||||
* @param string $type platform|status|carrier|payment
|
||||
* @return array{success:bool,count:int,message:string}
|
||||
*/
|
||||
public function apiloFetchListResult( string $type ): array
|
||||
{
|
||||
if ( !isset( self::APILO_ENDPOINTS[$type] ) )
|
||||
throw new \InvalidArgumentException( "Unknown apilo list type: $type" );
|
||||
|
||||
$settings = $this->getSettings( 'apilo' );
|
||||
$missingFields = [];
|
||||
foreach ( [ 'client-id', 'client-secret' ] as $requiredField ) {
|
||||
if ( trim( (string)($settings[$requiredField] ?? '') ) === '' )
|
||||
$missingFields[] = $requiredField;
|
||||
}
|
||||
|
||||
if ( !empty( $missingFields ) ) {
|
||||
return [
|
||||
'success' => false,
|
||||
'count' => 0,
|
||||
'message' => 'Brakuje konfiguracji Apilo: ' . implode( ', ', $missingFields ) . '. Uzupelnij pola i zapisz ustawienia.',
|
||||
];
|
||||
}
|
||||
|
||||
$accessToken = $this->apiloGetAccessToken();
|
||||
if ( !$accessToken )
|
||||
return false;
|
||||
if ( !$accessToken ) {
|
||||
return [
|
||||
'success' => false,
|
||||
'count' => 0,
|
||||
'message' => 'Brak aktywnego tokenu Apilo. Wykonaj autoryzacje Apilo i sprobuj ponownie.',
|
||||
];
|
||||
}
|
||||
|
||||
$ch = curl_init( self::APILO_ENDPOINTS[$type] );
|
||||
curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true );
|
||||
@@ -196,19 +376,140 @@ class IntegrationsRepository
|
||||
|
||||
$response = curl_exec( $ch );
|
||||
if ( curl_errno( $ch ) ) {
|
||||
$error = curl_error( $ch );
|
||||
curl_close( $ch );
|
||||
return false;
|
||||
return [
|
||||
'success' => false,
|
||||
'count' => 0,
|
||||
'message' => 'Blad polaczenia z Apilo: ' . $error . '. Sprawdz polaczenie serwera i sprobuj ponownie.',
|
||||
];
|
||||
}
|
||||
$httpCode = (int) curl_getinfo( $ch, CURLINFO_HTTP_CODE );
|
||||
curl_close( $ch );
|
||||
|
||||
$data = json_decode( $response, true );
|
||||
if ( !$data )
|
||||
if ( !is_array( $data ) ) {
|
||||
$responsePreview = substr( trim( (string)$response ), 0, 180 );
|
||||
if ( $responsePreview === '' )
|
||||
$responsePreview = '[pusta odpowiedz]';
|
||||
|
||||
return [
|
||||
'success' => false,
|
||||
'count' => 0,
|
||||
'message' => 'Apilo zwrocilo niepoprawny format odpowiedzi (HTTP ' . $httpCode . '). Odpowiedz: ' . $responsePreview,
|
||||
];
|
||||
}
|
||||
|
||||
if ( $httpCode >= 400 ) {
|
||||
return [
|
||||
'success' => false,
|
||||
'count' => 0,
|
||||
'message' => 'Apilo zwrocilo blad HTTP ' . $httpCode . ': ' . $this->extractApiloErrorMessage( $data ),
|
||||
];
|
||||
}
|
||||
|
||||
$normalizedList = $this->normalizeApiloMapList( $data );
|
||||
if ( $normalizedList === null ) {
|
||||
return [
|
||||
'success' => false,
|
||||
'count' => 0,
|
||||
'message' => 'Apilo zwrocilo dane w nieoczekiwanym formacie. Odswiez token i sproboj ponownie.',
|
||||
];
|
||||
}
|
||||
|
||||
$this->saveSetting( 'apilo', self::APILO_SETTINGS_KEYS[$type], $normalizedList );
|
||||
return [
|
||||
'success' => true,
|
||||
'count' => count( $normalizedList ),
|
||||
'message' => 'OK',
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Normalizuje odpowiedz API mapowania do listy rekordow ['id' => ..., 'name' => ...].
|
||||
* Zwraca null dla payloadu bledow lub nieoczekiwanego formatu.
|
||||
*
|
||||
* @return array<int, array{id:mixed,name:mixed}>|null
|
||||
*/
|
||||
private function normalizeApiloMapList( array $data ): ?array
|
||||
{
|
||||
if ( isset( $data['message'] ) && isset( $data['code'] ) )
|
||||
return null;
|
||||
|
||||
if ( $this->isMapListShape( $data ) )
|
||||
return $data;
|
||||
|
||||
if ( isset( $data['items'] ) && is_array( $data['items'] ) && $this->isMapListShape( $data['items'] ) )
|
||||
return $data['items'];
|
||||
|
||||
if ( isset( $data['data'] ) && is_array( $data['data'] ) && $this->isMapListShape( $data['data'] ) )
|
||||
return $data['data'];
|
||||
|
||||
// Dopuszczamy rowniez format asocjacyjny: [id => name, ...], ale tylko dla kluczy liczbowych.
|
||||
if ( !empty( $data ) ) {
|
||||
$normalized = [];
|
||||
foreach ( $data as $key => $value ) {
|
||||
if ( !( is_int( $key ) || ( is_string( $key ) && preg_match('/^-?\d+$/', $key) === 1 ) ) )
|
||||
return null;
|
||||
|
||||
if ( !is_scalar( $value ) )
|
||||
return null;
|
||||
|
||||
$normalized[] = [
|
||||
'id' => $key,
|
||||
'name' => (string) $value,
|
||||
];
|
||||
}
|
||||
|
||||
return !empty( $normalized ) ? $normalized : null;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private function isMapListShape( array $list ): bool
|
||||
{
|
||||
if ( empty( $list ) )
|
||||
return false;
|
||||
|
||||
$this->saveSetting( 'apilo', self::APILO_SETTINGS_KEYS[$type], $data );
|
||||
foreach ( $list as $row ) {
|
||||
if ( !is_array( $row ) || !array_key_exists( 'id', $row ) || !array_key_exists( 'name', $row ) )
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private function extractApiloErrorMessage( array $data ): string
|
||||
{
|
||||
foreach ( [ 'message', 'error', 'detail', 'title' ] as $key ) {
|
||||
if ( isset( $data[$key] ) && is_scalar( $data[$key] ) ) {
|
||||
$message = trim( (string)$data[$key] );
|
||||
if ( $message !== '' )
|
||||
return $message;
|
||||
}
|
||||
}
|
||||
|
||||
if ( isset( $data['errors'] ) ) {
|
||||
if ( is_array( $data['errors'] ) ) {
|
||||
$flat = [];
|
||||
foreach ( $data['errors'] as $errorItem ) {
|
||||
if ( is_scalar( $errorItem ) )
|
||||
$flat[] = (string)$errorItem;
|
||||
elseif ( is_array( $errorItem ) )
|
||||
$flat[] = json_encode( $errorItem, JSON_UNESCAPED_UNICODE );
|
||||
}
|
||||
|
||||
if ( !empty( $flat ) )
|
||||
return implode( '; ', $flat );
|
||||
} elseif ( is_scalar( $data['errors'] ) ) {
|
||||
return (string)$data['errors'];
|
||||
}
|
||||
}
|
||||
|
||||
return 'Nieznany blad odpowiedzi API.';
|
||||
}
|
||||
|
||||
// ── Apilo product operations ────────────────────────────────
|
||||
|
||||
public function getProductSku( int $productId ): ?string
|
||||
|
||||
Reference in New Issue
Block a user