Merge branch 'avatar' into 'master'

Introduce avatar and banner and fetch Gravatar to fill avatar during registration

Closes #7

See merge request tcit/eventos!10
This commit is contained in:
Benjamin Bouvier
2018-01-27 19:45:03 +01:00
11 changed files with 71 additions and 23 deletions

View File

@@ -18,6 +18,8 @@ defmodule Eventos.Accounts.Account do
field :uri, :string
field :url, :string
field :username, :string
field :avatar_url, :string
field :banner_url, :string
has_many :organized_events, Event, [foreign_key: :organizer_account_id]
many_to_many :groups, Group, join_through: Member
has_many :group_request, Request
@@ -29,14 +31,14 @@ defmodule Eventos.Accounts.Account do
@doc false
def changeset(%Account{} = account, attrs) do
account
|> cast(attrs, [:username, :domain, :display_name, :description, :private_key, :public_key, :suspended, :uri, :url])
|> cast(attrs, [:username, :domain, :display_name, :description, :private_key, :public_key, :suspended, :uri, :url, :avatar_url, :banner_url])
|> validate_required([:username, :public_key, :suspended, :uri, :url])
|> unique_constraint(:username, name: :accounts_username_domain_index)
end
def registration_changeset(%Account{} = account, attrs) do
account
|> cast(attrs, [:username, :domain, :display_name, :description, :private_key, :public_key, :suspended, :uri, :url])
|> cast(attrs, [:username, :domain, :display_name, :description, :private_key, :public_key, :suspended, :uri, :url, :avatar_url, :banner_url])
|> validate_required([:username, :public_key, :suspended, :uri, :url])
|> unique_constraint(:username)
end

View File

@@ -4,8 +4,9 @@ defmodule Eventos.Accounts do
"""
import Ecto.Query, warn: false
alias Eventos.Repo
import Exgravatar
alias Eventos.Repo
alias Eventos.Accounts.Account
@doc """
@@ -173,6 +174,19 @@ defmodule Eventos.Accounts do
end
end
@doc """
Fetch gravatar url for email and set it as avatar if it exists
"""
defp gravatar(email) do
url = gravatar_url(email, default: "404")
case HTTPoison.get(url, [], [ssl: [{:versions, [:'tlsv1.2']}]]) do # See https://github.com/edgurgel/httpoison#note-about-broken-ssl-in-erlang-19
{:ok, %HTTPoison.Response{status_code: 200}} ->
url
_ -> # User doesn't have a gravatar email, or other issues
nil
end
end
@doc """
Register user
"""
@@ -180,13 +194,15 @@ defmodule Eventos.Accounts do
{:ok, {privkey, pubkey}} = RsaEx.generate_keypair("4096")
avatar = gravatar(email)
account = Eventos.Accounts.Account.registration_changeset(%Eventos.Accounts.Account{}, %{
username: username,
domain: nil,
private_key: privkey,
public_key: pubkey,
uri: "h",
url: "h"
url: "h",
avatar_url: avatar,
})
user = Eventos.Accounts.User.registration_changeset(%Eventos.Accounts.User{}, %{
@@ -207,7 +223,6 @@ defmodule Eventos.Accounts do
end
end
@doc """
Creates a user.

View File

@@ -6,7 +6,6 @@ defmodule Eventos.Accounts.User do
import Ecto.Changeset
alias Eventos.Accounts.{Account, User}
schema "users" do
field :email, :string
field :password_hash, :string
@@ -31,9 +30,12 @@ defmodule Eventos.Accounts.User do
|> changeset(params)
|> cast(params, ~w(password)a, [])
|> validate_length(:password, min: 6, max: 100)
|> hash_password
|> hash_password()
end
@doc """
Hash password when it's changed
"""
defp hash_password(changeset) do
case changeset do
%Ecto.Changeset{valid?: true,
@@ -45,5 +47,4 @@ defmodule Eventos.Accounts.User do
changeset
end
end
end

View File

@@ -27,6 +27,8 @@ defmodule EventosWeb.AccountView do
suspended: account.suspended,
uri: account.uri,
url: account.url,
avatar_url: account.avatar_url,
banner_url: account.banner_url,
}
end
@@ -40,6 +42,8 @@ defmodule EventosWeb.AccountView do
suspended: account.suspended,
uri: account.uri,
url: account.url,
avatar_url: account.avatar_url,
banner_url: account.banner_url,
organized_events: render_many(account.organized_events, EventView, "event_simple.json")
}
end