Merge pull request #7 from HelloAsso/feature/update-validation

Update validation process
HelloAsso · Nov 7, 2024 · fcc8015 · fcc8015
2 parents 6b3d1c9 + 3371c1e
commit fcc8015
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 52 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/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/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"
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/validate_grant_authorization.php b/validate_grant_authorization.php
@@ -45,7 +45,7 @@
     } 
     catch (Exception $e) 
     {
-        throw new Exception("Erreur de MAJ en base de données : $e->getMessage()");
+        throw new Exception("Erreur de MAJ en base de données : " . $e->getMessage());
     }
 } 
 else 
@@ -61,9 +61,26 @@
         );
 
         echo 'Votre compte ' . $tokenDataGrantAuthorization['organization_slug'] . ' à bien été lié à HelloAssoCharityStream, vous pouvez fermer cette page.';
+
+        $mailchimp = new \MailchimpTransactional\ApiClient();
+        $mailchimp->setApiKey(Config::getInstance()->mandrillApi);
+
+        $mailchimp->messages->send([
+            "message" => [
+                "from_email" => "contact@helloasso.io",
+                "from_name" => "HelloAsso",
+                "subject" => "Une association vient de valider sa mire" ,
+                "html" => "<p>L'association " . $tokenDataGrantAuthorization['organization_slug'] . " vient de valider sa mire d'authorisation sur l'environnement " . Config::getInstance()->webSiteDomain . "</p>",
+                "to" => [
+                    [
+                        "email" => "helloasso.stream@helloasso.org "
+                    ]
+                ],
+            ]
+        ]);
     } 
     catch (Exception $e) 
     {
-        throw new Exception("Erreur lors de l'insertion en base de données : $e->getMessage()");
+        throw new Exception("Erreur lors de l'insertion en base de données : " . $e->getMessage());
     }
 }