Fixed Repo.exists? to not throw;Taught Cog.BusEnforcer to use it

operable · Apr 11, 2016 · 866d685 · 866d685
1 parent 5f73d1d
commit 866d685
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/emqttd_plugins/emqttd_acl_cog_internal.erl b/emqttd_plugins/emqttd_acl_cog_internal.erl
@@ -16,7 +16,7 @@ init(_) ->
 check_acl({_Client, publish, _}, _State) ->
   allow;
 check_acl({Client, subscribe, Topic}, _State) ->
-  case 'Elixir.Cog.BusCredentials':'subscription_allowed?'(Client, Topic) of
+  case 'Elixir.Cog.BusEnforcer':'subscription_allowed?'(Client, Topic) of
     false ->
       deny;
     true ->

diff --git a/emqttd_plugins/emqttd_auth_cog_internal.erl b/emqttd_plugins/emqttd_auth_cog_internal.erl
@@ -16,7 +16,7 @@ description() ->
 
 
 check(Client, Password, _) ->
-  case 'Elixir.Cog.BusCredentials':'connect_allowed?'(Client, Password) of
+  case 'Elixir.Cog.BusEnforcer':'connect_allowed?'(Client, Password) of
     true ->
       ok;
     false ->

diff --git a/lib/cog/bus_creds.ex → lib/cog/bus_enforcer.ex b/lib/cog/bus_creds.ex → lib/cog/bus_enforcer.ex
@@ -1,4 +1,4 @@
-defmodule Cog.BusCredentials do
+defmodule Cog.BusEnforcer do
   @moduledoc """
   Checks credentials for connecting MQTT clients and
   enforces subscription ACLs for Relays
@@ -9,6 +9,7 @@ defmodule Cog.BusCredentials do
 
   alias Cog.Repo
   alias Cog.Queries
+  alias Cog.Models.Relay
   alias Cog.Passwords
 
   Record.defrecord :mqtt_client, Record.extract(:mqtt_client, from_lib: "emqttd/include/emqttd.hrl")
@@ -32,7 +33,7 @@ defmodule Cog.BusCredentials do
             false
         end
       username ->
-        case Queries.Relay.exists?(username) do
+        case Repo.exists?(Relay, username) do
           false ->
             false
           true ->

diff --git a/lib/cog/repo.ex b/lib/cog/repo.ex
@@ -1,12 +1,12 @@
 defmodule Cog.Repo do
   use Ecto.Repo, otp_app: :cog
 
-  alias Cog.Queries.Repo, as: Queries
-
   def exists?(model, id) do
-    case one!(Queries.count_by_id(model, id)) do
+    case get(model, id) do
-      1 -> true
+      nil ->
-      _ -> false
+        false
+      _ ->
+        true
     end
   end