Fix formatter issues

tobiasbernet · Sep 2, 2021 · 3b8127d · 3b8127d
1 parent 9622781
commit 3b8127d
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 52 deletions.
diff --git a/.formatter.exs b/.formatter.exs
@@ -1,5 +1,4 @@
 [
   import_deps: [:ecto, :phoenix],
-  inputs: ["*.{ex,exs}", "priv/*/seeds.exs", "{config,lib,test}/**/*.{ex,exs}"],
-  subdirectories: ["priv/*/migrations"]
+  inputs: ["*.{ex,exs}", "priv/*/seeds.exs", "{config,lib,test}/**/*.{ex,exs}"]
 ]
diff --git a/config/config.exs b/config/config.exs
@@ -28,8 +28,10 @@ config :phoenix, :json_library, Jason
 # OpenID provider config
 config :schlusseli, :openid_connect_providers,
   keycloak: [
-    discovery_document_uri: "http://127.0.0.1:8085/auth/realms/Schlusseli/.well-known/openid-configuration",
-    introspect_uri: "http://127.0.0.1:8085/auth/realms/Schlusseli/protocol/openid-connect/token/introspect",
+    discovery_document_uri:
+      "http://127.0.0.1:8085/auth/realms/Schlusseli/.well-known/openid-configuration",
+    introspect_uri:
+      "http://127.0.0.1:8085/auth/realms/Schlusseli/protocol/openid-connect/token/introspect",
     client_id: "schlusseli-api",
     client_secret: "9b81d2f0-1f5d-4a12-8d3a-3032be945c5a",
     redirect_uri: "",
@@ -38,8 +40,6 @@ config :schlusseli, :openid_connect_providers,
     verify_token_audience: true
   ]
 
-
-
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{Mix.env()}.exs"
diff --git a/lib/schlusseli/factory.ex b/lib/schlusseli/factory.ex
@@ -7,15 +7,15 @@ defmodule Schlusseli.Factory do
 
   def key_factory() do
     %{
-      id: sequence(:id, &(&1), start_at: 1),
+      id: sequence(:id, & &1, start_at: 1),
       serial: :os.system_time(:millisecond),
       type: sequence(:type, @key_types)
     }
   end
 
   def customer_factory do
     %{
-      id: sequence(:id, &(&1), start_at: 1),
+      id: sequence(:id, & &1, start_at: 1),
       name: "Hans Lock Smith",
       email: sequence(:email, &"email-#{&1}@example.com")
     }

diff --git a/lib/schlusseli_web/plug/keycloak_introspect.ex b/lib/schlusseli_web/plug/keycloak_introspect.ex
@@ -1,5 +1,5 @@
 defmodule Schlusseli.Plug.KeycloakIntorspect do
-@moduledoc """
+  @moduledoc """
   Plug to verify token via keycloak's introspection endpoint.
 
 
@@ -19,9 +19,9 @@ defmodule Schlusseli.Plug.KeycloakIntorspect do
   @spec call(Plug.Conn.t(), keyword()) :: Plug.Conn.t()
   def call(conn, _) do
     conn
-      |> get_req_header("authorization")
-      |> fetch_token()
-      |> verify_token(conn)
+    |> get_req_header("authorization")
+    |> fetch_token()
+    |> verify_token(conn)
   end
 
   def fetch_token([token]) when is_binary(token) do
@@ -37,7 +37,7 @@ defmodule Schlusseli.Plug.KeycloakIntorspect do
   """
   def verify_token(token, conn) do
     with {:ok, claims} <- token_introspect(token),
-    true <- verify_audience(claims, get_provider_conf(:verify_token_audience)) do
+         true <- verify_audience(claims, get_provider_conf(:verify_token_audience)) do
       conn
       |> assign(:claims, claims)
     else
@@ -88,9 +88,9 @@ defmodule Schlusseli.Plug.KeycloakIntorspect do
 
   defp auth_error(conn) do
     conn
-        |> put_resp_content_type("application/vnd.api+json")
-        |> send_resp(401, Poison.encode!(%{error: :not_authorized}))
-        |> halt()
+    |> put_resp_content_type("application/vnd.api+json")
+    |> send_resp(401, Poison.encode!(%{error: :not_authorized}))
+    |> halt()
   end
 
   defp assert_json(%{"error" => reason}), do: {:error, reason}

diff --git a/lib/schlusseli_web/plug/openid_connector.ex b/lib/schlusseli_web/plug/openid_connector.ex
@@ -1,5 +1,5 @@
 defmodule Schlusseli.Plug.OpenidConnector do
-@moduledoc """
+  @moduledoc """
   Plug for verifying authorization on a per request basis, verifies that a token is set in the
   `Authorization` header.
 
@@ -19,9 +19,9 @@ defmodule Schlusseli.Plug.OpenidConnector do
   @spec call(Plug.Conn.t(), keyword()) :: Plug.Conn.t()
   def call(conn, _) do
     conn
-      |> get_req_header("authorization")
-      |> fetch_token()
-      |> verify_token(conn)
+    |> get_req_header("authorization")
+    |> fetch_token()
+    |> verify_token(conn)
   end
 
   def fetch_token([token]) when is_binary(token) do
@@ -37,7 +37,7 @@ defmodule Schlusseli.Plug.OpenidConnector do
   """
   def verify_token(token, conn, auth_provider \\ :keycloak) do
     with {:ok, claims} <- OpenIDConnect.verify(auth_provider, token),
