Hamza/Siro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port all fixes from IntaleqApp (Wallet, CLIQ, OTP, Docker)

Browse Source
This commit is contained in:
Hamza-Ayed
2026-08-01 03:58:37 +03:00
parent 12fc64dc9a
commit 915d517ba7
9 changed files with 100 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
payment_server/v2/main/connect.php
+40 -32
View File
@@ -1,55 +1,63 @@
<?php
// Load environment variables from .env file
require_once realpath(__DIR__ . '/../vendor/autoload.php');
require_once 'load_env.php';
$envFile = '/home/intaleq-walletintaleq/env/.env';
if (!file_exists($envFile)) {
$envFile = __DIR__ . '/../.env';
// connect.php — نسخة الدوكر
// ─────────────────────────────────────────────────────────────
// • vendor/ مخبوز داخل الصورة في /var/www/v2/vendor (Dockerfile يشغّل composer install)
// • متغيّرات البيئة تصل عبر env_file في docker-compose → getenv() يعمل مباشرةً
// ─────────────────────────────────────────────────────────────
// 1. Autoload — vendor مخبوز داخل الصورة
$autoload = __DIR__ . '/../vendor/autoload.php';
if (file_exists($autoload)) {
require_once $autoload;
}
loadEnvironment($envFile);
// Get environment variables (You don't need user/pass for JWT auth itself)
$secretKey = getenv('SECRET_KEY'); // Only need the secret key now
// 2. لا حاجة لتحميل .env يدوياً: Docker يحقن المتغيّرات عبر env_file
// نحتفظ بـ load_env.php فقط لبيئة التطوير خارج الدوكر
if (!getenv('DB_PAYMENT_HOST')) {
// نحن خارج بيئة الدوكر — جرّب تحميل .env يدوياً
if (file_exists(__DIR__ . '/load_env.php')) {
require_once 'load_env.php';
$envFile = __DIR__ . '/../.env';
if (file_exists($envFile)) loadEnvironment($envFile);
}
}
// --- CORS Headers ---
header("Access-Control-Allow-Origin: https://wallet.siromove.com");
header("Access-Control-Allow-Methods: GET, POST, OPTIONS"); // Adjust as needed
// 3. CORS Headers
header("Access-Control-Allow-Origin: *");
header("Access-Control-Allow-Methods: GET, POST, OPTIONS");
header("Access-Control-Allow-Headers: Content-Type, Authorization");
header('Content-Type: application/json'); // Set content type to JSON
header('Content-Type: application/json');
// Handle preflight requests (OPTIONS)
if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') {
if ($_SERVER['REQUEST_METHOD'] === 'OPTIONS') {
http_response_code(200);
exit;
}
// --- Database Connection (Still needed for your application logic) ---
// 4. Database Connection
try {
$dbname = getenv('DB_PAYMENT_NAME') ?: (getenv('dbname') ?: 'payment');
$dbHost = getenv('DB_PAYMENT_HOST') ?: (getenv('DB_HOST') ?: 'mysql');
$dbname = getenv('DB_PAYMENT_NAME') ?: 'paymentDB';
$dbHost = getenv('DB_PAYMENT_HOST') ?: 'mysql';
$user = getenv('DB_PAYMENT_USER') ?: 'root';
$pass = getenv('DB_PAYMENT_PASS') ?: getenv('MYSQL_ROOT_PASSWORD') ?: '';
$dsn = "mysql:host=$dbHost;dbname=$dbname;charset=utf8mb4";
$options = [
PDO::ATTR_EMULATE_PREPARES => false,
PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
PDO::ATTR_EMULATE_PREPARES => false,
PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES UTF8"
PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES UTF8",
];
$user = getenv('DB_PAYMENT_USER') ?: (getenv('USER') ?: 'root');
$pass = getenv('DB_PAYMENT_PASS') ?: (getenv('PASS') ?: getenv('MYSQL_ROOT_PASSWORD'));
$con = new PDO($dsn, $user, $pass, $options);
// echo $con;
// --- JWT Authentication ---
include "functions.php"; // Include the functions file
$decodedToken = authenticateJWT(); // Call the authentication function
// 5. JWT Authentication
include __DIR__ . "/functions.php";
$decodedToken = authenticateJWT();
} catch (PDOException $e) {
error_log($e->getMessage());
http_response_code(500); // Internal Server Error
error_log('[WALLET] DB Error: ' . $e->getMessage());
http_response_code(500);
echo json_encode(['error' => 'A database error occurred.']);
exit;
}
?>