Merge branch 'feature/user-id' into develop

* feature/user-id:
  Added user id in response

Author: x1wins

app/controllers/api/v1/authentication_controller.rb

@@ -10,7 +10,7 @@ def login
           token = JsonWebToken.encode(user_id: @user.id)
           time = Time.now + 24.hours.to_i
           user_serializer =  UserSerializer.new(@user)
-          render json: { token: token, exp: time.strftime("%m-%d-%Y %H:%M"),
+          render json: { id: @user.id, token: token, exp: time.strftime("%m-%d-%Y %H:%M"),
                          username: @user.username, email: @user.email, avatar: user_serializer.avatar}, status: :ok
         else
           render json: { error: 'unauthorized' }, status: :unauthorized

spec/swagger_helper.rb

@@ -71,6 +71,7 @@
           auth: {
               type: :object,
               properties: {
+                  id: { type: :integer },
                   token: { type: :string },
                   exp: { type: :string },
                   username: { type: :string },

swagger/v1/swagger.yaml

@@ -903,6 +903,8 @@ definitions:
   auth:
     type: object
     properties:
+      id:
+        type: integer
       token:
         type: string
       exp: