More Facades, User delete

exam/api/Login/Login.php

@@ -3,9 +3,12 @@
 namespace Api\Login;
 
 use Exception;
+use Khofmann\Api\Api;
 use Khofmann\Input\Input;
+use Khofmann\Response\Response;
+use Khofmann\Models\User\User;
 
-class Login
+class Login extends Api
 {
   public function post()
   {
@@ -15,8 +18,7 @@ class Login
     if (empty($password)) throw new Exception("Missing Password", 400);
 
     try {
-      $response = \Khofmann\Models\User\User::logIn($email, $password);
+      return Response::json(User::logIn($email, $password));
-      return json_encode($response);
     } catch (Exception $err) {
       switch ($err->getMessage()) {
         case "Failed":

exam/api/Logout/Logout.php

@@ -2,13 +2,16 @@
 
 namespace Api\Logout;
 
+use Khofmann\Api\Api;
 use \Khofmann\Models\User\User;
+use Khofmann\Request\Request;
+use Khofmann\Response\Response;
 
-class Logout
+class Logout extends Api
 {
   public function post()
   {
-    $token = request()->getHeader("token");
+    $token = Request::header("token");
-    return json_decode(User::getByToken($token)->logOut());
+    return Response::json(User::getByToken($token)->logOut());
   }
 }

exam/api/User/User.php

@@ -5,13 +5,16 @@ namespace Api\User;
 use Exception;
 use Khofmann\Models\User\User as MUser;
 use Khofmann\Input\Input;
+use Khofmann\Response\Response;
+use Khofmann\Api\Api;
+use Khofmann\Request\Request;
 
-class User
+class User extends Api
 {
   public function get($id)
   {
     try {
-      return json_encode(MUser::getByID($id));
+      return Response::json(MUser::getByID($id));
     } catch (Exception $err) {
       switch ($err->getMessage()) {
         case "NotFound":
@@ -22,14 +25,14 @@ class User
     }
   }
 
-  public function post($id)
+  public function patch($id)
   {
-    $username = Input::post("username");
+    $username = Input::patch("username");
-    $password = Input::post("password");
+    $password = Input::patch("password");
     $image = Input::file("image");
 
     try {
-      return json_encode(MUser::getByID($id)->update($username, $password, $image));
+      return Response::json(MUser::getByID($id)->update($username, $password, $image));
     } catch (Exception $err) {
       switch ($err->getMessage()) {
         case "NotFound":
@@ -46,15 +49,15 @@ class User
     }
   }
 
-  public function postSelf()
+  public function patchSelf()
   {
-    $token = Input::header("token");
+    $token = Request::header("token");
-    $username = Input::post("username");
+    $username = Input::patch("username");
-    $password = Input::post("password");
+    $password = Input::patch("password");
     $image = Input::file("image");
 
     try {
-      return json_encode(MUser::getByToken($token)->update($username, $password, $image));
+      return Response::json(MUser::getByToken($token)->update($username, $password, $image));
     } catch (Exception $err) {
       switch ($err->getMessage()) {
         case "NotFound":
@@ -70,4 +73,18 @@ class User
       }
     }
   }
+
+  public function delete($id)
+  {
+    try {
+      return Response::json(MUser::getByID($id)->delete());
+    } catch (Exception $err) {
+      switch ($err->getMessage()) {
+        case "NotFound":
+          throw new Exception("User not Found", 404);
+        default:
+          throw $err;
+      }
+    }
+  }
 }

exam/api/docs/api.yaml

@@ -126,12 +126,12 @@ paths:
                   value: { "message": "User not Found" }
       tags:
         - User
-    post:
+    patch:
       summary: Update user
       description:
         Update user with ID. Fields are updated in order username, password, image. If one fails, subsequent are not updated. <br>
         Use special ID <code>self</code> to update logged in user. <br>
-        Requires logged in user to have admin permissions for any ID other than <code>self</code>. <br>
+        Requires logged in user to have admin permissions for any ID other than <code>self</code>.
       security:
         - BasicAuth: []
       parameters:
@@ -177,17 +177,48 @@ paths:
                   value: { "message": "Failed to update username" }
       tags:
         - User
+    delete:
+      summary: Delete user
+      description: Delete user with ID. <br>
+        Requires logged in user to have admin permissions.
+      security:
+        - BasicAuth: []
+      parameters:
+        - name: id
+          in: path
+          description: User ID
+          required: true
+          schema:
+            type: integer
+            format: int14
+      responses:
+        200:
+          description: Success
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/BooleanResponse"
+              examples:
+                Success:
+                  value: true
+        404:
+          description: User not Found
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ErrorResponse"
+              examples:
+                User not Found:
+                  value: { "message": "User not Found" }
+      tags:
+        - User
 
 externalDocs:
   url: https://khofmann.userpage.fu-berlin.de/phpCourse/exam/api/docs/
 security: []
 servers:
   - url: https://khofmann.userpage.fu-berlin.de/phpCourse/exam/api/
-    description: ""
-    variables: {}
 components:
-  links: {}
-  callbacks: {}
   schemas:
     BooleanResponse:
       type: boolean

exam/classes/Api/Api.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Khofmann\Api;
+
+use Khofmann\Response\Response;
+
+class Api
+{
+  public function __construct()
+  {
+    Response::response()->header("Cache-control: no-cache");
+  }
+}

exam/classes/Auth/AdminAuth.php

@@ -6,6 +6,7 @@ use Exception;
 use Pecee\Http\Middleware\IMiddleware;
 use Pecee\Http\Request;
 use Khofmann\Models\User\User;
+use Khofmann\Response\Response;
 
 class AdminAuth implements IMiddleware
 {
@@ -15,17 +16,17 @@ class AdminAuth implements IMiddleware
 
     // No token
     if ($token === null) {
-      response()->httpCode(401)->json(["message" => "Not Authorized"]);
+      Response::response()->httpCode(401)->json(["message" => "Not Authorized"]);
     }
 
     try {
       $user = User::getByToken($token);
       if (!$user->getIsAdmin()) {
-        response()->httpCode(401)->json(["message" => "Not Authorized"]);
+        Response::response()->httpCode(401)->json(["message" => "Not Authorized"]);
       }
     } catch (Exception $err) {
       // No user with this token exists
-      response()->httpCode(401)->json(["message" => "Not Authorized"]);
+      Response::response()->httpCode(401)->json(["message" => "Not Authorized"]);
     }
   }
 }

exam/classes/Auth/Auth.php

@@ -6,6 +6,7 @@ use Exception;
 use Pecee\Http\Middleware\IMiddleware;
 use Pecee\Http\Request;
 use Khofmann\Models\User\User;
+use Khofmann\Response\Response;
 
 class Auth implements IMiddleware
 {
@@ -15,14 +16,14 @@ class Auth implements IMiddleware
 
     // No token
     if ($token === null) {
-      response()->httpCode(401)->json(["message" => "Not Authorized"]);
+      Response::response()->httpCode(401)->json(["message" => "Not Authorized"]);
     }
 
     try {
       User::getByToken($token);
     } catch (Exception $err) {
       // No user with this token exists
-      response()->httpCode(401)->json(["message" => "Not Authorized"]);
+      Response::response()->httpCode(401)->json(["message" => "Not Authorized"]);
     }
   }
 }

exam/classes/Input/Input.php

@@ -2,25 +2,29 @@
 
 namespace Khofmann\Input;
 
+use Khofmann\Request\Request;
+
 class Input
 {
-  public static function header($name, $defaultValue = null, $tryParse = true)
+
-  {
-    return request()->getHeader($name, $defaultValue, $tryParse);
-  }
 
   public static function post($index, $defaultValue = null)
   {
-    return request()->getInputHandler()->post($index, $defaultValue);
+    return Request::request()->getInputHandler()->post($index, $defaultValue);
+  }
+
+  public static function patch($index, $defaultValue = null)
+  {
+    return Request::request()->getInputHandler()->post($index, $defaultValue);
   }
 
   public static function get($index, $defaultValue = null)
   {
-    return request()->getInputHandler()->get($index, $defaultValue);
+    return Request::request()->getInputHandler()->get($index, $defaultValue);
   }
 
   public static function file($index, $defaultValue = null)
   {
-    return request()->getInputHandler()->file($index, $defaultValue);
+    return Request::request()->getInputHandler()->file($index, $defaultValue);
   }
 }

exam/classes/Models/User/User.php

@@ -18,8 +18,9 @@ class User implements JsonSerializable
   private ?string $image;
   private bool $isAdmin;
   private DateTime $memberSince;
+  private int $postCount;
 
-  protected function __construct(int $id, string $username, int $status, string $email, string $timestamp, string $image, bool $isAdmin)
+  protected function __construct(int $id, string $username, int $status, string $email, string $timestamp, ?string $image, bool $isAdmin)
   {
     $this->id = $id;
     $this->username = $username;
@@ -171,6 +172,14 @@ class User implements JsonSerializable
     return true;
   }
 
+  public function delete()
+  {
+    $db = Database::getInstance();
+    $stmt = $db->prepare("DELETE FROM egb_benutzer WHERE id = :ID");
+    $stmt->bindValue(":ID", $this->id);
+    return $stmt->execute();
+  }
+
   /*
   * Getters
   */

exam/classes/Request/Reques.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Khofmann\Request;
+
+use Pecee\Http\Request as PRequest;
+use Pecee\SimpleRouter\SimpleRouter;
+
+class Request
+{
+  public static function request(): PRequest
+  {
+    return SimpleRouter::request();
+  }
+
+  public static function header($name, $defaultValue = null, $tryParse = true)
+  {
+    return request()->getHeader($name, $defaultValue, $tryParse);
+  }
+}

exam/classes/Response/Response.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Khofmann\Response;
+
+use Pecee\SimpleRouter\SimpleRouter;
+use Pecee\Http\Response as PResponse;
+
+class Response
+{
+  public static function response(): PResponse
+  {
+    return SimpleRouter::response();
+  }
+
+  public static function json($value, int $options = 0, int $dept = 512)
+  {
+    return SimpleRouter::response()->json($value, $options, $dept);
+  }
+}

exam/routes/routes.php

@@ -2,10 +2,11 @@
 // Namespaces
 use Pecee\SimpleRouter\SimpleRouter;
 use Pecee\Http\Request;
+use Khofmann\Response\Response;
 // Error handling
 SimpleRouter::error(function (Request $request, Exception $exception) {
   $code = $exception->getCode();
-  response()->httpCode(is_int($code) ? $code : 500)->json(["message" => $exception->getMessage()]);
+  Response::response()->httpCode(is_int($code) ? $code : 500)->json(["message" => $exception->getMessage()]);
 });
 // Index
 SimpleRouter::all("/", function () {
@@ -26,12 +27,14 @@ SimpleRouter::group(["middleware" => \Khofmann\Auth\Auth::class], function () {
   // Get any user
   SimpleRouter::get("/user/{id}", [Api\User\User::class, "get"]);
   // Update self
-  SimpleRouter::post("/user/self", [Api\User\User::class, "postSelf"]);
+  SimpleRouter::patch("/user/self", [Api\User\User::class, "patchSelf"]);
 });
 /*
 * Admin Auth routes
 */
 SimpleRouter::group(["middleware" => \Khofmann\Auth\AdminAuth::class], function () {
   // Update any user
-  SimpleRouter::post("/user/{id}", [Api\User\User::class, "post"]);
+  SimpleRouter::patch("/user/{id}", [Api\User\User::class, "patch"]);
+  // Delete any user
+  SimpleRouter::delete("/user/{id}", [Api\User\User::class, "delete"]);
 });

exam/utils/helpers.php

@@ -2,8 +2,6 @@
 
 use Pecee\SimpleRouter\SimpleRouter as Router;
 use Pecee\Http\Url;
-use Pecee\Http\Response;
-use Pecee\Http\Request;
 
 /**
  * Get url for a route by using either name/alias, class or method name.
@@ -28,22 +26,6 @@ function url(?string $name = null, $parameters = null, ?array $getParams = null)
     return Router::getUrl($name, $parameters, $getParams);
 }
 
-/**
- * @return \Pecee\Http\Response
- */
-function response(): Response
-{
-    return Router::response();
-}
-
-/**
- * @return \Pecee\Http\Request
- */
-function request(): Request
-{
-    return Router::request();
-}
-
 /**
  * @param string $url
  * @param int|null $code