-    true <- verify_audience(claims, get_provider_conf(:verify_token_audience)) do
+         true <- verify_audience(claims, get_provider_conf(:verify_token_audience)) do
       conn
       |> Absinthe.Plug.put_options(context: %{claims: normalize_claims(claims)})
     else
@@ -63,9 +63,9 @@ defmodule Schlusseli.Plug.OpenidConnector do
 
   defp auth_error(conn) do
     conn
-        |> put_resp_content_type("application/vnd.api+json")
-        |> send_resp(401, Poison.encode!(%{error: :not_authorized}))
-        |> halt()
+    |> put_resp_content_type("application/vnd.api+json")
+    |> send_resp(401, Poison.encode!(%{error: :not_authorized}))
+    |> halt()
   end
 
   defp normalize_claims(claims) do

diff --git a/lib/schlusseli_web/resolver/customer.ex b/lib/schlusseli_web/resolver/customer.ex
@@ -1,9 +1,7 @@
 defmodule SchlusseliWeb.Resolvers.Customer do
-
   alias Schlusseli.Factory
 
   def list_customers(_parent, _args, %{context: %{claims: _context}}) do
     {:ok, Factory.build_list(10, :customer)}
   end
-
 end
diff --git a/lib/schlusseli_web/resolver/key.ex b/lib/schlusseli_web/resolver/key.ex
@@ -1,9 +1,7 @@
 defmodule SchlusseliWeb.Resolvers.Key do
-
   alias Schlusseli.Factory
 
   def list_keys(_parent, _args, _resolution) do
     {:ok, Factory.build_list(10, :key)}
   end
-
 end
diff --git a/lib/schlusseli_web/schema.ex b/lib/schlusseli_web/schema.ex
@@ -1,24 +1,21 @@
 defmodule SchlusseliWeb.Schema do
   use Absinthe.Schema
 
-  import_types SchlusseliWeb.Schema.KeyTypes
-  import_types SchlusseliWeb.Schema.CustomerTypes
+  import_types(SchlusseliWeb.Schema.KeyTypes)
+  import_types(SchlusseliWeb.Schema.CustomerTypes)
 
   alias SchlusseliWeb.Resolvers
 
   query do
-
     @desc "Get all keys"
     field :keys, list_of(:key) do
-      resolve &Resolvers.Key.list_keys/3
+      resolve(&Resolvers.Key.list_keys/3)
     end
 
     @desc "Get all customers"
     field :customers, list_of(:customer) do
-      middleware SchlusseliWeb.Schema.Middleware.Authorize, "view_customers"
-      resolve &Resolvers.Customer.list_customers/3
+      middleware(SchlusseliWeb.Schema.Middleware.Authorize, "view_customers")
+      resolve(&Resolvers.Customer.list_customers/3)
     end
-
   end
-
 end
diff --git a/lib/schlusseli_web/schema/middleware/authorize.ex b/lib/schlusseli_web/schema/middleware/authorize.ex
@@ -3,7 +3,7 @@ defmodule SchlusseliWeb.Schema.Middleware.Authorize do
 
   def call(resolution, scope) do
     with %{claims: %{scope: current_scopes}} <- resolution.context,
-    true <- correct_scope?(current_scopes, scope) do
+         true <- correct_scope?(current_scopes, scope) do
       resolution
     else
       _ ->

diff --git a/priv/repo/migrations/.formatter.exs b/priv/repo/migrations/.formatter.exs
diff --git a/priv/repo/seeds.exs b/priv/repo/seeds.exs