Merge branch 'master' of github.com:marvinborner/SocialNetwork

3 files changed, 72 insertions, 6 deletions

diff --git a/main/app/sprinkles/admin/src/Controller/PostController.php b/main/app/sprinkles/admin/src/Controller/PostController.php
index 2441be4..98bee5a 100644
--- a/main/app/sprinkles/admin/src/Controller/PostController.php
+++ b/main/app/sprinkles/admin/src/Controller/PostController.php
@@ -79,9 +79,8 @@ class PostController extends SimpleController
             $uploadedFile->moveTo(__DIR__ . '/../../../../../uploads' . DIRECTORY_SEPARATOR . $filename);
 
             // Store in Database
-            DB::table('image_posts')->insert(
-                ['UserID' => $currentUser->id, 'File' => $filename]
-            );
+            DB::table('image_posts')
+                ->insert(['UserID' => $currentUser->id, 'File' => $filename]);
 
             $response->write('Uploaded successfully! <br/>');
         }
diff --git a/main/app/sprinkles/admin/src/Controller/UserController.php b/main/app/sprinkles/admin/src/Controller/UserController.php
index 46d0f0f..be98f02 100644
--- a/main/app/sprinkles/admin/src/Controller/UserController.php
+++ b/main/app/sprinkles/admin/src/Controller/UserController.php
@@ -231,6 +231,73 @@ class UserController extends SimpleController
         return $response->withStatus(200);
     }
 
+
+    /**
+     * Sets the users public key
+     * Request type: POST
+     */
+    public function setPublicKey($request, $response, $args) {
+        $requestedUser = $this->getUserFromParams($args);
+
+        if (!$requestedUser) {
+            throw new NotFoundException($request, $response);
+        }
+
+        $PublicKey = $request->getParsedBody()["PublicKey"];
+
+        if ($this->ci->currentUser->id === $requestedUser->id && (Capsule::table('public_keys')
+                ->where('UserID', "=", $requestedUser->id)
+                ->exists()) === FALSE) {
+            Capsule::table('public_keys')
+                ->insert(['UserID' => $requestedUser->id, 'Key' => substr(substr($PublicKey, 100), 0,-40)]);
+            return $response->withStatus(200);
+        } else if ($this->ci->currentUser->id === $requestedUser->id) {
+            Capsule::table('public_keys')
+                ->where('UserID', $requestedUser->id)
+                ->update(['Key' => substr(substr($PublicKey, 100), 0,-40)]);
+            return $response->withStatus(200);
+        } else {
+            throw new ForbiddenException();
+        }
+    }
+
+    /**
+     * Gets the users public key
+     * Request type: GET
+     */
+    public function getPublicKey($request, $response, $args) {
+        $requestedUser = $this->getUserFromParams($args);
+
+        if (!$requestedUser) {
+            throw new NotFoundException($request, $response);
+        }
+
+        if ((Capsule::table('public_keys')
+                ->where('UserID', "=", $requestedUser->id)
+                ->exists()) === TRUE) {
+
+            $RawPublicKey = Capsule::table('public_keys')
+                ->where('UserID', "=", $requestedUser->id)
+                ->value('Key');
+            $PublicKey = "-----BEGIN PGP PUBLIC KEY BLOCK-----\nVersion: OpenPGP.js v3.0.9\nComment: https://openpgpjs.org\n\n" . $RawPublicKey . "\n-----END PGP PUBLIC KEY BLOCK-----";
+
+            $ContentType = explode(',', $request->getHeaderLine('Accept'))[0];
+            switch ($ContentType) {
+                case 'application/json':
+                    $response->write(json_encode(array('user_id' => $requestedUser->id, 'PublicKey' => $PublicKey)));
+                    break;
+                case 'text/html':
+                    $response->write("<pre>" . $PublicKey);
+                    break;
+                default:
+                    $response->write($PublicKey);
+            }
+            return $response->withStatus(200);
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
     /**
      * Processes the request to delete an existing user.
      *
diff --git a/main/app/sprinkles/admin/src/Controller/WormholeController.php b/main/app/sprinkles/admin/src/Controller/WormholeController.php
index 2ed7e68..d70fbbc 100644
--- a/main/app/sprinkles/admin/src/Controller/WormholeController.php
+++ b/main/app/sprinkles/admin/src/Controller/WormholeController.php
@@ -83,9 +83,9 @@ class WormholeController extends SimpleController
     private function verifyAccessToken($args) {
         $currentUser = $this->ci->currentUser; // FOR DATABASE QUERY
         $access_token = $args['access_token'];
-        if (DB::table('public_keys')
-            ->where('UserID', 1)
-            ->where('Key', '=', $access_token)
+        if (DB::table('access_token')
+            ->where('id', 1)
+            ->where('token', '=', $access_token)
             ->exists()) {
             return true;
         } else {