Merge branch '4.0'

Author: dunglas

ApiPlatformProvider.php

@@ -705,7 +705,33 @@ public function register(): void
             /** @var ConfigRepository */
             $config = $app['config'];
 
-            return new Options(title: $config->get('api-platform.title') ?? '');
+            return new Options(
+                title: $config->get('api-platform.title', ''),
+                description: $config->get('api-platform.description', ''),
+                version: $config->get('api-platform.version', ''),
+                oAuthEnabled: $config->get('api-platform.swagger_ui.oauth.enabled', false),
+                oAuthType: $config->get('api-platform.swagger_ui.oauth.type', null),
+                oAuthFlow: $config->get('api-platform.swagger_ui.oauth.flow', null),
+                oAuthTokenUrl: $config->get('api-platform.swagger_ui.oauth.tokenUrl', null),
+                oAuthAuthorizationUrl: $config->get('api-platform.swagger_ui.oauth.authorizationUrl', null),
+                oAuthRefreshUrl: $config->get('api-platform.swagger_ui.oauth.refreshUrl', null),
+                oAuthScopes: $config->get('api-platform.swagger_ui.oauth.scopes', []),
+                apiKeys: $config->get('api-platform.swagger_ui.apiKeys', []),
+            );
+        });
+
+        $this->app->singleton(SwaggerUiProcessor::class, function (Application $app) {
+            /** @var ConfigRepository */
+            $config = $app['config'];
+
+            return new SwaggerUiProcessor(
+                urlGenerator: $app->make(UrlGeneratorInterface::class),
+                normalizer: $app->make(NormalizerInterface::class),
+                openApiOptions: $app->make(Options::class),
+                oauthClientId: $config->get('api-platform.swagger_ui.oauth.clientId'),
+                oauthClientSecret: $config->get('api-platform.swagger_ui.oauth.clientSecret'),
+                oauthPkce: $config->get('api-platform.swagger_ui.oauth.pkce', false),
+            );
         });
 
         $this->app->singleton(DocumentationController::class, function (Application $app) {
@@ -1267,14 +1293,6 @@ public function boot(ResourceNameCollectionFactoryInterface $resourceNameCollect
         $route->name('api_doc')->middleware(ApiPlatformMiddleware::class);
         $routeCollection->add($route);
 
-        $route = new Route(['GET'], $prefix.'/{index?}{_format?}', function (Request $request, Application $app) {
-            $entrypointAction = $app->make(EntrypointController::class);
-
-            return $entrypointAction->__invoke($request);
-        });
-        $route->where('index', 'index');
-        $route->name('api_entrypoint')->middleware(ApiPlatformMiddleware::class);
-        $routeCollection->add($route);
         $route = new Route(['GET'], $prefix.'/.well-known/genid/{id}', function (): void {
             throw new NotExposedHttpException('This route is not exposed on purpose. It generates an IRI for a collection resource without identifier nor item operation.');
         });
@@ -1297,6 +1315,15 @@ public function boot(ResourceNameCollectionFactoryInterface $resourceNameCollect
             $routeCollection->add($route);
         }
 
+        $route = new Route(['GET'], $prefix.'/{index?}{_format?}', function (Request $request, Application $app) {
+            $entrypointAction = $app->make(EntrypointController::class);
+
+            return $entrypointAction->__invoke($request);
+        });
+        $route->where('index', 'index');
+        $route->name('api_entrypoint')->middleware(ApiPlatformMiddleware::class);
+        $routeCollection->add($route);
+
         $router->setRoutes($routeCollection);
     }
 

Eloquent/State/LinksHandler.php

@@ -37,19 +37,19 @@ public function handleLinks(Builder $builder, array $uriVariables, array $contex
                 $identifier = $uriVariables[$uriVariable];
 
                 if ($to = $link->getToProperty()) {
-                    $builder = $builder->where($builder->getModel()->getTable().'.'.$builder->getModel()->{$to}()->getForeignKeyName(), $identifier);
+                    $builder = $builder->where($builder->getModel()->{$to}()->getQualifiedForeignKeyName(), $identifier);
 
                     continue;
                 }
 
                 if ($from = $link->getFromProperty()) {
                     $relation = $this->application->make($link->getFromClass());
-                    $builder = $builder->getModel()->where($builder->getModel()->getTable().'.'.$relation->{$from}()->getForeignKeyName(), $identifier);
+                    $builder = $builder->getModel()->where($relation->{$from}()->getQualifiedForeignKeyName(), $identifier);
 
                     continue;
                 }
 
-                $builder->where($builder->getModel()->getTable().'.'.$link->getIdentifiers()[0], $identifier);
+                $builder->where($builder->getModel()->qualifyColumn($link->getIdentifiers()[0]), $identifier);
             }
 
             return $builder;

State/SwaggerUiProcessor.php

@@ -70,6 +70,7 @@ public function process(mixed $openApi, Operation $operation, array $uriVariable
                 'flow' => $this->openApiOptions->getOAuthFlow(),
                 'tokenUrl' => $this->openApiOptions->getOAuthTokenUrl(),
                 'authorizationUrl' => $this->openApiOptions->getOAuthAuthorizationUrl(),
+                'redirectUrl' => $request->getSchemeAndHttpHost().'/vendor/api-platform/swagger-ui/oauth2-redirect.html',
                 'scopes' => $this->openApiOptions->getOAuthScopes(),
                 'clientId' => $this->oauthClientId,
                 'clientSecret' => $this->oauthClientSecret,

config/api-platform.php

@@ -72,7 +72,24 @@
     ],
 
     'swagger_ui' => [
-        'enabled' => true
+        'enabled' => true,
+        //'apiKeys' => [
+        //    'api' => [
+        //        'type' => 'Bearer',
+        //        'name' => 'Authentication Token',
+        //        'in' => 'header'
+        //    ]
+        //],
+        //'oauth' => [
+        //    'enabled' => true,
+        //    'type' => 'oauth2',
+        //    'flow' => 'authorizationCode',
+        //    'tokenUrl' => '',
+        //    'authorizationUrl' =>'',
+        //    'refreshUrl' => '',
+        //    'scopes' => ['scope1' => 'Description scope 1'],
+        //    'pkce' => true
+        //]
     ],
 
     'url_generation_strategy' => UrlGeneratorInterface::ABS_PATH,