Merge pull request #8 from HelloAsso/develop

Develop
HelloAsso · Nov 7, 2024 · 6bdefba · 6bdefba
2 parents 9caea0d + c851fde
commit 6bdefba
Show file tree

Hide file tree

Showing 11 changed files with 168 additions and 95 deletions.
diff --git a/.env.example b/.env.example
@@ -15,5 +15,5 @@ CLIENT_ID=
 CLIENT_SECRET=
 
 ENCRYPTION_KEY=
-
-WEBSITE_DOMAIN=http://localhost:3000
+WEBSITE_DOMAIN=http://localhost:3000
+MANDRILL_API=
diff --git a/.github/workflows/php-prod.yml b/.github/workflows/php-prod.yml
@@ -57,6 +57,7 @@ jobs:
         envkey_CLIENT_SECRET: ${{ secrets.PROD_CLIENT_SECRET }}
         envkey_ENCRYPTION_KEY: ${{ secrets.PROD_ENCRYPTION_KEY }}
         envkey_WEBSITE_DOMAIN: ${{ vars.PROD_WEBSITE_DOMAIN }}
+        envkey_MANDRILL_API: ${{ vars.PROD_MANDRILL_API }}
         file_name: .env
 
     - name: SFTP Deploy
@@ -71,5 +72,5 @@ jobs:
           .git*
           composer.*
           package*
-          README.MD
+          *.MD
           
diff --git a/.github/workflows/php-sandbox.yml b/.github/workflows/php-sandbox.yml
@@ -57,6 +57,7 @@ jobs:
         envkey_CLIENT_SECRET: ${{ secrets.SANDBOX_CLIENT_SECRET }}
         envkey_ENCRYPTION_KEY: ${{ secrets.SANDBOX_ENCRYPTION_KEY }}
         envkey_WEBSITE_DOMAIN: ${{ vars.SANDBOX_WEBSITE_DOMAIN }}
+        envkey_MANDRILL_API: ${{ vars.SANDBOX_MANDRILL_API }}
         file_name: .env
 
     - name: SFTP Deploy
@@ -71,5 +72,5 @@ jobs:
           .git*
           composer.*
           package*
-          README.MD
+          *.MD
           
diff --git a/admin/index.php b/admin/index.php
@@ -20,17 +20,10 @@
     // Générer un GUID unique pour le nouveau Charity Stream
     $guid = bin2hex(random_bytes(16)); // Utilisation de bin2hex pour obtenir une chaîne hexadécimale
 
