Merge remote-tracking branch 'origin/master'

Author: edokeh

app/assets/javascripts/admin/app.js

@@ -22,11 +22,8 @@ define(function(require, exports, module) {
                 'responseError': function(responseError) {
                     if (responseError.status >= 500) {
                         alert('出错啦！刷新一下吧！');
-                        return $q.reject(responseError);
-                    }
-                    else {
-                        return responseError;
                     }
+                    return $q.reject(responseError);
                 }
             };
         }]);

app/controllers/admin/dashboard_controller.rb

@@ -86,7 +86,7 @@ def sync_comment
   private
   # GA api 请求中发生错误的处理，错误原因如 timeout 等
   def ga_request_error(e)
-    render :text => e.message, :status => e.try(:response).try(:status) || 408 # timeout code default
+    render :json => {:error => e.message}, :status => e.try(:response).try(:status) || 408 # timeout code default
     GaClient.clear_service_account_user
 
     # log error

lib/ga_client.rb

@@ -37,7 +37,7 @@ class TopPage
 
   # 获取 GA 权限
   def self.service_account_user(ga_setting = Ga.find)
-    if @service_account_user.nil?
+    if @service_account_user.nil? or @service_account_user.access_token.expired?
       client = ::Google::APIClient.new(
           :application_name => "SOME_STRING",
           :application_version => "SOME_NUMBER"
@@ -49,7 +49,7 @@ def self.service_account_user(ga_setting = Ga.find)
           :authorize_url => 'https://accounts.google.com/o/oauth2/auth',
           :token_url => 'https://accounts.google.com/o/oauth2/token'
       })
-      token = OAuth2::AccessToken.new(oauth_client, client.authorization.access_token)
+      token = OAuth2::AccessToken.new(oauth_client, client.authorization.access_token, :expires_in => 5 * 60)
       @service_account_user = Legato::User.new(token)
     end