only entraid provider

app/Providers/EventServiceProvider.php

@@ -34,13 +34,8 @@ class EventServiceProvider extends ServiceProvider
         Verified::class => [
             ActivateUser::class,
         ],
-<<<<<<< HEAD
         \SocialiteProviders\Manager\SocialiteWasMapped::class => [
             \SocialiteProviders\Microsoft\MicrosoftExtendSocialite::class,
-=======
-        \SocialiteProviders\Manager\SocialiteWasCalled::class => [
-            'SocialiteProviders\\Azure\\AzureExtendSocialite@handle',
->>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
         ],
     ];
 
@@ -51,7 +46,7 @@ class EventServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        parent::boot(); // Aggiungi questa linea per sicurezza
+        //
     }
 
     /**

composer.json

@@ -44,11 +44,7 @@
         "phpmailer/phpmailer": "^6.9",
         "phpoffice/phpspreadsheet": "^4.1",
         "proengsoft/laravel-jsvalidation": "^4.0.0",
-<<<<<<< HEAD
         "socialiteproviders/microsoft": "^4.7",
-=======
-        "socialiteproviders/microsoft-azure": "^5.2",
->>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
         "spatie/laravel-query-builder": "^5.0",
         "vanguardapp/activity-log": "^6.0",
         "vanguardapp/announcements": "^6.0",

composer.lock

@@ -4,11 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-<<<<<<< HEAD
     "content-hash": "9c4f1e3bc3ee2180211c055e70635aef",
-=======
-    "content-hash": "583c865e5b67680202a816953a662b03",
->>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
     "packages": [
         {
             "name": "akaunting/laravel-setting",
@@ -5059,7 +5055,6 @@
             "time": "2025-02-24T19:33:30+00:00"
         },
         {
-<<<<<<< HEAD
             "name": "socialiteproviders/microsoft",
             "version": "4.7.0",
             "source": {
@@ -5071,38 +5066,18 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/SocialiteProviders/Microsoft/zipball/824ef97a4f6e3f363c21702b76676d54e8265573",
                 "reference": "824ef97a4f6e3f363c21702b76676d54e8265573",
-=======
-            "name": "socialiteproviders/microsoft-azure",
-            "version": "5.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/SocialiteProviders/Microsoft-Azure.git",
-                "reference": "453d62c9d7e3b3b76e94c913fb46e68a33347b16"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/SocialiteProviders/Microsoft-Azure/zipball/453d62c9d7e3b3b76e94c913fb46e68a33347b16",
-                "reference": "453d62c9d7e3b3b76e94c913fb46e68a33347b16",
->>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-<<<<<<< HEAD
                 "firebase/php-jwt": "^6.8",
-=======
->>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
                 "php": "^8.0",
                 "socialiteproviders/manager": "^4.4"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-<<<<<<< HEAD
                     "SocialiteProviders\\Microsoft\\": ""
-=======
-                    "SocialiteProviders\\Azure\\": ""
->>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -5111,22 +5086,12 @@
             ],
             "authors": [
                 {
-<<<<<<< HEAD
                     "name": "Brian Faust",
                     "email": "hello@brianfaust.de"
                 }
             ],
             "description": "Microsoft OAuth2 Provider for Laravel Socialite",
             "keywords": [
-=======
-                    "name": "Chris Hemmings",
-                    "email": "chris@hemmin.gs"
-                }
-            ],
-            "description": "Microsoft Azure OAuth2 Provider for Laravel Socialite",
-            "keywords": [
-                "azure",
->>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
                 "laravel",
                 "microsoft",
                 "oauth",
@@ -5134,19 +5099,11 @@
                 "socialite"
             ],
             "support": {
-<<<<<<< HEAD
                 "docs": "https://socialiteproviders.com/microsoft",
                 "issues": "https://github.com/socialiteproviders/providers/issues",
                 "source": "https://github.com/socialiteproviders/providers"
             },
             "time": "2025-07-06T00:25:25+00:00"
-=======
-                "docs": "https://socialiteproviders.com/microsoft-azure",
-                "issues": "https://github.com/socialiteproviders/providers/issues",
-                "source": "https://github.com/socialiteproviders/providers"
-            },
-            "time": "2024-03-15T03:02:10+00:00"
->>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
         },
         {
             "name": "spatie/laravel-package-tools",

config/auth.php

@@ -12,11 +12,7 @@ return [
     */
 
     'social' => [
-<<<<<<< HEAD
-        'providers' => ['facebook', 'twitter', 'google', 'microsoft'],
-=======
-        'providers' => ['azure'],
->>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
+        'providers' => ['microsoft'],
     ],
 
     /*

config/services.php

@@ -64,15 +64,12 @@ return [
         'redirect' => env('GOOGLE_CALLBACK_URI'),
     ],
 
-<<<<<<< HEAD
     'microsoft' => [
         'client_id' => env('MICROSOFT_CLIENT_ID'),
         'client_secret' => env('MICROSOFT_CLIENT_SECRET'),
         'redirect' => env('MICROSOFT_REDIRECT_URI'),
     ],
 
-=======
->>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
     //   'authy' => [
     //       'key' => env('AUTHY_KEY'),
     //   ],
@@ -87,11 +84,4 @@ return [
             'channel' => env('SLACK_BOT_USER_DEFAULT_CHANNEL'),
         ],
     ],
-
-    'azure' => [
-        'client_id' => env('AZURE_CLIENT_ID'),
-        'client_secret' => env('AZURE_CLIENT_SECRET'),
-        'redirect' => env('AZURE_REDIRECT_URI'),
-        'tenant' => env('AZURE_TENANT_ID'),
-    ],
 ];

resources/views/auth/social/buttons.blade.php

@@ -26,15 +26,9 @@
     </div>
     @endif
 
-<<<<<<< HEAD
     @if (in_array('microsoft', $socialProviders))
     <div class="col-{{ $colSize }} d-flex align-items-center justify-content-center">
         <a href="{{ url('auth/microsoft/login') }}" class="btn-microsoft">
-=======
-    @if (in_array('azure', $socialProviders))
-    <div class="col-{{ $colSize }} d-flex align-items-center justify-content-center">
-        <a href="{{ url('auth/azure/login') }}" style="color: #0078d4;">
->>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
             <i class="fab fa-microsoft fa-2x"></i>
         </a>
     </div>

vendor/composer/autoload_classmap.php

@@ -6314,12 +6314,6 @@ return array(
     'SebastianBergmann\\Type\\UnknownType' => $vendorDir . '/sebastian/type/src/type/UnknownType.php',
     'SebastianBergmann\\Type\\VoidType' => $vendorDir . '/sebastian/type/src/type/VoidType.php',
     'SebastianBergmann\\Version' => $vendorDir . '/sebastian/version/src/Version.php',
-<<<<<<< HEAD
-=======
-    'SocialiteProviders\\Azure\\AzureExtendSocialite' => $vendorDir . '/socialiteproviders/microsoft-azure/AzureExtendSocialite.php',
-    'SocialiteProviders\\Azure\\Provider' => $vendorDir . '/socialiteproviders/microsoft-azure/Provider.php',
-    'SocialiteProviders\\Azure\\User' => $vendorDir . '/socialiteproviders/microsoft-azure/User.php',
->>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
     'SocialiteProviders\\Manager\\Config' => $vendorDir . '/socialiteproviders/manager/src/Config.php',
     'SocialiteProviders\\Manager\\ConfigTrait' => $vendorDir . '/socialiteproviders/manager/src/ConfigTrait.php',
     'SocialiteProviders\\Manager\\Contracts\\ConfigInterface' => $vendorDir . '/socialiteproviders/manager/src/Contracts/ConfigInterface.php',
@@ -6336,13 +6330,10 @@ return array(
     'SocialiteProviders\\Manager\\OAuth2\\User' => $vendorDir . '/socialiteproviders/manager/src/OAuth2/User.php',
     'SocialiteProviders\\Manager\\ServiceProvider' => $vendorDir . '/socialiteproviders/manager/src/ServiceProvider.php',
     'SocialiteProviders\\Manager\\SocialiteWasCalled' => $vendorDir . '/socialiteproviders/manager/src/SocialiteWasCalled.php',
-<<<<<<< HEAD
     'SocialiteProviders\\Microsoft\\MicrosoftAvatar' => $vendorDir . '/socialiteproviders/microsoft/MicrosoftAvatar.php',
     'SocialiteProviders\\Microsoft\\MicrosoftExtendSocialite' => $vendorDir . '/socialiteproviders/microsoft/MicrosoftExtendSocialite.php',
     'SocialiteProviders\\Microsoft\\MicrosoftUser' => $vendorDir . '/socialiteproviders/microsoft/MicrosoftUser.php',
     'SocialiteProviders\\Microsoft\\Provider' => $vendorDir . '/socialiteproviders/microsoft/Provider.php',
-=======
->>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
     'Spatie\\Backtrace\\Arguments\\ArgumentReducers' => $vendorDir . '/spatie/backtrace/src/Arguments/ArgumentReducers.php',
     'Spatie\\Backtrace\\Arguments\\ProvidedArgument' => $vendorDir . '/spatie/backtrace/src/Arguments/ProvidedArgument.php',
     'Spatie\\Backtrace\\Arguments\\ReduceArgumentPayloadAction' => $vendorDir . '/spatie/backtrace/src/Arguments/ReduceArgumentPayloadAction.php',

vendor/composer/autoload_psr4.php

@@ -60,13 +60,8 @@ return array(
     'Spatie\\FlareClient\\' => array($vendorDir . '/spatie/flare-client-php/src'),
     'Spatie\\ErrorSolutions\\' => array($vendorDir . '/spatie/error-solutions/src'),
     'Spatie\\Backtrace\\' => array($vendorDir . '/spatie/backtrace/src'),
-<<<<<<< HEAD
     'SocialiteProviders\\Microsoft\\' => array($vendorDir . '/socialiteproviders/microsoft'),
     'SocialiteProviders\\Manager\\' => array($vendorDir . '/socialiteproviders/manager/src'),
-=======
-    'SocialiteProviders\\Manager\\' => array($vendorDir . '/socialiteproviders/manager/src'),
-    'SocialiteProviders\\Azure\\' => array($vendorDir . '/socialiteproviders/microsoft-azure'),
->>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
     'Ramsey\\Uuid\\' => array($vendorDir . '/ramsey/uuid/src'),
     'Ramsey\\Collection\\' => array($vendorDir . '/ramsey/collection/src'),
     'Psy\\' => array($vendorDir . '/psy/psysh/src'),

vendor/composer/autoload_static.php

@@ -120,13 +120,8 @@ class ComposerStaticInitc91cd9c5b1e6a9e8573a14b799ea9342
             'Spatie\\FlareClient\\' => 19,
             'Spatie\\ErrorSolutions\\' => 22,
             'Spatie\\Backtrace\\' => 17,
-<<<<<<< HEAD
             'SocialiteProviders\\Microsoft\\' => 29,
             'SocialiteProviders\\Manager\\' => 27,
-=======
-            'SocialiteProviders\\Manager\\' => 27,
-            'SocialiteProviders\\Azure\\' => 25,
->>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
         ),
         'R' => 
         array (
@@ -471,24 +466,14 @@ class ComposerStaticInitc91cd9c5b1e6a9e8573a14b799ea9342
         array (
             0 => __DIR__ . '/..' . '/spatie/backtrace/src',
         ),
-<<<<<<< HEAD
         'SocialiteProviders\\Microsoft\\' => 
         array (
             0 => __DIR__ . '/..' . '/socialiteproviders/microsoft',
         ),
-=======
->>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
         'SocialiteProviders\\Manager\\' => 
         array (
             0 => __DIR__ . '/..' . '/socialiteproviders/manager/src',
         ),
-<<<<<<< HEAD
-=======
-        'SocialiteProviders\\Azure\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/socialiteproviders/microsoft-azure',
-        ),
->>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
         'Ramsey\\Uuid\\' => 
         array (
             0 => __DIR__ . '/..' . '/ramsey/uuid/src',
@@ -7145,12 +7130,6 @@ class ComposerStaticInitc91cd9c5b1e6a9e8573a14b799ea9342
         'SebastianBergmann\\Type\\UnknownType' => __DIR__ . '/..' . '/sebastian/type/src/type/UnknownType.php',
         'SebastianBergmann\\Type\\VoidType' => __DIR__ . '/..' . '/sebastian/type/src/type/VoidType.php',
         'SebastianBergmann\\Version' => __DIR__ . '/..' . '/sebastian/version/src/Version.php',
-<<<<<<< HEAD
-=======
-        'SocialiteProviders\\Azure\\AzureExtendSocialite' => __DIR__ . '/..' . '/socialiteproviders/microsoft-azure/AzureExtendSocialite.php',
-        'SocialiteProviders\\Azure\\Provider' => __DIR__ . '/..' . '/socialiteproviders/microsoft-azure/Provider.php',
-        'SocialiteProviders\\Azure\\User' => __DIR__ . '/..' . '/socialiteproviders/microsoft-azure/User.php',
->>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
         'SocialiteProviders\\Manager\\Config' => __DIR__ . '/..' . '/socialiteproviders/manager/src/Config.php',
         'SocialiteProviders\\Manager\\ConfigTrait' => __DIR__ . '/..' . '/socialiteproviders/manager/src/ConfigTrait.php',
         'SocialiteProviders\\Manager\\Contracts\\ConfigInterface' => __DIR__ . '/..' . '/socialiteproviders/manager/src/Contracts/ConfigInterface.php',
@@ -7167,13 +7146,10 @@ class ComposerStaticInitc91cd9c5b1e6a9e8573a14b799ea9342
         'SocialiteProviders\\Manager\\OAuth2\\User' => __DIR__ . '/..' . '/socialiteproviders/manager/src/OAuth2/User.php',
         'SocialiteProviders\\Manager\\ServiceProvider' => __DIR__ . '/..' . '/socialiteproviders/manager/src/ServiceProvider.php',
         'SocialiteProviders\\Manager\\SocialiteWasCalled' => __DIR__ . '/..' . '/socialiteproviders/manager/src/SocialiteWasCalled.php',
-<<<<<<< HEAD
         'SocialiteProviders\\Microsoft\\MicrosoftAvatar' => __DIR__ . '/..' . '/socialiteproviders/microsoft/MicrosoftAvatar.php',
         'SocialiteProviders\\Microsoft\\MicrosoftExtendSocialite' => __DIR__ . '/..' . '/socialiteproviders/microsoft/MicrosoftExtendSocialite.php',
         'SocialiteProviders\\Microsoft\\MicrosoftUser' => __DIR__ . '/..' . '/socialiteproviders/microsoft/MicrosoftUser.php',
         'SocialiteProviders\\Microsoft\\Provider' => __DIR__ . '/..' . '/socialiteproviders/microsoft/Provider.php',
-=======
->>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
         'Spatie\\Backtrace\\Arguments\\ArgumentReducers' => __DIR__ . '/..' . '/spatie/backtrace/src/Arguments/ArgumentReducers.php',
         'Spatie\\Backtrace\\Arguments\\ProvidedArgument' => __DIR__ . '/..' . '/spatie/backtrace/src/Arguments/ProvidedArgument.php',
         'Spatie\\Backtrace\\Arguments\\ReduceArgumentPayloadAction' => __DIR__ . '/..' . '/spatie/backtrace/src/Arguments/ReduceArgumentPayloadAction.php',

vendor/composer/installed.json

@@ -8185,7 +8185,6 @@
             "install-path": "../socialiteproviders/manager"
         },
         {
-<<<<<<< HEAD
             "name": "socialiteproviders/microsoft",
             "version": "4.7.0",
             "version_normalized": "4.7.0.0",
@@ -8198,45 +8197,20 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/SocialiteProviders/Microsoft/zipball/824ef97a4f6e3f363c21702b76676d54e8265573",
                 "reference": "824ef97a4f6e3f363c21702b76676d54e8265573",
-=======
-            "name": "socialiteproviders/microsoft-azure",
-            "version": "5.2.0",
-            "version_normalized": "5.2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/SocialiteProviders/Microsoft-Azure.git",
-                "reference": "453d62c9d7e3b3b76e94c913fb46e68a33347b16"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/SocialiteProviders/Microsoft-Azure/zipball/453d62c9d7e3b3b76e94c913fb46e68a33347b16",
-                "reference": "453d62c9d7e3b3b76e94c913fb46e68a33347b16",
->>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-<<<<<<< HEAD
                 "firebase/php-jwt": "^6.8",
                 "php": "^8.0",
                 "socialiteproviders/manager": "^4.4"
             },
             "time": "2025-07-06T00:25:25+00:00",
-=======
-                "php": "^8.0",
-                "socialiteproviders/manager": "^4.4"
-            },
-            "time": "2024-03-15T03:02:10+00:00",
->>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
             "type": "library",
             "installation-source": "dist",
             "autoload": {
                 "psr-4": {
-<<<<<<< HEAD
                     "SocialiteProviders\\Microsoft\\": ""
-=======
-                    "SocialiteProviders\\Azure\\": ""
->>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -8245,22 +8219,12 @@
             ],
             "authors": [
                 {
-<<<<<<< HEAD
                     "name": "Brian Faust",
                     "email": "hello@brianfaust.de"
                 }
             ],
             "description": "Microsoft OAuth2 Provider for Laravel Socialite",
             "keywords": [
-=======
-                    "name": "Chris Hemmings",
-                    "email": "chris@hemmin.gs"
-                }
-            ],
-            "description": "Microsoft Azure OAuth2 Provider for Laravel Socialite",
-            "keywords": [
-                "azure",
->>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
                 "laravel",
                 "microsoft",
                 "oauth",
@@ -8268,19 +8232,11 @@
                 "socialite"
             ],
             "support": {
-<<<<<<< HEAD
                 "docs": "https://socialiteproviders.com/microsoft",
                 "issues": "https://github.com/socialiteproviders/providers/issues",
                 "source": "https://github.com/socialiteproviders/providers"
             },
             "install-path": "../socialiteproviders/microsoft"
-=======
-                "docs": "https://socialiteproviders.com/microsoft-azure",
-                "issues": "https://github.com/socialiteproviders/providers/issues",
-                "source": "https://github.com/socialiteproviders/providers"
-            },
-            "install-path": "../socialiteproviders/microsoft-azure"
->>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
         },
         {
             "name": "spatie/backtrace",

vendor/composer/installed.php

@@ -3,11 +3,7 @@
         'name' => 'loshmis/vanguard',
         'pretty_version' => 'dev-main',
         'version' => 'dev-main',
-<<<<<<< HEAD
         'reference' => 'baf3f6da32fd5bc669ac7360970be21407d1d384',
-=======
-        'reference' => '34d4dc86606bc95d9081b13c34f71f8e6cd5ff22',
->>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -692,11 +688,7 @@
         'loshmis/vanguard' => array(
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-<<<<<<< HEAD
             'reference' => 'baf3f6da32fd5bc669ac7360970be21407d1d384',
-=======
-            'reference' => '34d4dc86606bc95d9081b13c34f71f8e6cd5ff22',
->>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
@@ -1312,21 +1304,12 @@
             'aliases' => array(),
             'dev_requirement' => false,
         ),
-<<<<<<< HEAD
         'socialiteproviders/microsoft' => array(
             'pretty_version' => '4.7.0',
             'version' => '4.7.0.0',
             'reference' => '824ef97a4f6e3f363c21702b76676d54e8265573',
             'type' => 'library',
             'install_path' => __DIR__ . '/../socialiteproviders/microsoft',
-=======
-        'socialiteproviders/microsoft-azure' => array(
-            'pretty_version' => '5.2.0',
-            'version' => '5.2.0.0',
-            'reference' => '453d62c9d7e3b3b76e94c913fb46e68a33347b16',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../socialiteproviders/microsoft-azure',
->>>>>>> 040708a2dbf9850937d72bcdb4aba264fe9b9f4c
             'aliases' => array(),
             'dev_requirement' => false,
         ),