Documentation/Dokumentation.md

@@ -13,7 +13,7 @@ Eine auflistung von allen Funktionen und API-Endpunkten mit Erklärung.
 
 ### User erstellen
 ```shell
-POST 127.0.0.1/DirektiveDesDons/user
+POST 127.0.0.1/DirektiveDesDons/signup
 
 BODY
 {
@@ -119,7 +119,7 @@ DELETE 127.0.0.1/DirektiveDesDons/ingredient/1
 
 ### Zutat ändern
 ```shell
-PUT 127.0.0.1/DirektiveDesDons/ingredient/3
+POST 127.0.0.1/DirektiveDesDons/ingredient/3
 
 BODY
 {
@@ -150,21 +150,6 @@ BODY
 }
 ```
 
-### Einheit ausgeben
-```shell
-GET 127.0.0.1/DirektiveDesDons/unit/4
-```
-
-###Einheit ändern
-```shell
-PUT 127.0.0.1/DirektiveDesDons/unit/4
-
-BODY
-{
-  "name":"Tonne"
-}
-```
-
 ### Einheit löschen
 ```shell
 DELETE 127.0.0.1/DirektiveDesDons/unit/4

User.php

@@ -18,13 +18,11 @@ class User {
         return true;
     }
     public function loginWithUsername(string $username, string $password) : string {
-        $query = $this->db->select("utente", ["nomeUtente" => $username]);
+        $userObject = $this->db->select("utente", ["nomeUtente" => $username])[0];
 
-        if(!$query){
+        if(!$userObject){
             return false;
         }
-        $userObject = $query[0];
-
         $this->id = $userObject["id"];
         $this->username = $userObject["nomeUtente"];
         $this->email = $userObject["email"];
@@ -40,12 +38,10 @@ class User {
         return $this->token;
     }
     public function loginWithToken(string $token){
-        $query = $this->db->select("utente", ["gettone" => $token]);
-        if(!$query){
+        $userObject = $this->db->select("utente", ["gettone" => $token])[0];
+        if(!$userObject){
             return false;
         }
-        $userObject = $query[0];
-
         $this->id = $userObject["id"];
         $this->username = $userObject["nomeUtente"];
         $this->email = $userObject["email"];

index.php

@@ -48,22 +48,22 @@ $app->get("/", function (array $req, Response $res) use ($db) {
 /*
  * User
  */
-$app->route("/user")
-    ->get(function (array $req, Response $res) {
-        if (isset($req["user"])) {
-            $res->json(["id" => $req["user"]->id, "username" => $req["user"]->username, "email" => $req["user"]->email]);
-        } else {
-            $res->json(["status" => HTTP_STATUS_CODE::FORBIDDEN, "message" => "You are not logged in. Goto '/login' to login"]);
-        }
-    })
-    ->post(function (array $req, Response $res) use ($db) {
-        $newUsername = $req["body"]["username"];
-        $newPassword = $req["body"]["password"];
-        $newEmail = $req["body"]["email"];
-        $db->insert("utente", ["email" => "$newEmail", "parolaDordine" => "$newPassword", "nomeUtente" => "$newUsername"]);
+$app->get("/user", function (array $req, Response $res) {
+    if (isset($req["user"])) {
+        $res->json(["id" => $req["user"]->id, "username" => $req["user"]->username, "email" => $req["user"]->email]);
+    } else {
+        $res->json(["status" => HTTP_STATUS_CODE::FORBIDDEN, "message" => "You are not logged in. Goto '/login' to login"]);
+    }
+});
+$app->post("/signup", function (array $req, Response $res) use ($db) {
+    $newUsername = $req["body"]["username"];
+    $newPassword = $req["body"]["password"];
+    $newEmail = $req["body"]["email"];
+    $db->insert("utente", ["email" => "$newEmail", "parolaDordine" => "$newPassword", "nomeUtente" => "$newUsername"]);
+
+    $res->send("Account Created", HTTP_STATUS_CODE::CREATED);
+});
 
-        $res->send("Account Created", HTTP_STATUS_CODE::CREATED);
-    });
 $app->post("/login", function (array $req, Response $res) use ($db) {
     $username = $req["body"]["username"];
     $password = $req["body"]["password"];