Merge remote-tracking branch 'origin/master'

# Conflicts:
#	init

Author: Angel Garcia

.idea/yii2-api-template.iml

@@ -74,6 +74,20 @@ return [
 - Check and edit the other files in the `config/` directory to customize your application as required.
 - Refer to the README in the `tests` directory for information specific to basic application tests.
 
+### Running in Apache
+
+Edit the Apache configuration file, this can be found in ```/etc/apache2/apache2.conf``` 
+
+Inside the security model section make sure to change the AllowOverride option from **None** to **All**
+so it looks like this
+```
+<Directory /var/www/>
+   	Options Indexes FollowSymLinks
+   	AllowOverride All
+   	Require all granted
+</Directory>
+```
+
 DIRECTORY STRUCTURE
 -------------------
 
@@ -111,6 +125,13 @@ To extract your app messages you can do so using the [message command](https://w
 
 ```./yii message messages/config-messages.php```
 
+To scan the tree 'sourcePath' to generate files default for labels used in the code  execute the following command 
+```./yii message/extract @app/messages/config-messages.php ```
+
+To change target lenguage for example to spanish use 
+```Yii::$app->language = 'es';```
+
+
 ### Applying migrations
 
 The migrations can be found in ```@console/migrations``` .  The initial migration named ```m130524_201442_init.php``` contains the user table creation script, including the following aditions to 
@@ -123,4 +144,9 @@ created_at      int(13) - Time of creation
 updated_at      int(13) - Time of creation
 created_by      string(13) - id of the user that created the record
 updated_by      string(13) - id of the last user that updated the record
-```
+```
+To apply the migrations execute the command
+```./yii migrate```
+
+To revert the migrations execute the command 
+```./yii migrate/down```

README.md

@@ -5,6 +5,7 @@
         'pluralize' => false,
         'extraPatterns' => [
             'GET status' => 'status',
+            'POST signup' => 'signup',
         ],
         'except' => ['create', 'delete', 'update', 'view', 'index'],
     ],

api/config/urlRules.php

@@ -4,8 +4,31 @@
 
 
 use base\rest\ActiveController;
+use yii\filters\auth\CompositeAuth;
+use yii\filters\auth\HttpBearerAuth;
+use yii\helpers\ArrayHelper;
 
 class UserController extends ActiveController
 {
-    public $modelClass = 'common\models\User';
+    public $modelClass = 'api\modules\v1\models\User';
+
+    public function behaviors()
+    {
+        return ArrayHelper::merge(parent::behaviors(), [
+            [
+                'class' => CompositeAuth::class,
+                // Status endpoint is inherited from the ActiveController class
+                'except' => ['status', 'signup'],
+                'authMethods' => [
+                    HttpBearerAuth::class,
+                ],
+            ]
+        ]);
+    }
+
+    public function actionSignup()
+    {
+        return 'working';
+    }
+
 }

api/modules/v1/controllers/UserController.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace api\modules\v1\models;
+
+/**
+ * Class User
+ * @package api\modules\v1\models
+ *
+ * {@inheritdoc}
+ */
+class User extends \common\models\User
+{
+
+}

api/modules/v1/models/User.php

@@ -4,6 +4,7 @@
 
     use base\util\UUID;
     use yii\behaviors\AttributeBehavior;
+    use yii\behaviors\BlameableBehavior;
     use yii\behaviors\TimestampBehavior;
 
     class ActiveRecord extends \yii\db\ActiveRecord

common/components/base/db/ActiveRecord.php

@@ -6,13 +6,14 @@
 use Yii;
 use yii\filters\auth\CompositeAuth;
 use yii\filters\auth\HttpBearerAuth;
+use yii\helpers\ArrayHelper;
 use yii\web\Response;
 
 class ActiveController extends \yii\rest\ActiveController
 {
     public function behaviors()
     {
-        return array_merge(parent::behaviors(), [
+        return ArrayHelper::merge(parent::behaviors(), [
             'corsFilter' => [
                 'class' => CustomCors::class,
                 'cors' => [
@@ -28,21 +29,14 @@ public function behaviors()
                     'application/json' => Response::FORMAT_JSON,
                 ],
             ],
-            [
-                'class' => CompositeAuth::class,
-                'except' => ['status'],
-                'authMethods' => [
-                    HttpBearerAuth::class,
-                ],
-            ]
         ]);
     }
 
     public function actionStatus()
     {
         $version = `git log -1 --pretty=%h`;
         $version = str_replace(array("\r", "\n"), '', $version);
-        return ['status' => 'online', 'version' => $version];
+        return ['status' => Yii::t('api', 'online'), 'version' => $version];
     }
 
 

common/components/base/rest/ActiveController.php

@@ -5,7 +5,7 @@
 use Yii;
 use yii\base\NotSupportedException;
 use yii\behaviors\TimestampBehavior;
-use yii\db\ActiveRecord;
+use base\db\ActiveRecord;
 use yii\web\IdentityInterface;
 
 /**
@@ -17,9 +17,13 @@
  * @property string $password_reset_token
  * @property string $email
  * @property string $auth_key
+ * @property string $access_token
+ * @property string $refresh_token
  * @property integer $status
  * @property integer $created_at
  * @property integer $updated_at
+ * @property string $created_by
+ * @property string $updated_by
  * @property string $password write-only password
  */
 class User extends ActiveRecord implements IdentityInterface
@@ -49,7 +53,7 @@ public static function findIdentity($id)
      */
     public static function findIdentityByAccessToken($token, $type = null)
     {
-        throw new NotSupportedException('"findIdentityByAccessToken" is not implemented.');
+        return static::findOne(['access_token' => $token, 'status' => self::STATUS_ACTIVE]);
     }
 
     /**
@@ -187,4 +191,36 @@ public function removePasswordResetToken()
     {
         $this->password_reset_token = null;
     }
+
+    /**
+     * Generates new access token
+     */
+    public function generateAccessToken()
+    {
+        $this->access_token = Yii::$app->security->generateRandomString(32) . '_' . time();
+    }
+
+    /**
+     * Removes access token
+     */
+    public function removeAccessToken()
+    {
+        $this->access_token = null;
+    }
+
+    /**
+     * Generates new refresh token
+     */
+    public function generateRefreshToken()
+    {
+        $this->refresh_token = Yii::$app->security->generateRandomString(32) . '_' . time();
+    }
+
+    /**
+     * Removes access token
+     */
+    public function removeRefreshToken()
+    {
+        $this->refresh_token = null;
+    }
 }

common/models/User.php

@@ -16,8 +16,8 @@ public function up()
             'id' => $this->string(36)->notNull(),
             'username' => $this->string()->notNull()->unique(),
             'auth_key' => $this->string(32)->notNull(),
-            'access_token' => $this->string(32)->notNull(),
-            'refresh_token' => $this->string(32)->notNull(),
+            'access_token' => $this->string(46)->notNull(),
+            'refresh_token' => $this->string(46)->notNull(),
             'password_hash' => $this->string()->notNull(),
             'password_reset_token' => $this->string()->unique(),
             'email' => $this->string()->notNull()->unique(),

console/migrations/m130524_201442_init.php

@@ -307,8 +307,8 @@ function formatMessage($message, $styles)
 // TODO check .yml files and git attributes and bowerrc
 // TODO Set up testing according to business
 // TODO Set up automatic API Docs
-// TODO Set up i18n accoding to https://www.yiiframework.com/doc/guide/2.0/en/tutorial-i18n
-// TODO Set up environments configuration
+// TODO Set up and fix environments configuration
 // TODO Fix common / models
 // TODO Add CORS config to readme
 // TODO Add components description and ussage
+// TODO Create basic auth endpoints