minimal improvements

WWW/calendarserver.php

 <?php
 
 namespace api;
-
-use Sabre;
 use PT;
+use Sabre;
 
 if ($_SERVER['REQUEST_METHOD'] === 'OPTIONS') {
     @header('Access-Control-Allow-Origin: *');
@@ -18,18 +17,15 @@ if ($_SERVER['REQUEST_METHOD'] === 'OPTIONS') {
 }
 
 @header('Access-Control-Allow-Origin: *');
-/*
-CalendarServer example
-This server features CalDAV support
-*/
+
 // settings
-date_default_timezone_set('Canada/Eastern');
-// If you want to run the SabreDAV server in a custom location (using mod_rewrite for instance)
-// You can override the baseUri here.
-// $baseUri = '/';
-/* Database */
-//$pdo = new PDO('sqlite:data/db.sqlite');
-$pdo = new \PDO('mysql:host=db;dbname=ksa', 'aliarshad', 'aliarshad');
+date_default_timezone_set('Europe/London');
+$host = getenv("MYSQL_HOST");
+$user = getenv("MYSQL_USER");
+$password = getenv("MYSQL_PASSWORD");
+$db = getenv("MYSQL_DATABASE");
+
+$pdo = new \PDO('mysql:host=' . $host . ';dbname=' . $db, $user, $password);
 $pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
 // Files we need
 require_once 'vendor/autoload.php';

WWW/classes/TokenAuth.php

@@ -8,13 +8,12 @@ class TokenAuth extends AbstractBearer
 {
     public $tableName = "users";
     private $pdo;
-    private $apiURL = "https://da-api.drywallaptitude.co.uk/auth/verify";
+    private $apiURL = '';
 
     function __construct(\PDO $pdo)
     {
-
         $this->pdo = $pdo;
-
+        $this->apiURL = getenv('VERIFY_URL');
     }
 
     function validateBearerToken($token)

docker-compose.yml

@@ -14,6 +14,7 @@ services:
       - ./WWW:/var/www/html
     environment:
       - MYSQL_HOST=db
+      - VERIFY_URL=https://da-api.drywallaptitude.co.uk/auth/verify
     env_file:
       - database.env
     restart: unless-stopped

start.sh

@@ -6,6 +6,7 @@ echo "env[MYSQL_DATABASE]= $MYSQL_DATABASE">> /etc/php/7.0/fpm/pool.d/www.conf
 echo "env[MYSQL_USER]= $MYSQL_USER">> /etc/php/7.0/fpm/pool.d/www.conf
 echo "env[MYSQL_PASSWORD]= $MYSQL_PASSWORD">> /etc/php/7.0/fpm/pool.d/www.conf
 echo "env[MYSQL_HOST]= $MYSQL_HOST">> /etc/php/7.0/fpm/pool.d/www.conf
+echo "env[VERIFY_URL]= $VERIFY_URL">> /etc/php/7.0/fpm/pool.d/www.conf
 
 cd /var/www/html
 composer -n install