[release] 1.0.2

8edc9903 · Maxime FRIESS · 263c6308 · 2aeec8b8 · 8edc9903 · 8edc9903
Commit 8edc9903 authored 2 years ago by Maxime FRIESS
--- a/.env.docker.example
+++ b/.env.docker.example
 APP_NAME=Bombernyan-api
-APP_ENV=local
+APP_ENV=prod
 APP_KEY=
 APP_DEBUG=false
-APP_URL=http://localhost
+APP_URL=https://mai-projet-integrateur.u-strasbg.fr/vmProjetIntegrateurgrp7-0

-PMA_ABSOLUTE_URI=http://localhost/pma/
+L5_SWAGGER_CONST_HOST=https://mai-projet-integrateur.u-strasbg.fr/vmProjetIntegrateurgrp7-0/
+
+PMA_ABSOLUTE_URI=https://mai-projet-integrateur.u-strasbg.fr/vmProjetIntegrateurgrp7-0/pma/

 LOG_CHANNEL=stack
 LOG_DEPRECATIONS_CHANNEL=null

--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -9,16 +9,21 @@

 /**
 * @OA\Info(
- *   version="1.0.1",
+ *   version="1.0.2",
 *   title="BomberNyan API Documentation",
 *   description="API for BomberNyan",
 * )
 *
 * @OA\Server(
- *   url="/api",
+ *   url="https://mai-projet-integrateur.u-strasbg.fr/vmProjetIntegrateurgrp7-0/api",
 *   description="API Server"
 * )
 * 
+ * @OA\Server(
+ *   url="http://localhost:8000/api",
+ *   description="Local API Server"
+ * )
+ *
 * @OA\Response(
 *   response="422",
 *   description="Missing field",

--- a/app/Http/Middleware/TrustProxies.php
+++ b/app/Http/Middleware/TrustProxies.php
@@ -12,7 +12,7 @@ class TrustProxies extends Middleware
     *
     * @var array<int, string>|string|null
     */
-    protected $proxies;
+    protected $proxies = '*';

    /**
     * The headers that should be used to detect proxies.
@@ -24,5 +24,6 @@ class TrustProxies extends Middleware
        Request::HEADER_X_FORWARDED_HOST |
        Request::HEADER_X_FORWARDED_PORT |
        Request::HEADER_X_FORWARDED_PROTO |
+        Request::HEADER_X_FORWARDED_PREFIX |
        Request::HEADER_X_FORWARDED_AWS_ELB;
 }
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
    "description": "The Laravel Framework.",
    "keywords": ["framework", "laravel"],
    "license": "MIT",
-    "version": "1.0.1",
+    "version": "1.0.2",
    "require": {
        "php": "^8.0.2",
        "darkaonline/l5-swagger": "^8.4",

--- a/nginx.conf
+++ b/nginx.conf
@@ -6,6 +6,10 @@ server {
    }

    location / {
+        proxy_set_header X-Forwarded-Host mai-projet-integrateur.u-strasbg.fr;
+        proxy_set_header X-Forwarded-Post 443;
+        proxy_set_header X-Forwarded-Prefix /vmProjetIntegrateurgrp7-0;
+        proxy_set_header X-Forwarded-Proto https;
        proxy_pass http://api:8000/;
    }
 }
--- a/resources/views/vendor/l5-swagger/index.blade.php
+++ b/resources/views/vendor/l5-swagger/index.blade.php
@@ -3,7 +3,9 @@
 <head>
    <meta charset="UTF-8">
    <title>{{config('l5-swagger.documentations.'.$documentation.'.api.title')}}</title>
-    <link rel="stylesheet" type="text/css" href="https://unpkg.com/swagger-ui-dist@4.5.0/swagger-ui.css">
+    <link rel="stylesheet" type="text/css" href="{{ l5_swagger_asset($documentation, 'swagger-ui.css') }}">
+    <link rel="icon" type="image/png" href="{{ l5_swagger_asset($documentation, 'favicon-32x32.png') }}" sizes="32x32"/>
+    <link rel="icon" type="image/png" href="{{ l5_swagger_asset($documentation, 'favicon-16x16.png') }}" sizes="16x16"/>
    <style>
    html
    {
@@ -28,9 +30,9 @@
 <body>
 <div id="swagger-ui"></div>

-<script src="https://unpkg.com/swagger-ui-dist@4.5.0/swagger-ui-bundle.js"></script>
-<script src="https://unpkg.com/swagger-ui-dist@4.5.0/swagger-ui-standalone-preset.js"></script>
-<script src="https://unpkg.com/swagger-ui-plugin-hierarchical-tags@1.0.3/build/index.js" crossorigin></script>
+<script src="{{ l5_swagger_asset($documentation, 'swagger-ui-bundle.js') }}"></script>
+<script src="{{ l5_swagger_asset($documentation, 'swagger-ui-standalone-preset.js') }}"></script>
+<script src="https://unpkg.com/swagger-ui-plugin-hierarchical-tags" crossorigin></script>
 <script>
    window.onload = function() {
        // Build a system

--- a/routes/web.php
+++ b/routes/web.php
@@ -20,6 +20,13 @@
 |
 */

+$app_url = config("app.url");
+if (app()->environment('prod') && !empty($app_url)) {
+    URL::forceRootUrl($app_url);
+    $schema = explode(':', $app_url)[0];
+    URL::forceScheme($schema);
+}
+
 // Route used for email verification
 Route::get('/email/verify/{id}/{hash}', function (Request $request, $id) {
    $user = User::findOrFail($id);