-
-
-
diff --git a/js/src/router/index.js b/js/src/router/index.js
index f48b22fe6..48579a1f2 100644
--- a/js/src/router/index.js
+++ b/js/src/router/index.js
@@ -8,8 +8,12 @@ import Location from '@/components/Location';
import CreateEvent from '@/components/Event/Create';
import CategoryList from '@/components/Category/List';
import CreateCategory from '@/components/Category/Create';
-import Register from '@/components/Register';
-import Login from '@/components/Login';
+import Register from '@/components/Account/Register';
+import Login from '@/components/Account/Login';
+import Validate from '@/components/Account/Validate';
+import ResendConfirmation from '@/components/Account/ResendConfirmation';
+import SendPasswordReset from '@/components/Account/SendPasswordReset';
+import PasswordReset from '@/components/Account/PasswordReset';
import Account from '@/components/Account/Account';
import CreateGroup from '@/components/Group/Create';
import Group from '@/components/Group/Group';
@@ -68,12 +72,42 @@ const router = new Router({
path: '/register',
name: 'Register',
component: Register,
+ props: true,
meta: { requiredAuth: false },
},
+ {
+ path: '/resend-instructions',
+ name: 'ResendConfirmation',
+ component: ResendConfirmation,
+ props: true,
+ meta: { requiresAuth: false },
+ },
+ {
+ path: '/password-reset/send',
+ name: 'SendPasswordReset',
+ component: SendPasswordReset,
+ props: true,
+ meta: { requiresAuth: false },
+ },
+ {
+ path: '/password-reset/:token',
+ name: 'PasswordReset',
+ component: PasswordReset,
+ meta: { requiresAuth: false },
+ props: true,
+ },
+ {
+ path: '/validate/:token',
+ name: 'Validate',
+ component: Validate,
+ props: true,
+ meta: { requiresAuth: false },
+ },
{
path: '/login',
name: 'Login',
component: Login,
+ props: true,
meta: { requiredAuth: false },
},
{
@@ -109,7 +143,8 @@ const router = new Router({
props: true,
meta: { requiredAuth: false },
},
- { path: "*",
+ {
+ path: '*',
name: 'PageNotFound',
component: PageNotFound,
meta: { requiredAuth: false },
diff --git a/js/vue.config.js b/js/vue.config.js
index e0f24a3cd..67336119d 100644
--- a/js/vue.config.js
+++ b/js/vue.config.js
@@ -2,7 +2,7 @@ const Dotenv = require('dotenv-webpack');
module.exports = {
lintOnSave: false,
- compiler: true,
+ runtimeCompiler: true,
configureWebpack: {
plugins: [
new Dotenv(),
diff --git a/lib/eventos/actors/actors.ex b/lib/eventos/actors/actors.ex
index d222ee7a4..2d3cadfea 100644
--- a/lib/eventos/actors/actors.ex
+++ b/lib/eventos/actors/actors.ex
@@ -312,8 +312,12 @@ defmodule Eventos.Actors do
Get an user by email
"""
def find_by_email(email) do
- user = Repo.get_by(User, email: email)
- Repo.preload(user, :actor)
+ case Repo.get_by(User, email: email) |> Repo.preload(:actor) do
+ nil ->
+ {:error, nil}
+ user ->
+ {:ok, user}
+ end
end
@doc """
@@ -366,8 +370,7 @@ defmodule Eventos.Actors do
try do
Eventos.Repo.insert!(actor_with_user)
- user = find_by_email(email)
- {:ok, user}
+ find_by_email(email)
rescue
e in Ecto.InvalidChangesetError ->
{:error, e.changeset}
diff --git a/lib/eventos/actors/service/activation.ex b/lib/eventos/actors/service/activation.ex
new file mode 100644
index 000000000..d71e2ffaf
--- /dev/null
+++ b/lib/eventos/actors/service/activation.ex
@@ -0,0 +1,29 @@
+defmodule Eventos.Actors.Service.Activation do
+ @moduledoc false
+
+ alias Eventos.{Mailer, Repo, Actors.User, Actors}
+ alias Eventos.Email.User, as: UserEmail
+
+ require Logger
+
+ @doc false
+ def check_confirmation_token(token) when is_binary(token) do
+ with %User{} = user <- Repo.get_by(User, confirmation_token: token) do
+ Actors.update_user(user, %{"confirmed_at" => DateTime.utc_now(), "confirmation_sent_at" => nil, "confirmation_token" => nil})
+ else
+ _err ->
+ {:error, "Invalid token"}
+ end
+ end
+
+ def resend_confirmation_email(%User{} = user, locale \\ "en") do
+ {:ok, user} = Actors.update_user(user, %{"confirmation_sent_at" => DateTime.utc_now()})
+ send_confirmation_email(user, locale)
+ end
+
+ def send_confirmation_email(%User{} = user, locale \\ "en") do
+ user
+ |> UserEmail.confirmation_email(locale)
+ |> Mailer.deliver_later()
+ end
+end
diff --git a/lib/eventos/actors/service/reset_password.ex b/lib/eventos/actors/service/reset_password.ex
new file mode 100644
index 000000000..067f91de6
--- /dev/null
+++ b/lib/eventos/actors/service/reset_password.ex
@@ -0,0 +1,57 @@
+defmodule Eventos.Actors.Service.ResetPassword do
+ @moduledoc false
+
+ require Logger
+
+ alias Eventos.{Mailer, Repo, Actors.User}
+ alias Eventos.Email.User, as: UserEmail
+
+ @doc """
+ Check that the provided token is correct and update provided password
+ """
+ @spec check_reset_password_token(String.t, String.t) :: tuple
+ def check_reset_password_token(password, token) do
+ with %User{} = user <- Repo.get_by(User, reset_password_token: token) do
+ User.password_reset_changeset(user, %{"password" => password, "reset_password_sent_at" => nil, "reset_password_token" => nil}) |> Repo.update()
+ else
+ _err ->
+ {:error, :invalid_token}
+ end
+ end
+
+ @doc """
+ Send the email reset password, if it's not too soon since the last send
+ """
+ @spec send_password_reset_email(User.t, String.t) :: tuple
+ def send_password_reset_email(%User{} = user, locale \\ "en") do
+ with :ok <- we_can_send_email(user),
+ {:ok, %User{} = user_updated} <- User.send_password_reset_changeset(user, %{"reset_password_token" => random_string(30), "reset_password_sent_at" => DateTime.utc_now()}) |> Repo.update() do
+ mail = user_updated
+ |> UserEmail.reset_password_email(locale)
+ |> Mailer.deliver_later()
+ {:ok, mail}
+ else
+ {:error, reason} -> {:error, reason}
+ end
+ end
+
+ @spec random_string(integer) :: String.t
+ defp random_string(length) do
+ :crypto.strong_rand_bytes(length) |> Base.url_encode64
+ end
+
+ @spec we_can_send_email(User.t) :: boolean
+ defp we_can_send_email(%User{} = user) do
+ case user.reset_password_sent_at do
+ nil ->
+ :ok
+ _ ->
+ case Timex.before?(Timex.shift(user.reset_password_sent_at, hours: 1), DateTime.utc_now()) do
+ true ->
+ :ok
+ false ->
+ {:error, :email_too_soon}
+ end
+ end
+ end
+end
diff --git a/lib/eventos/actors/user.ex b/lib/eventos/actors/user.ex
index dd166b8ca..f812319de 100644
--- a/lib/eventos/actors/user.ex
+++ b/lib/eventos/actors/user.ex
@@ -12,6 +12,11 @@ defmodule Eventos.Actors.User do
field :password, :string, virtual: true
field :role, :integer, default: 0
belongs_to :actor, Actor
+ field :confirmed_at, :utc_datetime
+ field :confirmation_sent_at, :utc_datetime
+ field :confirmation_token, :string
+ field :reset_password_sent_at, :utc_datetime
+ field :reset_password_token, :string
timestamps()
end
@@ -19,18 +24,49 @@ defmodule Eventos.Actors.User do
@doc false
def changeset(%User{} = user, attrs) do
user
- |> cast(attrs, [:email, :role, :password_hash, :actor_id])
+ |> cast(attrs, [:email, :role, :password_hash, :actor_id, :confirmed_at, :confirmation_sent_at, :confirmation_token, :reset_password_sent_at, :reset_password_token])
|> validate_required([:email])
- |> unique_constraint(:email)
+ |> unique_constraint(:email, [message: "registration.error.email_already_used"])
|> validate_format(:email, ~r/@/)
+ |> validate_length(:password, min: 6, max: 100, message: "registration.error.password_too_short")
end
def registration_changeset(struct, params) do
struct
|> changeset(params)
|> cast(params, ~w(password)a, [])
- |> validate_length(:password, min: 6, max: 100)
+ |> validate_required([:email, :password])
+ |> validate_length(:password, min: 6, max: 100, message: "registration.error.password_too_short")
|> hash_password()
+ |> save_confirmation_token()
+ |> unique_constraint(:confirmation_token, [message: "regisration.error.confirmation_token_already_in_use"])
+ end
+
+ def send_password_reset_changeset(%User{} = user, attrs) do
+ user
+ |> cast(attrs, [:reset_password_token, :reset_password_sent_at])
+ end
+
+ def password_reset_changeset(%User{} = user, attrs) do
+ user
+ |> cast(attrs, [:password, :reset_password_token, :reset_password_sent_at])
+ |> validate_length(:password, min: 6, max: 100, message: "registration.error.password_too_short")
+ |> hash_password()
+ end
+
+ defp save_confirmation_token(changeset) do
+ case changeset do
+ %Ecto.Changeset{valid?: true,
+ changes: %{email: _email}} ->
+ changeset = put_change(changeset, :confirmation_token, random_string(30))
+ put_change(changeset, :confirmation_sent_at, DateTime.utc_now())
+ _ ->
+ changeset
+ end
+ end
+
+ defp random_string(length) do
+ :crypto.strong_rand_bytes(length) |> Base.url_encode64
end
@doc """
@@ -47,4 +83,12 @@ defmodule Eventos.Actors.User do
changeset
end
end
+
+ def is_confirmed(%User{confirmed_at: nil} = _user) do
+ {:error, :unconfirmed}
+ end
+
+ def is_confirmed(%User{} = user) do
+ {:ok, user}
+ end
end
diff --git a/lib/eventos/addresses/address.ex b/lib/eventos/addresses/address.ex
index 8f3f016f1..97737722f 100644
--- a/lib/eventos/addresses/address.ex
+++ b/lib/eventos/addresses/address.ex
@@ -26,6 +26,5 @@ defmodule Eventos.Addresses.Address do
def changeset(%Address{} = address, attrs) do
address
|> cast(attrs, [:description, :floor, :geom, :addressCountry, :addressLocality, :addressRegion, :postalCode, :streetAddress])
- |> validate_required([:streetAddress])
end
end
diff --git a/lib/eventos/email/user.ex b/lib/eventos/email/user.ex
new file mode 100644
index 000000000..7d4ccbcbb
--- /dev/null
+++ b/lib/eventos/email/user.ex
@@ -0,0 +1,46 @@
+defmodule Eventos.Email.User do
+
+ alias Eventos.Actors.User
+
+ import Bamboo.Email
+ import Bamboo.Phoenix
+ use Bamboo.Phoenix, view: Eventos.EmailView
+ import EventosWeb.Gettext
+
+ def confirmation_email(%User{} = user, locale \\ "en") do
+ Gettext.put_locale(locale)
+ instance_url = get_config(:instance)
+ base_email()
+ |> to(user.email)
+ |> subject(gettext "Peakweaver: Confirmation instructions for %{instance}", instance: instance_url)
+ |> put_header("Reply-To", get_config(:reply_to))
+ |> assign(:token, user.confirmation_token)
+ |> assign(:instance, instance_url)
+ |> render(:registration_confirmation)
+ end
+
+ def reset_password_email(%User{} = user, locale \\ "en") do
+ Gettext.put_locale(locale)
+ instance_url = get_config(:instance)
+ base_email()
+ |> to(user.email)
+ |> subject(gettext "Peakweaver: Reset your password on %{instance} instructions", instance: instance_url)
+ |> put_header("Reply-To", get_config(:reply_to))
+ |> assign(:token, user.reset_password_token)
+ |> assign(:instance, instance_url)
+ |> render(:password_reset)
+ end
+
+ defp base_email do
+ # Here you can set a default from, default headers, etc.
+ new_email()
+ |> from(Application.get_env(:eventos, EventosWeb.Endpoint)[:email_from])
+ |> put_html_layout({Eventos.EmailView, "email.html"})
+ |> put_text_layout({Eventos.EmailView, "email.text"})
+ end
+
+ @spec get_config(atom()) :: any()
+ defp get_config(key) do
+ _config = Application.get_env(:eventos, EventosWeb.Endpoint) |> Keyword.get(key)
+ end
+end
diff --git a/lib/eventos/events/event.ex b/lib/eventos/events/event.ex
index 653d9a9d8..16c842db6 100644
--- a/lib/eventos/events/event.ex
+++ b/lib/eventos/events/event.ex
@@ -1,30 +1,5 @@
-defmodule Eventos.Events.Event.TitleSlug do
- @moduledoc """
- Generates a slug for an event title
- """
- alias Eventos.Events.Event
- import Ecto.Query
- alias Eventos.Repo
- use EctoAutoslugField.Slug, from: :title, to: :slug
-
- def build_slug(sources, changeset) do
- slug = super(sources, changeset)
- build_unique_slug(slug, changeset)
- end
-
- defp build_unique_slug(slug, changeset) do
- query = from e in Event,
- where: e.slug == ^slug
-
- case Repo.one(query) do
- nil -> slug
- _event ->
- slug
- |> Eventos.Slug.increment_slug()
- |> build_unique_slug(changeset)
- end
- end
-end
+import EctoEnum
+defenum AddressTypeEnum, :address_type, [:physical, :url, :phone, :other]
defmodule Eventos.Events.Event do
@moduledoc """
@@ -33,7 +8,6 @@ defmodule Eventos.Events.Event do
use Ecto.Schema
import Ecto.Changeset
alias Eventos.Events.{Event, Participant, Tag, Category, Session, Track}
- alias Eventos.Events.Event.TitleSlug
alias Eventos.Actors.Actor
alias Eventos.Addresses.Address
@@ -44,7 +18,6 @@ defmodule Eventos.Events.Event do
field :description, :string
field :ends_on, Timex.Ecto.DateTimeWithTimezone
field :title, :string
- field :slug, TitleSlug.Type
field :state, :integer, default: 0
field :status, :integer, default: 0
field :public, :boolean, default: true
@@ -52,6 +25,9 @@ defmodule Eventos.Events.Event do
field :large_image, :string
field :publish_at, Timex.Ecto.DateTimeWithTimezone
field :uuid, Ecto.UUID, default: Ecto.UUID.generate()
+ field :address_type, AddressTypeEnum, default: :physical
+ field :online_address, :string
+ field :phone, :string
belongs_to :organizer_actor, Actor, [foreign_key: :organizer_actor_id]
belongs_to :attributed_to, Actor, [foreign_key: :attributed_to_id]
many_to_many :tags, Tag, join_through: "events_tags"
@@ -59,7 +35,7 @@ defmodule Eventos.Events.Event do
many_to_many :participants, Actor, join_through: Participant
has_many :tracks, Track
has_many :sessions, Session
- belongs_to :address, Address
+ belongs_to :physical_address, Address
timestamps(type: :utc_datetime)
end
@@ -75,13 +51,28 @@ defmodule Eventos.Events.Event do
""
end
event
- |> cast(attrs, [:title, :description, :url, :begins_on, :ends_on, :organizer_actor_id, :category_id, :state, :status, :public, :thumbnail, :large_image, :publish_at])
+ |> Ecto.Changeset.cast(attrs, [
+ :title,
+ :description,
+ :url,
+ :begins_on,
+ :ends_on,
+ :organizer_actor_id,
+ :category_id,
+ :state,
+ :status,
+ :public,
+ :thumbnail,
+ :large_image,
+ :publish_at,
+ :address_type,
+ :online_address,
+ :phone,
+ ])
|> cast_assoc(:tags)
- |> cast_assoc(:address)
- |> TitleSlug.maybe_generate_slug()
- |> TitleSlug.unique_constraint()
+ |> cast_assoc(:physical_address)
|> put_change(:uuid, uuid)
|> put_change(:url, "#{EventosWeb.Endpoint.url()}/@#{actor_url}/#{uuid}")
- |> validate_required([:title, :description, :begins_on, :ends_on, :organizer_actor_id, :category_id, :url, :uuid])
+ |> validate_required([:title, :begins_on, :ends_on, :organizer_actor_id, :category_id, :url, :uuid, :address_type])
end
end
diff --git a/lib/eventos/events/events.ex b/lib/eventos/events/events.ex
index 50f8cabc3..1793ddd36 100644
--- a/lib/eventos/events/events.ex
+++ b/lib/eventos/events/events.ex
@@ -32,7 +32,7 @@ defmodule Eventos.Events do
limit: ^limit,
order_by: [desc: :id],
offset: ^start,
- preload: [:organizer_actor, :category, :sessions, :tracks, :tags, :participants, :address]
+ preload: [:organizer_actor, :category, :sessions, :tracks, :tags, :participants, :physical_address]
events = Repo.all(query)
count_events = Repo.one(from e in Event, select: count(e.id), where: e.organizer_actor_id == ^actor_id)
{:ok, events, count_events}
@@ -89,7 +89,7 @@ defmodule Eventos.Events do
"""
def get_event_full!(id) do
event = Repo.get!(Event, id)
- Repo.preload(event, [:organizer_actor, :category, :sessions, :tracks, :tags, :participants, :address])
+ Repo.preload(event, [:organizer_actor, :category, :sessions, :tracks, :tags, :participants, :physical_address])
end
@doc """
@@ -97,7 +97,7 @@ defmodule Eventos.Events do
"""
def get_event_full_by_url!(url) do
event = Repo.get_by(Event, url: url)
- Repo.preload(event, [:organizer_actor, :category, :sessions, :tracks, :tags, :participants, :address])
+ Repo.preload(event, [:organizer_actor, :category, :sessions, :tracks, :tags, :participants, :physical_address])
end
@doc """
@@ -105,23 +105,7 @@ defmodule Eventos.Events do
"""
def get_event_full_by_uuid(uuid) do
event = Repo.get_by(Event, uuid: uuid)
- Repo.preload(event, [:organizer_actor, :category, :sessions, :tracks, :tags, :participants, :address])
- end
-
- @spec get_event_full_by_name_and_slug!(String.t, String.t) :: Event.t
- def get_event_full_by_name_and_slug!(name, slug) do
- query = case String.split(name, "@") do
- [name, domain] -> from e in Event,
- join: a in Actor,
- on: a.id == e.organizer_actor_id and a.preferred_username == ^name and a.domain == ^domain,
- where: e.slug == ^slug
- [name] -> from e in Event,
- join: a in Actor,
- on: a.id == e.organizer_actor_id and a.preferred_username == ^name and is_nil(a.domain),
- where: e.slug == ^slug
- end
- event = Repo.one(query)
- Repo.preload(event, [:organizer_actor, :category, :sessions, :tracks, :tags, :participants, :address])
+ Repo.preload(event, [:organizer_actor, :category, :sessions, :tracks, :tags, :participants, :physical_address])
end
@doc """
diff --git a/lib/eventos/mailer.ex b/lib/eventos/mailer.ex
new file mode 100644
index 000000000..253603c05
--- /dev/null
+++ b/lib/eventos/mailer.ex
@@ -0,0 +1,3 @@
+defmodule Eventos.Mailer do
+ use Bamboo.Mailer, otp_app: :eventos
+end
diff --git a/lib/eventos_web/controllers/event_controller.ex b/lib/eventos_web/controllers/event_controller.ex
index 72bfc776b..6bb442496 100644
--- a/lib/eventos_web/controllers/event_controller.ex
+++ b/lib/eventos_web/controllers/event_controller.ex
@@ -19,12 +19,9 @@ defmodule EventosWeb.EventController do
end
def create(conn, %{"event" => event_params}) do
- address = process_address(event_params["address"])
- event_params = if is_nil address do
- event_params
- else
- %{event_params | "address" => address}
- end
+ event_params = process_event_address(event_params)
+ Logger.debug("creating event with")
+ Logger.debug(inspect event_params)
with {:ok, %Event{} = event} <- Events.create_event(event_params) do
conn
|> put_status(:created)
@@ -33,15 +30,19 @@ defmodule EventosWeb.EventController do
end
end
- defp process_address(address) do
- geom = EventosWeb.AddressController.process_geom(address["geom"])
- case geom do
- nil ->
- address
- _ ->
- %{address | "geom" => geom}
- _ ->
- address
+ defp process_event_address(event) do
+ if Map.has_key?(event, "address_type") && event["address_type"] === :physical do
+ address = event["physical_address"]
+ geom = EventosWeb.AddressController.process_geom(address["geom"])
+ address = case geom do
+ nil ->
+ address
+ _ ->
+ %{address | "geom" => geom}
+ end
+ %{event | "physical_address" => address}
+ else
+ event
end
end
diff --git a/lib/eventos_web/controllers/user_controller.ex b/lib/eventos_web/controllers/user_controller.ex
index 98abb9ffa..366229b5c 100644
--- a/lib/eventos_web/controllers/user_controller.ex
+++ b/lib/eventos_web/controllers/user_controller.ex
@@ -7,6 +7,7 @@ defmodule EventosWeb.UserController do
alias Eventos.Actors
alias Eventos.Actors.User
alias Eventos.Repo
+ alias Eventos.Actors.Service.{Activation, ResetPassword}
action_fallback EventosWeb.FallbackController
@@ -16,18 +17,80 @@ defmodule EventosWeb.UserController do
end
def register(conn, %{"username" => username, "email" => email, "password" => password}) do
- with {:ok, %User{} = user} <- Actors.register(%{email: email, password: password, username: username}),
- {:ok, token, _claims} <- EventosWeb.Guardian.encode_and_sign(user) do
- conn
+ with {:ok, %User{} = user} <- Actors.register(%{email: email, password: password, username: username}) do
+ Activation.send_confirmation_email(user, "locale")
+ conn
|> put_status(:created)
- |> render("show_with_token.json", %{token: token, user: user})
+ |> render("confirmation.json", %{user: user})
+ end
+ end
+
+ def validate(conn, %{"token" => token}) do
+ with {:ok, %User{} = user} <- Activation.check_confirmation_token(token) do
+ {:ok, token, _claims} = EventosWeb.Guardian.encode_and_sign(user)
+ conn
+ |> put_resp_header("location", user_path(conn, :show_current_actor))
+ |> render("show_with_token.json", %{user: user, token: token})
+ else
+ {:error, msg} ->
+ conn
+ |> put_status(:not_found)
+ |> json(%{"error" => msg})
+ end
+ end
+
+ def resend_confirmation(conn, %{"email" => email}) do
+ with {:ok, %User{} = user} <- Actors.find_by_email(email),
+ false <- is_nil(user.confirmation_token),
+ true <- Timex.before?(Timex.shift(user.confirmation_sent_at, hours: 1), DateTime.utc_now()) do
+ Activation.resend_confirmation_email(user)
+ render(conn, "confirmation.json", %{user: user})
+ else
+ {:error, :not_found} ->
+ conn
+ |> put_status(:not_found)
+ |> json(%{"error" => "Unable to find an user with this email"})
+ _ ->
+ conn
+ |> put_status(:not_found)
+ |> json(%{"error" => "Unable to resend the validation token"})
+ end
+ end
+
+ def send_reset_password(conn, %{"email" => email}) do
+ with {:ok, %User{} = user} <- Actors.find_by_email(email),
+ {:ok, _} <- ResetPassword.send_password_reset_email(user) do
+ render(conn, "password_reset.json", %{user: user})
+ else
+ {:error, :not_found} ->
+ conn
+ |> put_status(:not_found)
+ |> json(%{"errors" => "Unable to find an user with this email"})
+ {:error, :email_too_soon} ->
+ conn
+ |> put_status(:not_found)
+ |> json(%{"errors" => "You requested a new reset password too early"})
+ end
+ end
+
+ def reset_password(conn, %{"password" => password, "token" => token}) do
+ with {:ok, %User{} = user} <- ResetPassword.check_reset_password_token(password, token) do
+ {:ok, token, _claims} = EventosWeb.Guardian.encode_and_sign(user)
+ render(conn, "show_with_token.json", %{user: user, token: token})
+ else
+ {:error, :invalid_token} ->
+ conn
+ |> put_status(:not_found)
+ |> json(%{"errors" => %{"token" => ["Wrong token for password reset"]}})
+ {:error, %Ecto.Changeset{} = changeset} ->
+ conn
+ |> put_status(:unprocessable_entity)
+ |> render(EventosWeb.ChangesetView, "error.json", changeset: changeset)
end
end
def show_current_actor(conn, _params) do
- user = Guardian.Plug.current_resource(conn)
- user
- |> Repo.preload(:actor)
+ user = Guardian.Plug.current_resource(conn) |> Repo.preload(:actor)
render(conn, "show_simple.json", user: user)
end
diff --git a/lib/eventos_web/controllers/user_session_controller.ex b/lib/eventos_web/controllers/user_session_controller.ex
index 8cfe3d755..96c2f127d 100644
--- a/lib/eventos_web/controllers/user_session_controller.ex
+++ b/lib/eventos_web/controllers/user_session_controller.ex
@@ -7,18 +7,24 @@ defmodule EventosWeb.UserSessionController do
alias Eventos.Actors
def sign_in(conn, %{"email" => email, "password" => password}) do
- case Actors.find_by_email(email) do
- %User{} = user ->
- # Attempt to authenticate the user
- case Actors.authenticate(%{user: user, password: password}) do
- {:ok, token, _claims} ->
+ with {:ok, %User{} = user} <- Actors.find_by_email(email),
+ {:ok, %User{} = _user} <- User.is_confirmed(user),
+ {:ok, token, _claims} <- Actors.authenticate(%{user: user, password: password}) do
# Render the token
render conn, "token.json", %{token: token, user: user}
- _ ->
- send_resp(conn, 400, Poison.encode!(%{"error_msg" => "Bad login", "display_error" => "session.error.bad_login", "error_code" => 400}))
- end
- _ ->
- send_resp(conn, 400, Poison.encode!(%{"error_msg" => "No such user", "display_error" => "session.error.bad_login", "error_code" => 400}))
+ else
+ {:error, :not_found} ->
+ conn
+ |> put_status(401)
+ |> json(%{"error_msg" => "No such user", "display_error" => "session.error.bad_login"})
+ {:error, :unconfirmed} ->
+ conn
+ |> put_status(401)
+ |> json(%{"error_msg" => "User is not activated", "display_error" => "session.error.not_activated"})
+ {:error, :unauthorized} ->
+ conn
+ |> put_status(401)
+ |> json(%{"error_msg" => "Bad login", "display_error" => "session.error.bad_login"})
end
end
diff --git a/lib/eventos_web/router.ex b/lib/eventos_web/router.ex
index 9ac52f102..e511b967a 100644
--- a/lib/eventos_web/router.ex
+++ b/lib/eventos_web/router.ex
@@ -36,6 +36,12 @@ defmodule EventosWeb.Router do
scope "/v1" do
post "/users", UserController, :register
+ get "/users/validate/:token", UserController, :validate
+ post "/users/resend", UserController, :resend_confirmation
+
+ post "/users/password-reset/send", UserController, :send_reset_password
+ post "/users/password-reset/post", UserController, :reset_password
+
post "/login", UserSessionController, :sign_in
get "/groups", GroupController, :index
get "/events", EventController, :index
@@ -119,6 +125,11 @@ defmodule EventosWeb.Router do
post "/inbox", ActivityPubController, :inbox
end
+ if Mix.env == :dev do
+ # If using Phoenix
+ forward "/sent_emails", Bamboo.SentEmailViewerPlug
+ end
+
scope "/", EventosWeb do
pipe_through :browser
diff --git a/lib/eventos_web/templates/email/email.html.eex b/lib/eventos_web/templates/email/email.html.eex
new file mode 100644
index 000000000..07deaae6b
--- /dev/null
+++ b/lib/eventos_web/templates/email/email.html.eex
@@ -0,0 +1,10 @@
+
+
+ ">
+
+
+ <%= render @view_module, @view_template, assigns %>
+
+
<%= gettext "An email sent by Eventos on %{instance}.", instance: @instance %>
+
+
diff --git a/lib/eventos_web/templates/email/email.text.eex b/lib/eventos_web/templates/email/email.text.eex
new file mode 100644
index 000000000..804356ecf
--- /dev/null
+++ b/lib/eventos_web/templates/email/email.text.eex
@@ -0,0 +1,3 @@
+<%= render @view_module, @view_template, assigns %>
+
+<%= gettext "An email sent by Eventos on %{instance}.", instance: @instance %>
diff --git a/lib/eventos_web/templates/email/password_reset.html.eex b/lib/eventos_web/templates/email/password_reset.html.eex
new file mode 100644
index 000000000..412fc0a98
--- /dev/null
+++ b/lib/eventos_web/templates/email/password_reset.html.eex
@@ -0,0 +1,5 @@
+
<%= gettext "Password reset" %>
+
<%= gettext "You requested a new password for your account on %{host}.", host: @instance %>
+
<%= gettext "If you didn't request this, please ignore this email. Your password won't change until you access the link below and create a new one." %>
+
+
<%= link "Change password", to: EventosWeb.Endpoint.url() <> "/password-reset/#{@token}", target: "_blank" %>
diff --git a/lib/eventos_web/templates/email/password_reset.text.eex b/lib/eventos_web/templates/email/password_reset.text.eex
new file mode 100644
index 000000000..882956acf
--- /dev/null
+++ b/lib/eventos_web/templates/email/password_reset.text.eex
@@ -0,0 +1,11 @@
+<%= gettext "Password reset" %>
+
+==
+
+<%= gettext "You requested a new password for your account on %{host}.", host: @instance %>
+
+<%= gettext "If you didn't request this, please ignore this email. Your password won't change until you access the link below and create a new one." %>
+
+<%= EventosWeb.Endpoint.url() <> "/password-reset/#{@token}" %>
+
+
diff --git a/lib/eventos_web/templates/email/registration_confirmation.html.eex b/lib/eventos_web/templates/email/registration_confirmation.html.eex
new file mode 100644
index 000000000..410cf8205
--- /dev/null
+++ b/lib/eventos_web/templates/email/registration_confirmation.html.eex
@@ -0,0 +1,4 @@
+
<%= gettext "Confirm the email address" %>
+
<%= gettext "You created an account on %{host} with this email address. You are one click away from activating it. If this wasn't you, please ignore this email.", host: @instance %>
+
+
<%= link "Confirm your email address", to: EventosWeb.Endpoint.url() <> "/validate/#{@token}", target: "_blank" %>
diff --git a/lib/eventos_web/templates/email/registration_confirmation.text.eex b/lib/eventos_web/templates/email/registration_confirmation.text.eex
new file mode 100644
index 000000000..3f6f0e052
--- /dev/null
+++ b/lib/eventos_web/templates/email/registration_confirmation.text.eex
@@ -0,0 +1,9 @@
+<%= gettext "Confirm the email address" %>
+
+==
+
+<%= gettext "You created an account on %{host} with this email address. You are one click away from activating it. If this wasn't you, please ignore this email.", host: @instance %>
+
+<%= EventosWeb.Endpoint.url() <> "/validate/#{@token}" %>
+
+
diff --git a/lib/eventos_web/views/email_view.ex b/lib/eventos_web/views/email_view.ex
new file mode 100644
index 000000000..d4eba334b
--- /dev/null
+++ b/lib/eventos_web/views/email_view.ex
@@ -0,0 +1,3 @@
+defmodule Eventos.EmailView do
+ use EventosWeb, :view
+end
diff --git a/lib/eventos_web/views/event_view.ex b/lib/eventos_web/views/event_view.ex
index 464a576a7..fbebc589c 100644
--- a/lib/eventos_web/views/event_view.ex
+++ b/lib/eventos_web/views/event_view.ex
@@ -20,7 +20,6 @@ defmodule EventosWeb.EventView do
def render("event_for_actor.json", %{event: event}) do
%{id: event.id,
title: event.title,
- slug: event.slug,
uuid: event.uuid,
}
end
@@ -28,7 +27,6 @@ defmodule EventosWeb.EventView do
def render("event_simple.json", %{event: event}) do
%{id: event.id,
title: event.title,
- slug: event.slug,
description: event.description,
begins_on: event.begins_on,
ends_on: event.ends_on,
@@ -39,6 +37,7 @@ defmodule EventosWeb.EventView do
avatar: event.organizer_actor.avatar_url,
},
type: "Event",
+ address_type: event.address_type,
}
end
@@ -51,8 +50,9 @@ defmodule EventosWeb.EventView do
uuid: event.uuid,
organizer: render_one(event.organizer_actor, ActorView, "acccount_basic.json"),
participants: render_many(event.participants, ActorView, "show_basic.json"),
- address: render_one(event.address, AddressView, "address.json"),
+ physical_address: render_one(event.physical_address, AddressView, "address.json"),
type: "Event",
+ address_type: event.address_type,
}
end
end
diff --git a/lib/eventos_web/views/user_view.ex b/lib/eventos_web/views/user_view.ex
index 600a3f07c..9cb940787 100644
--- a/lib/eventos_web/views/user_view.ex
+++ b/lib/eventos_web/views/user_view.ex
@@ -45,4 +45,16 @@ defmodule EventosWeb.UserView do
role: user.role,
}
end
+
+ def render("confirmation.json", %{user: user}) do
+ %{
+ email: user.email,
+ }
+ end
+
+ def render("password_reset.json", %{user: user}) do
+ %{
+ email: user.email,
+ }
+ end
end
diff --git a/lib/mix/tasks/create_bot.ex b/lib/mix/tasks/create_bot.ex
index 3618084ef..4c8718649 100644
--- a/lib/mix/tasks/create_bot.ex
+++ b/lib/mix/tasks/create_bot.ex
@@ -7,13 +7,14 @@ defmodule Mix.Tasks.CreateBot do
alias Eventos.Actors
alias Eventos.Actors.Bot
alias Eventos.Repo
+ alias Eventos.Actors.User
import Logger
@shortdoc "Register user"
def run([email, name, summary, type, url]) do
Mix.Task.run("app.start")
- with user <- Actors.find_by_email(email),
+ with {:ok, %User{} = user} <- Actors.find_by_email(email),
actor <- Actors.register_bot_account(%{name: name, summary: summary}),
{:ok, %Bot{} = bot} <- Actors.create_bot(%{"type" => type, "source" => url, "actor_id" => actor.id, "user_id" => user.id}) do
bot
diff --git a/mix.exs b/mix.exs
index 2ed6514be..d418b7d69 100644
--- a/mix.exs
+++ b/mix.exs
@@ -26,7 +26,7 @@ defmodule Eventos.Mixfile do
def application do
[
mod: {Eventos.Application, []},
- extra_applications: [:logger, :runtime_tools, :guardian]
+ extra_applications: [:logger, :runtime_tools, :guardian, :bamboo]
]
end
@@ -66,7 +66,9 @@ defmodule Eventos.Mixfile do
{:ex_crypto, "~> 0.9.0"},
{:http_sign, "~> 0.1.1"},
{:ecto_enum, "~> 1.0"},
- {:ex_ical, github: "tcitworld/ex_ical", branch: "usable"},
+ {:ex_ical, github: "fazibear/ex_ical"},
+ {:bamboo, "~> 1.0"},
+ {:bamboo_smtp, "~> 1.5.0"},
# Dev and test dependencies
{:phoenix_live_reload, "~> 1.0", only: :dev},
{:ex_machina, "~> 2.1", only: :test},
diff --git a/mix.lock b/mix.lock
index 7ce0c7032..8e09a813a 100644
--- a/mix.lock
+++ b/mix.lock
@@ -1,5 +1,7 @@
%{
"argon2_elixir": {:hex, :argon2_elixir, "1.3.0", "fbc521ca54e8802eeaf571caf1cf385827db3b02cae30d9aa591b83ea79785c2", [:make, :mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm"},
+ "bamboo": {:hex, :bamboo, "1.0.0", "446525f74eb59022ef58bc82f6c91c8e4c5a1469ab42a7f9b37c17262f872ef0", [:mix], [{:hackney, "~> 1.12.1", [hex: :hackney, repo: "hexpm", optional: false]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}, {:poison, ">= 1.5.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm"},
+ "bamboo_smtp": {:hex, :bamboo_smtp, "1.5.0", "ebc4deb64a0ff88d05edc1e5f6fd77aea563cdbeac3fcb277666af96dff309e3", [:mix], [{:bamboo, "~> 1.0.0", [hex: :bamboo, repo: "hexpm", optional: false]}, {:gen_smtp, "~> 0.12.0", [hex: :gen_smtp, repo: "hexpm", optional: false]}], "hexpm"},
"base64url": {:hex, :base64url, "0.0.1", "36a90125f5948e3afd7be97662a1504b934dd5dac78451ca6e9abf85a10286be", [:rebar], [], "hexpm"},
"bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm"},
"certifi": {:hex, :certifi, "2.3.1", "d0f424232390bf47d82da8478022301c561cf6445b5b5fb6a84d49a9e76d2639", [:rebar3], [{:parse_trans, "3.2.0", [hex: :parse_trans, repo: "hexpm", optional: false]}], "hexpm"},
@@ -19,13 +21,14 @@
"elixir_make": {:hex, :elixir_make, "0.4.1", "6628b86053190a80b9072382bb9756a6c78624f208ec0ff22cb94c8977d80060", [:mix], [], "hexpm"},
"ex_crypto": {:hex, :ex_crypto, "0.9.0", "e04a831034c4d0a43fb2858f696d6b5ae0f87f07dedca3452912fd3cb5ee3ca2", [:mix], [{:poison, ">= 2.0.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm"},
"ex_doc": {:hex, :ex_doc, "0.18.3", "f4b0e4a2ec6f333dccf761838a4b253d75e11f714b85ae271c9ae361367897b7", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}], "hexpm"},
- "ex_ical": {:git, "https://github.com/tcitworld/ex_ical.git", "e2facc514ee2ce99331b6a351c00667a9b28dd01", [branch: "usable"]},
+ "ex_ical": {:git, "https://github.com/fazibear/ex_ical.git", "7aec48272760cb52c237b316faadfc533d48e45c", []},
"ex_machina": {:hex, :ex_machina, "2.2.0", "fec496331e04fc2db2a1a24fe317c12c0c4a50d2beb8ebb3531ed1f0d84be0ed", [:mix], [{:ecto, "~> 2.1", [hex: :ecto, repo: "hexpm", optional: true]}], "hexpm"},
"ex_unit_notifier": {:hex, :ex_unit_notifier, "0.1.4", "36a2dcab829f506e01bf17816590680dd1474407926d43e64c1263e627c364b8", [:mix], [], "hexpm"},
"excoveralls": {:hex, :excoveralls, "0.8.2", "b941a08a1842d7aa629e0bbc969186a4cefdd035bad9fe15d43aaaaaeb8fae36", [:mix], [{:exjsx, ">= 3.0.0", [hex: :exjsx, repo: "hexpm", optional: false]}, {:hackney, ">= 0.12.0", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm"},
"exgravatar": {:hex, :exgravatar, "2.0.1", "66d595c7d63dd6bbac442c5542a724375ae29144059c6fe093e61553850aace4", [:mix], [], "hexpm"},
"exjsx": {:hex, :exjsx, "4.0.0", "60548841e0212df401e38e63c0078ec57b33e7ea49b032c796ccad8cde794b5c", [:mix], [{:jsx, "~> 2.8.0", [hex: :jsx, repo: "hexpm", optional: false]}], "hexpm"},
"file_system": {:hex, :file_system, "0.2.5", "a3060f063b116daf56c044c273f65202e36f75ec42e678dc10653056d3366054", [:mix], [], "hexpm"},
+ "gen_smtp": {:hex, :gen_smtp, "0.12.0", "97d44903f5ca18ca85cb39aee7d9c77e98d79804bbdef56078adcf905cb2ef00", [:rebar3], [], "hexpm"},
"geo": {:hex, :geo, "2.1.0", "f9a7a1403dde669c4e3f1885aeb4f3b3fb4e51cd28ada6d9f97463e5da65c04a", [:mix], [{:ecto, "~> 2.1", [hex: :ecto, repo: "hexpm", optional: true]}, {:poison, "~> 3.0", [hex: :poison, repo: "hexpm", optional: true]}], "hexpm"},
"geo_postgis": {:hex, :geo_postgis, "1.1.0", "4c9efc082a8b625c335967fec9f5671c2bc8a0a686f9c5130445ebbcca989740", [:mix], [{:geo, "~> 2.0", [hex: :geo, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.13", [hex: :postgrex, repo: "hexpm", optional: false]}], "hexpm"},
"gettext": {:hex, :gettext, "0.15.0", "40a2b8ce33a80ced7727e36768499fc9286881c43ebafccae6bab731e2b2b8ce", [:mix], [], "hexpm"},
diff --git a/priv/repo/migrations/20180515142835_alter_event_timestamps_to_date_time_with_time_zone.exs b/priv/repo/migrations/20180515142835_alter_event_timestamps_to_date_time_with_time_zone.exs
index 2f5ce1c08..2f178b147 100644
--- a/priv/repo/migrations/20180515142835_alter_event_timestamps_to_date_time_with_time_zone.exs
+++ b/priv/repo/migrations/20180515142835_alter_event_timestamps_to_date_time_with_time_zone.exs
@@ -10,8 +10,8 @@ defmodule Eventos.Repo.Migrations.AlterEventTimestampsToDateTimeWithTimeZone do
def down do
alter table("events") do
- modify :inserted_at, :naive_datetime
- modify :updated_at, :naive_datetime
+ modify :inserted_at, :timestamptz
+ modify :updated_at, :timestamptz
end
end
end
diff --git a/priv/repo/migrations/20180628091920_add-user-confirm-email-fields.exs b/priv/repo/migrations/20180628091920_add-user-confirm-email-fields.exs
new file mode 100644
index 000000000..2a2c3a76d
--- /dev/null
+++ b/priv/repo/migrations/20180628091920_add-user-confirm-email-fields.exs
@@ -0,0 +1,20 @@
+defmodule :"Elixir.Eventos.Repo.Migrations.Add-user-confirm-email-fields" do
+ use Ecto.Migration
+
+ def up do
+ alter table(:users) do
+ add :confirmed_at, :utc_datetime
+ add :confirmation_sent_at, :utc_datetime
+ add :confirmation_token, :string
+ end
+ create unique_index(:users, [:confirmation_token], name: "index_unique_users_confirmation_token")
+ end
+
+ def down do
+ alter table(:users) do
+ remove :confirmed_at
+ remove :confirmation_sent_at
+ remove :confirmation_token
+ end
+ end
+end
diff --git a/priv/repo/migrations/20180628130746_add-user-password-reset-fields.exs b/priv/repo/migrations/20180628130746_add-user-password-reset-fields.exs
new file mode 100644
index 000000000..65ab97de1
--- /dev/null
+++ b/priv/repo/migrations/20180628130746_add-user-password-reset-fields.exs
@@ -0,0 +1,18 @@
+defmodule :"Elixir.Eventos.Repo.Migrations.Add-user-password-reset-fields" do
+ use Ecto.Migration
+
+ def up do
+ alter table(:users) do
+ add :reset_password_sent_at, :utc_datetime
+ add :reset_password_token, :string
+ end
+ create unique_index(:users, [:reset_password_token], name: "index_unique_users_reset_password_token")
+ end
+
+ def down do
+ alter table(:users) do
+ remove :reset_password_sent_at
+ remove :reset_password_token
+ end
+ end
+end
diff --git a/priv/repo/migrations/20180628142835_revert_alter_event_timestamps.exs b/priv/repo/migrations/20180628142835_revert_alter_event_timestamps.exs
new file mode 100644
index 000000000..afbb3a9ea
--- /dev/null
+++ b/priv/repo/migrations/20180628142835_revert_alter_event_timestamps.exs
@@ -0,0 +1,17 @@
+defmodule Eventos.Repo.Migrations.AlterEventTimestampsToDateTimeWithTimeZone do
+ use Ecto.Migration
+
+ def up do
+ alter table("events") do
+ modify :inserted_at, :timestamptz
+ modify :updated_at, :timestamptz
+ end
+ end
+
+ def down do
+ alter table("events") do
+ modify :inserted_at, :utc_datetime
+ modify :updated_at, :utc_datetime
+ end
+ end
+end
diff --git a/priv/repo/migrations/20180702150922_add_address_type.exs b/priv/repo/migrations/20180702150922_add_address_type.exs
new file mode 100644
index 000000000..fbd329ab0
--- /dev/null
+++ b/priv/repo/migrations/20180702150922_add_address_type.exs
@@ -0,0 +1,31 @@
+defmodule Eventos.Repo.Migrations.AddAddressType do
+ use Ecto.Migration
+
+ def up do
+ AddressTypeEnum.create_type
+ alter table(:events) do
+ add :address_type, :address_type
+ add :online_address, :string
+ add :phone, :string
+ end
+ drop constraint(:events, "events_address_id_fkey")
+ rename table(:events), :address_id, to: :physical_address_id
+ alter table(:events) do
+ modify :physical_address_id, references(:addresses, on_delete: :nothing)
+ end
+ end
+
+ def down do
+ alter table(:events) do
+ remove :address_type
+ remove :online_address
+ remove :phone
+ end
+ AddressTypeEnum.drop_type
+ drop constraint(:events, "events_physical_address_id_fkey")
+ rename table(:events), :physical_address_id, to: :address_id
+ alter table(:events) do
+ modify :address_id, references(:addresses, on_delete: :nothing)
+ end
+ end
+end
diff --git a/priv/repo/migrations/20180702154630_remove_slug_for_event.exs b/priv/repo/migrations/20180702154630_remove_slug_for_event.exs
new file mode 100644
index 000000000..11ddc6024
--- /dev/null
+++ b/priv/repo/migrations/20180702154630_remove_slug_for_event.exs
@@ -0,0 +1,15 @@
+defmodule Eventos.Repo.Migrations.RemoveSlugForEvent do
+ use Ecto.Migration
+
+ def up do
+ alter table(:events) do
+ remove(:slug)
+ end
+ end
+
+ def down do
+ alter table(:events) do
+ add :slug, :string, null: false
+ end
+ end
+end
+
+
+
diff --git a/js/src/components/Account/ResendConfirmation.vue b/js/src/components/Account/ResendConfirmation.vue
new file mode 100644
index 000000000..7896d1907
--- /dev/null
+++ b/js/src/components/Account/ResendConfirmation.vue
@@ -0,0 +1,84 @@
+
+