Merge pull request 'Dev' (#10) from dev into main

Reviewed-on: #10

includes/integrations/microsoft.php

@@ -10,7 +10,7 @@ require_once __DIR__ . '/../../config/database.php';
 const MS_OAUTH_AUTHORIZE_URL = 'https://login.microsoftonline.com/%s/oauth2/v2.0/authorize';
 const MS_OAUTH_TOKEN_URL     = 'https://login.microsoftonline.com/%s/oauth2/v2.0/token';
 const MS_GRAPH_BASE_URL      = 'https://graph.microsoft.com/v1.0';
-const MS_DEFAULT_SCOPES      = 'offline_access openid profile email User.Read Calendars.Read';
+const MS_DEFAULT_SCOPES      = 'offline_access User.Read Calendars.ReadWrite';
 
 /**
  * Genereert de Microsoft OAuth2 login URL

integrations.php

@@ -309,13 +309,13 @@ $redirectUri = rtrim(APP_URL, '/') . '/auth/callback_microsoft.php';
                             <button onclick="copyToClipboard('msRedirectUriInput')" class="text-slate-400 hover:text-white px-1.5 py-0.5 rounded bg-slate-800 text-[10px]">Kopieer</button>
                         </div>
                         <p>4. Maak een geheim aan onder <em>Certificaten en geheimen</em>.</p>
-                        <p>5. Voeg API-machtigingen toe: <code>Calendars.Read</code>, <code>User.Read</code>, <code>offline_access</code>.</p>
+                        <p>5. Voeg API-machtigingen toe: <code>Calendars.ReadWrite</code>, <code>User.Read</code>, <code>offline_access</code>.</p>
                         <p>6. <strong class="text-amber-300">Cruciaal voor organisaties:</strong> Klik direct boven de tabel met machtigingen op de knop <strong class="text-white">"Beheerdersgoedkeuring verlenen voor [Organisatie]"</strong> (<em>Grant admin consent</em>) en bevestig met 'Ja'. Hiermee voorkomt u de melding <em>"Beheerdersgoedkeuring vereist"</em>.</p>
                         <?php 
                         $curClientId = !empty($outlookSettings['client_id']) ? $outlookSettings['client_id'] : fociz_env('MICROSOFT_CLIENT_ID', '');
                         $curTenantId = !empty($outlookSettings['tenant_id']) ? $outlookSettings['tenant_id'] : 'organizations';
                         if (!empty($curClientId)): 
-                            $adminConsentUrl = "https://login.microsoftonline.com/" . urlencode($curTenantId) . "/adminconsent?client_id=" . urlencode($curClientId) . "&redirect_uri=" . urlencode($redirectUri);
+                            $adminConsentUrl = "https://login.microsoftonline.com/" . urlencode($curTenantId) . "/v2.0/adminconsent?client_id=" . urlencode($curClientId) . "&redirect_uri=" . urlencode($redirectUri) . "&scope=" . urlencode("https://graph.microsoft.com/.default");
                         ?>
                         <div class="mt-2 pt-2 border-t border-slate-800/80">
                             <a href="<?= htmlspecialchars($adminConsentUrl) ?>" target="_blank" class="inline-flex items-center space-x-1.5 text-[11px] text-amber-400 hover:text-amber-300 underline font-semibold">
@@ -390,16 +390,25 @@ $redirectUri = rtrim(APP_URL, '/') . '/auth/callback_microsoft.php';
                     $curClientId = !empty($outlookSettings['client_id']) ? $outlookSettings['client_id'] : fociz_env('MICROSOFT_CLIENT_ID', '');
                     $curTenantId = !empty($outlookSettings['tenant_id']) ? $outlookSettings['tenant_id'] : 'organizations';
                     if (!empty($curClientId)): 
-                        $adminConsentUrl = "https://login.microsoftonline.com/" . urlencode($curTenantId) . "/adminconsent?client_id=" . urlencode($curClientId) . "&redirect_uri=" . urlencode($redirectUri);
+                        $adminConsentUrl = "https://login.microsoftonline.com/" . urlencode($curTenantId) . "/v2.0/adminconsent?client_id=" . urlencode($curClientId) . "&redirect_uri=" . urlencode($redirectUri) . "&scope=" . urlencode("https://graph.microsoft.com/.default");
                     ?>
                     <div class="mt-2 p-2.5 rounded-lg bg-amber-500/10 border border-amber-500/30 text-[11px] flex items-start space-x-2">
                         <i data-lucide="shield-alert" class="w-4 h-4 flex-shrink-0 mt-0.5 text-amber-400"></i>
-                        <div class="text-slate-300 leading-snug">
+                        <div class="text-slate-300 leading-snug flex-1">
                             <strong class="text-amber-300 block">Krijgt u "Beheerdersgoedkeuring vereist"?</strong>
-                            <span>In Azure staat de goedkeuring standaard op 'Niet verleend'. Open deze directe link als beheerder om het met 1 klik goed te keuren:</span><br>
+                            <span>Stuur deze officiële Microsoft goedkeuringslink naar uw IT-beheerder om Fociz met 1 klik goed te keuren voor <?= htmlspecialchars($curTenantId) ?>:</span>
-                            <a href="<?= htmlspecialchars($adminConsentUrl) ?>" target="_blank" class="inline-flex items-center space-x-1 font-bold text-amber-400 hover:text-white underline mt-1">
+                            <div class="mt-2 flex items-center space-x-2">
-                                <span>Beheerdersgoedkeuring direct verlenen via Microsoft &rarr;</span>
+                                <input type="text" readonly id="adminConsentInput" value="<?= htmlspecialchars($adminConsentUrl) ?>" class="bg-slate-950/80 border border-slate-800 rounded px-2 py-1 text-[10px] text-amber-300 font-mono flex-1 focus:outline-none select-all">
-                            </a>
+                                <button type="button" onclick="copyToClipboard('adminConsentInput')" class="bg-amber-500/20 hover:bg-amber-500/30 border border-amber-500/40 text-amber-300 text-[10px] font-semibold px-2 py-1 rounded transition flex items-center space-x-1 flex-shrink-0">
+                                    <i data-lucide="copy" class="w-3 h-3"></i>
+                                    <span>Kopieer Link</span>
+                                </button>
+                            </div>
+                            <div class="mt-1.5">
+                                <a href="<?= htmlspecialchars($adminConsentUrl) ?>" target="_blank" class="inline-flex items-center space-x-1 font-bold text-amber-400 hover:text-white underline">
+                                    <span>Zelf beheerder? Open de goedkeuring direct &rarr;</span>
+                                </a>
+                            </div>
                         </div>
                     </div>
                     <?php endif; ?>