Fix exception if api_client_authorization does not reference a valid user.
authorTom Clegg <tom@clinicalfuture.com>
Fri, 27 Sep 2013 04:25:31 +0000 (00:25 -0400)
committerTom Clegg <tom@clinicalfuture.com>
Fri, 27 Sep 2013 04:32:06 +0000 (00:32 -0400)
services/api/app/controllers/application_controller.rb

index d9d7ad864d8641aa621ae5a2c521728072dd924e..0c7578a01577f961bce9b8f46f4fc4841acd3f3d 100644 (file)
@@ -251,7 +251,7 @@ class ApplicationController < ActionController::Base
           includes(:api_client, :user).
           where('api_token=? and (expires_at is null or expires_at > now())', supplied_token).
           first
-        if api_client_auth
+        if api_client_auth.andand.user
           session[:user_id] = api_client_auth.user.id
           session[:api_client_uuid] = api_client_auth.api_client.andand.uuid
           session[:api_client_authorization_id] = api_client_auth.id