andela-iadeniyi / emojinaija

api/Controllers/AuthController.php

Unused Use Statements -2 removed lines

@@ -11,10 +11,8 @@
 namespace Ibonly\NaijaEmoji;
 
 use Exception;
-use Slim\Slim;
 use Dotenv\Dotenv;
 use Firebase\JWT\JWT;
-use Ibonly\NaijaEmoji\User;
 use Ibonly\NaijaEmoji\AuthInterface;
 use Ibonly\NaijaEmoji\InvalidTokenException;
 

Spacing +8 added lines, -8 removed lines

@@ -25,7 +25,7 @@ 
     protected $auth_url;
     protected $issued_by;
 
-    public function __construct ()
+    public function __construct()
     {
         $this->loadEnv();
         $this->key        = getenv('ISSUE_KEY');
@@ -38,7 +38,7 @@ 
      *
      * @return string
      */
-    public function getKey ()
+    public function getKey()
     {
         return $this->key;
     }
@@ -70,9 +70,9 @@ 
      *
      * @return string
      */
-    public function authorizationEncode ($userID)
+    public function authorizationEncode($userID)
     {
-        if ( ! is_null($userID) )
+        if (!is_null($userID))
             $token = array(
                 "iss" => $this->getIssuedBy(),
                 "aud" => $this->getAuthUrl(),
@@ -89,20 +89,20 @@ 
      *
      * @return json
      */
-    public function authorizationDecode ($token)
+    public function authorizationDecode($token)
     {
         try
         {
             return JWT::decode($token, $this->getKey(), array('HS256'));
-        } catch ( Exception $e) {
+        } catch (Exception $e) {
             throw new InvalidTokenException();
         }
 
     }
 
-    protected function loadEnv ()
+    protected function loadEnv()
     {
-        if( ! getenv("APP_ENV" !== "production"))
+        if (!getenv("APP_ENV" !== "production"))
         {
             $dotenv = new Dotenv($_SERVER['DOCUMENT_ROOT']);
             $dotenv->load();

Braces +3 added lines, -2 removed lines

@@ -72,13 +72,14 @@
      */
     public function authorizationEncode ($userID)
     {
-        if ( ! is_null($userID) )
-            $token = array(
+        if ( ! is_null($userID) ) {
+                    $token = array(
                 "iss" => $this->getIssuedBy(),
                 "aud" => $this->getAuthUrl(),
                 "user" => $userID,
                 "exp" => time() + 3600
             );
+        }
             return JWT::encode($token, $this->getKey());
     }
 

api/Controllers/EmojiController.php

Doc Comments +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
      *
      * @param  $app
      *
-     * @return json
+     * @return string|null
      */
     public function getAllEmoji (Slim $app)
     {
@@ -61,7 +61,7 @@ 
      * @param  $id
      * @param  $app
      *
-     * @return json
+     * @return string|null
      */
     public function findEmoji ($id, Slim $app)
     {

Braces +18 added lines, -12 removed lines

@@ -92,8 +92,9 @@ 
         $tokenData = $app->request->headers->get('Authorization');
         try
         {
-            if ( ! isset( $tokenData ) )
-                throw new ProvideTokenException();
+            if ( ! isset( $tokenData ) ) {
+                            throw new ProvideTokenException();
+            }
 
             $data = $this->auth->authorizationDecode($tokenData);
             $this->dataName->id = NULL;
@@ -106,8 +107,9 @@ 
             $this->dataName->created_by = $data->user;
 
             $save = $this->dataName->save();
-            if ( $save )
-                $app->halt(200, json_encode(['Message' => 'Success']));
+            if ( $save ) {
+                            $app->halt(200, json_encode(['Message' => 'Success']));
+            }
         } catch ( ExpiredException $e ){
             $app->halt(401, json_encode(['Message' => 'Not Authorized']));
         } catch ( SaveUserExistException $e ){
@@ -133,8 +135,9 @@ 
         $tokenData = $app->request->headers->get('Authorization');
         try
         {
-            if ( ! isset($tokenData) )
-                throw new ProvideTokenException();
+            if ( ! isset($tokenData) ) {
+                            throw new ProvideTokenException();
+            }
 
             $find = Emoji::find($id);
             $this->auth->authorizationDecode($tokenData);
@@ -145,8 +148,9 @@ 
             }
             $find->date_modified = date('Y-m-d G:i:s');
             $update = $find->update();
-            if( $update )
-                $app->halt(200, json_encode(['Message' => 'Emoji Updated Successfully']));
+            if( $update ) {
+                            $app->halt(200, json_encode(['Message' => 'Emoji Updated Successfully']));
+            }
         } catch ( ExpiredException $e ){
             $app->halt(401, json_encode(['Message' => 'Not Authorized']));
         } catch ( SaveUserExistException $e ){
@@ -174,13 +178,15 @@ 
         $tokenData = $app->request->headers->get('Authorization');
         try
         {
-            if ( ! isset($tokenData) )
-                throw new ProvideTokenException();
+            if ( ! isset($tokenData) ) {
+                            throw new ProvideTokenException();
+            }
 
             $this->auth->authorizationDecode($tokenData);
             $deleted = $this->dataName->destroy($id);
-            if ( $deleted )
-                $app->halt(200, json_encode(['Message' => 'Emoji Deleted']));
+            if ( $deleted ) {
+                            $app->halt(200, json_encode(['Message' => 'Emoji Deleted']));
+            }
         } catch ( ExpiredException $e ){
             $app->halt(401, json_encode(['Message' => 'Not Authorized']));
         } catch ( InvalidTokenException $e ){

Spacing +30 added lines, -30 removed lines

@@ -27,7 +27,7 @@ 
     protected $dataName;
     protected $auth;
 
-    public function __construct ()
+    public function __construct()
     {
         $this->dataName = new Emoji();
         $this->auth = new AuthController();
@@ -40,18 +40,18 @@ 
      *
      * @return json
      */
-    public function getAllEmoji (Slim $app)
+    public function getAllEmoji(Slim $app)
     {
         $app->response->headers->set('Content-Type', 'application/json');
         try
         {
             $data = $this->dataName->getAll()->toJson();
             $newData = json_decode($data);
-            foreach ( $newData as $key ) {
+            foreach ($newData as $key) {
                 $key->keywords = explode(", ", $key->keywords);
             }
             return json_encode($newData);
-        } catch ( EmptyDatabaseException $e ) {
+        } catch (EmptyDatabaseException $e) {
             $app->halt(204, json_encode(['Message' => 'No content']));
         }
     }
@@ -64,18 +64,18 @@ 
      *
      * @return json
      */
-    public function findEmoji ($id, Slim $app)
+    public function findEmoji($id, Slim $app)
     {
         $app->response->headers->set('Content-Type', 'application/json');
         try
         {
-            $data =  $this->dataName->where(['id' => $id])->toJson();
+            $data = $this->dataName->where(['id' => $id])->toJson();
             $newData = json_decode($data);
-            foreach ( $newData as $key ) {
+            foreach ($newData as $key) {
                 $key->keywords = explode(", ", $key->keywords);
             }
             return json_encode($newData);
-        } catch ( DataNotFoundException $e ) {
+        } catch (DataNotFoundException $e) {
             $app->halt(404, json_encode(['Message' => 'Not Found']));
         }
     }
@@ -87,13 +87,13 @@ 
      *
      * @return json
      */
-    public function insertEmoji (Slim $app)
+    public function insertEmoji(Slim $app)
     {
         $app->response->headers->set('Content-Type', 'application/json');
         $tokenData = $app->request->headers->get('Authorization');
         try
         {
-            if ( ! isset( $tokenData ) )
+            if (!isset($tokenData))
                 throw new ProvideTokenException();
 
             $data = $this->auth->authorizationDecode($tokenData);
@@ -107,15 +107,15 @@ 
             $this->dataName->created_by = $data->user;
 
             $save = $this->dataName->save();
-            if ( $save )
+            if ($save)
                 $app->halt(200, json_encode(['Message' => 'Success']));
-        } catch ( ExpiredException $e ){
+        } catch (ExpiredException $e) {
             $app->halt(401, json_encode(['Message' => 'Token has expired']));
-        } catch ( DataAlreadyExistException $e ){
+        } catch (DataAlreadyExistException $e) {
             $app->halt(202, json_encode(['Message' => 'Not Created']));
-        } catch ( InvalidTokenException $e ){
+        } catch (InvalidTokenException $e) {
             $app->halt(405, json_encode(['Message' => 'Invalid Token']));
-        } catch ( ProvideTokenException $e ){
+        } catch (ProvideTokenException $e) {
             $app->halt(406, json_encode(['Message' => 'Enter a valid Token']));
         }
     }
@@ -128,35 +128,35 @@ 
      *
      * @return json
      */
-    public function updateEmoji ($id, Slim $app)
+    public function updateEmoji($id, Slim $app)
     {
         $app->response->headers->set('Content-Type', 'application/json');
         $tokenData = $app->request->headers->get('Authorization');
         try
         {
-            if ( ! isset($tokenData) )
+            if (!isset($tokenData))
                 throw new ProvideTokenException();
 
             $find = Emoji::find($id);
             $this->auth->authorizationDecode($tokenData);
             $fields = $app->request->isPut() ? $app->request->put() : $app->request->patch();
-            foreach ( $fields as $key => $value )
+            foreach ($fields as $key => $value)
             {
                 $find->$key = $value;
             }
             $find->date_modified = date('Y-m-d G:i:s');
             $update = $find->update();
-            if( $update )
+            if ($update)
                 $app->halt(200, json_encode(['Message' => 'Emoji Updated Successfully']));
-        } catch ( ExpiredException $e ){
+        } catch (ExpiredException $e) {
             $app->halt(401, json_encode(['Message' => 'Token has expired']));
-        } catch ( DataAlreadyExistException $e ){
+        } catch (DataAlreadyExistException $e) {
             $app->halt(304, json_encode(['Message' => 'Not Modified']));
-        } catch ( DataNotFoundException $e ){
+        } catch (DataNotFoundException $e) {
             $app->halt(304, json_encode(['Message' => 'Invalid Credential supplied']));
-        } catch ( InvalidTokenException $e ){
+        } catch (InvalidTokenException $e) {
             $app->halt(405, json_encode(['Message' => 'Invalid Token']));
-        } catch ( ProvideTokenException $e ){
+        } catch (ProvideTokenException $e) {
             $app->halt(406, json_encode(['Message' => 'Enter a valid Token']));
         }
     }
@@ -169,24 +169,24 @@ 
      *
      * @return json
      */
-    public function deleteEmoji ($id, Slim $app)
+    public function deleteEmoji($id, Slim $app)
     {
         $app->response->headers->set('Content-Type', 'application/json');
         $tokenData = $app->request->headers->get('Authorization');
         try
         {
-            if ( ! isset($tokenData) )
+            if (!isset($tokenData))
                 throw new ProvideTokenException();
 
             $this->auth->authorizationDecode($tokenData);
             $deleted = $this->dataName->destroy($id);
-            if ( $deleted )
+            if ($deleted)
                 $app->halt(200, json_encode(['Message' => 'Emoji Deleted']));
-        } catch ( ExpiredException $e ){
+        } catch (ExpiredException $e) {
             $app->halt(401, json_encode(['Message' => 'Token has expired']));
-        } catch ( InvalidTokenException $e ){
+        } catch (InvalidTokenException $e) {
             $app->halt(405, json_encode(['Message' => 'Invalid Token']));
-        } catch ( ProvideTokenException $e ){
+        } catch (ProvideTokenException $e) {
             $app->halt(406, json_encode(['Message' => 'Enter a valid Token']));
         }
     }

api/Controllers/UserController.php

Doc Comments +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
      *
      * @param  $app
      *
-     * @return json
+     * @return string|null
      */
     public function login (Slim $app)
     {

Braces +3 added lines, -2 removed lines

@@ -94,8 +94,9 @@
         $tokenData = $app->request->headers->get('Authorization');
         try
         {
-            if ( ! isset( $tokenData ) )
-                throw new ProvideTokenException();
+            if ( ! isset( $tokenData ) ) {
+                            throw new ProvideTokenException();
+            }
 
             $checkUser = $this->user->where(['username' => $tokenData->user])->all();
             if( ! empty ($checkUser) ){

Spacing +12 added lines, -12 removed lines

@@ -36,7 +36,7 @@ 
      *
      * @return json
      */
-    public function createUser (Slim $app)
+    public function createUser(Slim $app)
     {
         $username = $app->request->params('username');
         $this->user->id = NULL;
@@ -45,7 +45,7 @@ 
         $this->user->date_created = date('Y-m-d H:i:s');
 
         $save = $this->user->save();
-        if( $save )
+        if ($save)
         {
             $app->halt(201, json_encode(['message' => 'Registration Successful. Please Login to generate your token']));
         }
@@ -58,7 +58,7 @@ 
      *
      * @return json
      */
-    public function login (Slim $app)
+    public function login(Slim $app)
     {
         $app->response->headers->set('Content-Type', 'application/json');
         $username = $app->request->params('username');
@@ -66,7 +66,7 @@ 
         try
         {
             $login = $this->user->where(['username' => $username, 'password' => md5($password)], 'AND')->toJson();
-            if( ! empty ($login) ){
+            if (!empty ($login)) {
                 $output = json_decode($login);
                 foreach ($output as $key) {
                     $output = $key->id;
@@ -76,7 +76,7 @@ 
                     'Authorization' => $this->auth->authorizationEncode($username)
                 ]));
             }
-        } catch ( DataNotFoundException $e) {
+        } catch (DataNotFoundException $e) {
             $app->halt(404, json_encode(['message' => 'Not Found']));
         }
     }
@@ -88,25 +88,25 @@ 
      *
      * @return json
      */
-    public function logout (Slim $app)
+    public function logout(Slim $app)
     {
         $app->response->headers->set('Content-Type', 'application/json');
         $tokenData = $app->request->headers->get('Authorization');
         try
         {
-            if ( ! isset( $tokenData ) )
+            if (!isset($tokenData))
                 throw new ProvideTokenException();
 
             $checkUser = $this->user->where(['username' => $tokenData->user])->toJson();
-            if( ! empty ($checkUser) ){
-                $this->auth->authorizationEncode(NULL);#
+            if (!empty ($checkUser)) {
+                $this->auth->authorizationEncode(NULL); #
                 $app->halt(200, json_encode(['message' => 'Logged out Successfully']));
             }
-        } catch ( DataNotFoundException $e) {
+        } catch (DataNotFoundException $e) {
             $app->halt(404, json_encode(['message' => 'Not Found']));
-        } catch ( InvalidTokenException $e ){
+        } catch (InvalidTokenException $e) {
             $app->halt(405, json_encode(['Message' => 'Invalid Token']));
-        } catch ( ProvideTokenException $e ){
+        } catch (ProvideTokenException $e) {
             $app->halt(406, json_encode(['Message' => 'Enter a valid Token']));
         }
     }

api/Interface/AuthInterface.php

Spacing +3 added lines, -3 removed lines

@@ -12,14 +12,14 @@
 
 interface AuthInterface
 {
-    public function getKey ();
+    public function getKey();
 
     public function getIssuedBy();
 
     public function getAuthUrl();
 
-    public function authorizationEncode ($username);
+    public function authorizationEncode($username);
 
-    public function authorizationDecode ($token);
+    public function authorizationDecode($token);
 
 }
\ No newline at end of file

api/Interface/EmojiInterface.php

Spacing +5 added lines, -5 removed lines

@@ -14,13 +14,13 @@
 
 interface EmojiInterface
 {
-    public function getAllEmoji (Slim $app);
+    public function getAllEmoji(Slim $app);
 
-    public function findEmoji ($id, Slim $app);
+    public function findEmoji($id, Slim $app);
 
-    public function insertEmoji (Slim $app);
+    public function insertEmoji(Slim $app);
 
-    public function updateEmoji ($id, Slim $app);
+    public function updateEmoji($id, Slim $app);
 
-    public function deleteEmoji ($id, Slim $app);
+    public function deleteEmoji($id, Slim $app);
 }
\ No newline at end of file

api/Interface/UserInterface.php

Spacing +3 added lines, -3 removed lines

@@ -15,9 +15,9 @@
 interface UserInterface
 {
 
-    public function createUser (Slim $app);
+    public function createUser(Slim $app);
 
-    public function login (Slim $app);
+    public function login(Slim $app);
 
-    public function logout (Slim $app);
+    public function logout(Slim $app);
 }
\ No newline at end of file

index.php

Spacing +5 added lines, -5 removed lines

@@ -14,11 +14,11 @@ 
 /**
  * Emoji Route
  */
-$app->get('/emojis', function () use ($emoji, $app) {
+$app->get('/emojis', function() use ($emoji, $app) {
     echo $emoji->getAllEmoji($app);
 });
 
-$app->get('/emojis/:id', function ($id) use ($emoji, $app) {
+$app->get('/emojis/:id', function($id) use ($emoji, $app) {
     echo $emoji->findEmoji($id, $app);
 });
 
@@ -41,14 +41,14 @@ 
 /**
  * User Route
  */
-$app->post('/register', function () use ($user, $app) {
+$app->post('/register', function() use ($user, $app) {
     echo $user->createUser($app);
 });
 
-$app->post('/auth/login', function () use ($user, $app) {
+$app->post('/auth/login', function() use ($user, $app) {
     echo $user->login($app);
 });
-$app->get('/auth/logout', function () use ($user, $app) {
+$app->get('/auth/logout', function() use ($user, $app) {
     echo $user->logout($app);
 });
 

d.php

Spacing +3 added lines, -3 removed lines

@@ -8,16 +8,16 @@
 
 $request = $client->get('/emojis');
 // $request->setAuth('user', 'pass');
-echo $request->getUrl()."<br />";
+echo $request->getUrl() . "<br />";
 // >>> https://api.github.com/user
 
 // You must send a request in order for the transfer to occur
 $response = $request->send();
 
-echo $response->getBody()."<br />";
+echo $response->getBody() . "<br />";
 // >>> {"type":"User", ...
 
-echo $response->getHeader('Content-Length')."<br />";
+echo $response->getHeader('Content-Length') . "<br />";
 // >>> 792
 
 $data = $response->json();

test/RoutesTest.php

Indentation +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
     /**
      * Test Post endpoint
      */
-   public function testPOSTEmoji()
+    public function testPOSTEmoji()
     {
         // create our http client (Guzzle)
         $data = array(