-    // Check if form exist
-    $data = $apiWrapper->GetDonationForm($organizationSlug, $formSlug);
-
-    if(!$data) {
-        echo '<div class="alert alert-danger" role="alert">Ce formulaire n\'existe pas</div>';
-    } else {
-        // Appeler la fonction pour créer le Charity Stream
-        $_SESSION[$guid . 'password'] = $repository->createCharityStreamDB($guid, $ownerEmail, $formSlug, $organizationSlug, $title);
-        header("Location: /admin/index.php");
-        exit();
-    }
+    // Appeler la fonction pour créer le Charity Stream
+    $_SESSION[$guid . 'password'] = $repository->createCharityStreamDB($guid, $ownerEmail, $formSlug, $organizationSlug, $title);
+    header("Location: /admin/index.php");
+    exit();
 }
 
 if (isset($_POST['refresh_password'])) {

diff --git a/app/ApiWrapper.php b/app/ApiWrapper.php
@@ -338,41 +338,6 @@ function exchangeAuthorizationCode($code, $redirect_uri, $codeVerifier)
 
     // Organizations
 
-    function GetDonationForm($organizationSlug, $donationSlug)
-    {
-        $accessToken = $this->getGlobalTokensAndRefreshIfNecessary();
-        if (!$accessToken || !isset($accessToken['access_token'])) {
-            http_response_code(401);
-            echo json_encode(['error' => 'Jeton d\'accès API non trouvé ou expiré.']);
-            exit;
-        }
-
-        $curl = curl_init();
-
-        // Construire l'URL avec ou sans continuationToken
-        $url = $this->apiUrl . '/organizations/' . $organizationSlug . '/forms/donation/' . $donationSlug . '/public';
-
-        curl_setopt_array($curl, array(
-            CURLOPT_URL => $url,
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_ENCODING => '',
-            CURLOPT_MAXREDIRS => 10,
-            CURLOPT_TIMEOUT => 0,
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
-            CURLOPT_CUSTOMREQUEST => 'GET',
-            CURLOPT_HTTPHEADER => array(
-                'Authorization: Bearer ' . $accessToken['access_token']
-            ),
-        ));
-
-        $response = curl_exec($curl);
-        curl_close($curl);
-
-        $response_data = json_decode($response, true);
-        return $response_data;
-    }
-
     function GetDonationFormOrders($organizationSlug, $donationSlug, $accessToken, $continuationToken = null, $from = null)
     {
         $curl = curl_init();

diff --git a/app/Config.php b/app/Config.php
@@ -31,6 +31,7 @@ class Config
     public $haUrl = null;
     public $haIps = null;
     public $webSiteDomain = null;
+    public $mandrillApi = null;
 
     private function getDb()
     {
@@ -70,6 +71,7 @@ private function __construct()
         $this->haUrl = $_ENV['HA_URL'];
         $this->haIps = isset($_ENV['HA_IPS']) ? explode(",", $_ENV['HA_IPS']) : [];
         $this->webSiteDomain = $_ENV['WEBSITE_DOMAIN'];
+        $this->mandrillApi = $_ENV['MANDRILL_API'];
     }
 
     public static function getInstance()

diff --git a/app/Repository.php b/app/Repository.php
@@ -78,7 +78,7 @@ function updateAlertBoxWidgetDB($guidBinary, $postData, $image = null, $sound =
             $guidBinary
         ]);
 
-        if(isset($image)) {
+        if (isset($image)) {
             $stmt = $this->db->prepare('
                 UPDATE ' . $this->prefix . 'widget_alert_box
                 SET image = ?
@@ -90,7 +90,7 @@ function updateAlertBoxWidgetDB($guidBinary, $postData, $image = null, $sound =
             ]);
         }
 
-        if(isset($sound)) {
+        if (isset($sound)) {
             $stmt = $this->db->prepare('
                 UPDATE ' . $this->prefix . 'widget_alert_box
                 SET sound = ?
@@ -106,15 +106,15 @@ function updateAlertBoxWidgetDB($guidBinary, $postData, $image = null, $sound =
     function createCharityStreamDB($guid, $owner_email, $form_slug, $organization_slug, $title)
     {
         $password = Helpers::generateRandomString(30);
-        
+
         $query = 'INSERT INTO ' . $this->prefix . 'users (email, password) 
                 VALUES (:email, :password)';
         $stmt = $this->db->prepare($query);
         $stmt->execute([
             ':email' => $owner_email,
             ':password' => password_hash($password, PASSWORD_DEFAULT)
         ]);
-        
+
         $query = 'INSERT INTO ' . $this->prefix . 'charity_stream (guid, owner_email, form_slug, organization_slug, title, state) 
                 VALUES (:guid, :owner_email, :form_slug, :organization_slug, :title, 1)';
         $stmt = $this->db->prepare($query);
@@ -181,7 +181,7 @@ function getUser($email)
     function updateUserPassword($email)
     {
         $password = Helpers::generateRandomString(30);
-        
+
         $query = 'UPDATE ' . $this->prefix . 'users
                 SET password = :password
                 WHERE email = :email';
@@ -288,6 +288,22 @@ function getAccessTokensDB($organization_slug)
         return null;
     }
 
+    function getAccessTokensToRefresh()
+    {
+        $stmt = $this->db->prepare('SELECT * 
+            FROM ' . $this->prefix . 'access_token_partner_organization 
+            WHERE organization_slug IS NOT NULL
+            AND refresh_token_expires_at > now()
+            AND refresh_token_expires_at <= DATE_ADD(NOW(), INTERVAL 24 HOUR);');
+        $stmt->execute();
+
+        if ($stmt->rowCount() > 0) {
+            return $stmt->fetchAll();
+        }
+
+        return null;
+    }
+
 
     function getAuthorizationCodeByIdDB($id)
     {

diff --git a/composer.json b/composer.json
@@ -3,6 +3,7 @@
     "require": {
         "vlucas/phpdotenv": "^5.6",
         "microsoft/azure-storage-blob": "^1.5",
-        "league/mime-type-detection": "^1.15"
+        "league/mime-type-detection": "^1.15",
+        "mailchimp/transactional": "^1.0"
     }
 }