Merge branch 'master' into fix_attachment

app/controllers/v1/omniauth_callbacks_controller.rb

@@ -77,7 +77,8 @@ require 'open-uri'
 
     # break out provider attribute assignment for easy method extension
     def assign_provider_attrs(user, auth_hash)
-      avatar = auth_hash['provider']=='google_oauth2' ? open(auth_hash['info']['image'])  : auth_hash['info']['image']
+
+      avatar = auth_hash['provider']=='google_oauth2' ? open(auth_hash['info']['image'])  : auth_hash['info']['image'] 
 
       user.assign_attributes({
         nickname: auth_hash['info']['nickname'],

app/serializers/user_devise_serializer.rb

@@ -4,8 +4,12 @@ class UserDeviseSerializer < ActiveModel::Serializer
     object.avatar.url
   end 
 
+  def cover_file_name
+    object.cover.url
+  end
+
 
   attributes :id, :email, :provider, :avatar_file_name, :avatar_content_type, :uid, :name, :avatar_file_size, :avatar_updated_at,
              :bookmarks_count, :user_category_id, :score, :follows_count, :deleted_at, :description, :likes_count,
-             :learning_objects_count, :collections_count 
+             :learning_objects_count, :collections_count, :cover_file_name, :cover_content_type, :cover_file_size, :cover_updated_at
 end