Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update package dependencies #79

Merged
merged 3 commits into from
May 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/config.exs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ config :auth, AuthWeb.Endpoint,
url: [host: "localhost"],
secret_key_base: System.get_env("SECRET_KEY_BASE"),
render_errors: [view: AuthWeb.ErrorView, accepts: ~w(html json)],
pubsub: [name: Auth.PubSub, adapter: Phoenix.PubSub.PG2],
pubsub_server: Auth.PubSub,
live_view: [signing_salt: "G+UI6RIv"]

# Configures Elixir's Logger
Expand Down
1 change: 1 addition & 0 deletions lib/auth/application.ex
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ defmodule Auth.Application do
# Start the Ecto repository
Auth.Repo,
# Start the endpoint when the application starts
{Phoenix.PubSub, name: Auth.PubSub},
AuthWeb.Endpoint
# Starts a worker by calling: Auth.Worker.start_link(arg)
# {Auth.Worker, arg},
Expand Down
2 changes: 1 addition & 1 deletion lib/auth_web/controllers/auth_controller.ex
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ defmodule AuthWeb.AuthController do
"""
def redirect_or_render(conn, person, state) do
# check if valid state (HTTP referer) is defined:
case not is_nil(state) do
case not (is_nil(state) or state == "") do
# redirect
true ->
case get_client_secret_from_state(state) do
Expand Down
2 changes: 1 addition & 1 deletion lib/auth_web/templates/layout/app.html.eex
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<p class="alert alert-info f4 mh3"
role="alert"><%= get_flash(@conn, :info) %></p>
<p class="alert alert-danger" role="alert"><%= get_flash(@conn, :error) %></p>
<%= render @view_module, @view_template, assigns %>
<%= @inner_content %>
</main>
<script type="text/javascript" src="<%= Routes.static_path(@conn, "/js/app.js") %>"></script>
</body>
Expand Down
16 changes: 8 additions & 8 deletions mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ defmodule Auth.Mixfile do
def project do
[
app: :auth,
version: "1.2.1",
version: "1.2.2",
elixir: "~> 1.9",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
Expand Down Expand Up @@ -45,16 +45,16 @@ defmodule Auth.Mixfile do
defp deps do
[
# Phoenix core:
{:phoenix, "~> 1.4.16"},
{:phoenix_pubsub, "~> 1.1"},
{:phoenix, "~> 1.5.1"},
{:phoenix_pubsub, "~> 2.0"},
{:phoenix_ecto, "~> 4.1.0"},
{:ecto_sql, "~> 3.4.2"},
{:ecto_sql, "~> 3.4.4"},
{:postgrex, ">= 0.0.0"},
{:phoenix_html, "~> 2.14.1"},
{:phoenix_html, "~> 2.14.2"},
{:phoenix_live_reload, "~> 1.2", only: :dev},
{:gettext, "~> 0.17.2"},
{:jason, "~> 1.2.0"},
{:plug_cowboy, "~> 2.1.3"},
{:gettext, "~> 0.18.0"},
{:jason, "~> 1.2.1"},
{:plug_cowboy, "~> 2.2.1"},

# Auth:
# https://github.com/dwyl/elixir-auth-github
Expand Down
26 changes: 13 additions & 13 deletions mix.lock

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion test/support/conn_case.ex
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ defmodule AuthWeb.ConnCase do
using do
quote do
# Import conveniences for testing with connections
use Phoenix.ConnTest
import Plug.Conn
import Phoenix.ConnTest
alias AuthWeb.Router.Helpers, as: Routes

# The default endpoint for testing
Expand Down