+
![]()
@@ -16,13 +19,13 @@
+
-
+
Create a new identity
-
+
@@ -38,6 +41,7 @@
font-size: 1.3rem;
padding-bottom: 0;
margin-bottom: 15px;
+ color: #000;
&.is-current-identity {
background-color: rgba(0, 0, 0, 0.1);
@@ -50,33 +54,29 @@
diff --git a/js/src/components/NavBar.vue b/js/src/components/NavBar.vue
index fadee064b..727325053 100644
--- a/js/src/components/NavBar.vue
+++ b/js/src/components/NavBar.vue
@@ -17,43 +17,40 @@
+
{{ identity.displayName() }}
-
-
-
-
-
-
-
- {{ pictureFile.name }}
-
-
+
-
-
-
- ![]()
-
- {{ loggedPerson.preferredUsername }}
-
+
+
+
+
diff --git a/js/src/components/PictureUpload.vue b/js/src/components/PictureUpload.vue
index 20b70fcd6..5d5e8c518 100644
--- a/js/src/components/PictureUpload.vue
+++ b/js/src/components/PictureUpload.vue
@@ -1,29 +1,64 @@
-
+
+ ![]()
+
+
+
+
+
+
+
+
+
diff --git a/js/src/graphql/actor.ts b/js/src/graphql/actor.ts
index 82f5d0c99..61543f916 100644
--- a/js/src/graphql/actor.ts
+++ b/js/src/graphql/actor.ts
@@ -11,6 +11,7 @@ query($name:String!) {
preferredUsername,
suspended,
avatar {
+ name,
url
},
banner {
@@ -64,6 +65,7 @@ query {
export const IDENTITIES = gql`
query {
identities {
+ id,
avatar {
url
},
@@ -73,22 +75,51 @@ query {
}`;
export const CREATE_PERSON = gql`
-mutation CreatePerson($preferredUsername: String!) {
+mutation CreatePerson($preferredUsername: String!, $name: String!, $summary: String, $avatar: PictureInput) {
createPerson(
preferredUsername: $preferredUsername,
name: $name,
- summary: $summary
+ summary: $summary,
+ avatar: $avatar
) {
+ id,
preferredUsername,
name,
summary,
avatar {
url
- },
+ }
}
}
`;
+export const UPDATE_PERSON = gql`
+ mutation UpdatePerson($preferredUsername: String!, $name: String, $summary: String, $avatar: PictureInput) {
+ updatePerson(
+ preferredUsername: $preferredUsername,
+ name: $name,
+ summary: $summary,
+ avatar: $avatar
+ ) {
+ id,
+ preferredUsername,
+ name,
+ summary,
+ avatar {
+ url
+ },
+ }
+ }
+`;
+
+export const DELETE_PERSON = gql`
+ mutation DeletePerson($preferredUsername: String!) {
+ deletePerson(preferredUsername: $preferredUsername) {
+ preferredUsername,
+ }
+ }
+`;
+
/**
* This one is used only to register the first account. Prefer CREATE_PERSON when creating another identity
*/
diff --git a/js/src/main.ts b/js/src/main.ts
index 7ef88bf0b..d4fc48765 100644
--- a/js/src/main.ts
+++ b/js/src/main.ts
@@ -6,14 +6,14 @@ import GetTextPlugin from 'vue-gettext';
import App from '@/App.vue';
import router from '@/router';
import { apolloProvider } from './vue-apollo';
+import { NotifierPlugin } from '@/plugins/notifier';
const translations = require('@/i18n/translations.json');
Vue.config.productionTip = false;
-Vue.use(Buefy, {
- defaultContainerElement: '#mobilizon',
-});
+Vue.use(Buefy);
+Vue.use(NotifierPlugin);
const language = (window.navigator as any).userLanguage || window.navigator.language;
diff --git a/js/src/plugins/notifier.ts b/js/src/plugins/notifier.ts
new file mode 100644
index 000000000..00f302e2b
--- /dev/null
+++ b/js/src/plugins/notifier.ts
@@ -0,0 +1,32 @@
+import Vue from 'vue';
+
+declare module 'vue/types/vue' {
+ interface Vue {
+ $notifier: {
+ success: (message: string) => void;
+ };
+ }
+}
+
+export class Notifier {
+ private readonly vue: typeof Vue;
+
+ constructor(vue: typeof Vue) {
+ this.vue = vue;
+ }
+
+ success(message: string) {
+ this.vue.prototype.$notification.open({
+ message,
+ duration: 5000,
+ position: 'is-bottom-right',
+ type: 'is-success',
+ hasIcon: true,
+ });
+ }
+}
+
+// tslint:disable
+export function NotifierPlugin(vue: typeof Vue, options?: any): void {
+ vue.prototype.$notifier = new Notifier(vue);
+}
diff --git a/js/src/router/actor.ts b/js/src/router/actor.ts
index 0bb02beb4..42f3a4771 100644
--- a/js/src/router/actor.ts
+++ b/js/src/router/actor.ts
@@ -4,13 +4,18 @@ import CreateGroup from '@/views/Group/Create.vue';
import Group from '@/views/Group/Group.vue';
import GroupList from '@/views/Group/GroupList.vue';
import { RouteConfig } from 'vue-router';
+import EditIdentity from '@/views/Account/children/EditIdentity.vue';
export enum ActorRouteName {
GROUP_LIST = 'GroupList',
GROUP = 'Group',
CREATE_GROUP = 'CreateGroup',
PROFILE = 'Profile',
- MY_ACCOUNT = 'MyAccount',
+}
+
+export enum MyAccountRouteName {
+ CREATE_IDENTITY = 'CreateIdentity',
+ UPDATE_IDENTITY = 'UpdateIdentity',
}
export const actorRoutes: RouteConfig[] = [
@@ -41,10 +46,23 @@ export const actorRoutes: RouteConfig[] = [
meta: { requiredAuth: false },
},
{
- path: '/my-account',
- name: ActorRouteName.MY_ACCOUNT,
+ path: '/my-account/identity',
component: MyAccount,
props: true,
meta: { requiredAuth: true },
+ children: [
+ {
+ path: 'create',
+ name: MyAccountRouteName.CREATE_IDENTITY,
+ component: EditIdentity,
+ props: { isUpdate: false },
+ },
+ {
+ path: 'update/:identityName?',
+ name: MyAccountRouteName.UPDATE_IDENTITY,
+ component: EditIdentity,
+ props: { isUpdate: true },
+ },
+ ],
},
];
diff --git a/js/src/router/index.ts b/js/src/router/index.ts
index 30c3907bf..cca5e3726 100644
--- a/js/src/router/index.ts
+++ b/js/src/router/index.ts
@@ -4,7 +4,7 @@ import PageNotFound from '@/views/PageNotFound.vue';
import Home from '@/views/Home.vue';
import { UserRouteName, userRoutes } from './user';
import { EventRouteName, eventRoutes } from '@/router/event';
-import { ActorRouteName, actorRoutes } from '@/router/actor';
+import { ActorRouteName, actorRoutes, MyAccountRouteName } from '@/router/actor';
import { ErrorRouteName, errorRoutes } from '@/router/error';
import { authGuardIfNeeded } from '@/router/guards/auth-guard';
import Search from '@/views/Search.vue';
@@ -34,6 +34,7 @@ export const RouteName = {
...UserRouteName,
...EventRouteName,
...ActorRouteName,
+ ...MyAccountRouteName,
...ErrorRouteName,
};
diff --git a/js/src/types/actor/actor.model.ts b/js/src/types/actor/actor.model.ts
index 9014b0dd7..9f04f1da2 100644
--- a/js/src/types/actor/actor.model.ts
+++ b/js/src/types/actor/actor.model.ts
@@ -1,7 +1,7 @@
import { IPicture } from '@/types/picture.model';
export interface IActor {
- id?: string;
+ id?: number;
url: string;
name: string;
domain: string|null;
@@ -13,6 +13,7 @@ export interface IActor {
}
export class Actor implements IActor {
+ id?: number;
avatar: IPicture | null = null;
banner: IPicture | null = null;
domain: string | null = null;
diff --git a/js/src/types/actor/person.model.ts b/js/src/types/actor/person.model.ts
index d94e10649..3a3abcee8 100644
--- a/js/src/types/actor/person.model.ts
+++ b/js/src/types/actor/person.model.ts
@@ -20,6 +20,10 @@ export class Person extends Actor implements IPerson {
constructor(hash: IPerson | {} = {}) {
super(hash);
+ this.patch(hash);
+ }
+
+ patch (hash: any) {
Object.assign(this, hash);
}
}
diff --git a/js/src/views/Account/MyAccount.vue b/js/src/views/Account/MyAccount.vue
index 0f9cdde70..98802cc05 100644
--- a/js/src/views/Account/MyAccount.vue
+++ b/js/src/views/Account/MyAccount.vue
@@ -1,15 +1,18 @@
+
@@ -29,35 +32,46 @@
diff --git a/js/src/views/Account/Register.vue b/js/src/views/Account/Register.vue
index b5fbfdd42..da5ede467 100644
--- a/js/src/views/Account/Register.vue
+++ b/js/src/views/Account/Register.vue
@@ -87,7 +87,6 @@ export default class Register extends Vue {
preferredUsername: '',
name: '',
summary: '',
- id: '',
url: '',
suspended: false,
avatar: null,
diff --git a/js/src/views/Account/children/EditIdentity.vue b/js/src/views/Account/children/EditIdentity.vue
new file mode 100644
index 000000000..6a6835175
--- /dev/null
+++ b/js/src/views/Account/children/EditIdentity.vue
@@ -0,0 +1,329 @@
+
+
-
- ![banner]()
+
+ ![banner]()
-
+
+
+
+ {{ identity.displayName() }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/js/tsconfig.json b/js/tsconfig.json
index 0adb77a4d..4c53f0269 100644
--- a/js/tsconfig.json
+++ b/js/tsconfig.json
@@ -13,6 +13,7 @@
"sourceMap": true,
"skipLibCheck": true,
"baseUrl": ".",
+ "typeRoots": [ "node_modules/@types", "src/typings" ],
"types": [
"webpack-env",
"mocha",
diff --git a/js/tslint.json b/js/tslint.json
index 61db46360..ec31266d4 100644
--- a/js/tslint.json
+++ b/js/tslint.json
@@ -4,6 +4,7 @@
"max-line-length": [ true, 140 ],
"import-name": false,
"ter-arrow-parens": false,
- "no-boolean-literal-compare": false
+ "no-boolean-literal-compare": false,
+ "object-shorthand-properties-first": false
}
}
diff --git a/lib/mobilizon/actors/actors.ex b/lib/mobilizon/actors/actors.ex
index 0fe5c6336..128dd468b 100644
--- a/lib/mobilizon/actors/actors.ex
+++ b/lib/mobilizon/actors/actors.ex
@@ -129,7 +129,7 @@ defmodule Mobilizon.Actors do
Enum.each([:avatar, :banner], fn key ->
if Map.has_key?(changes, key) do
with %Ecto.Changeset{changes: %{url: new_url}} <- changes[key],
- old_url <- Map.from_struct(changeset.data) |> Map.get(key) |> Map.get(:url),
+ %{url: old_url} = _old_key <- Map.from_struct(changeset.data) |> Map.get(key),
false <- new_url == old_url do
MobilizonWeb.Upload.remove(old_url)
end
@@ -155,13 +155,11 @@ defmodule Mobilizon.Actors do
def delete_actor(%Actor{domain: nil} = actor) do
case Multi.new()
|> Multi.delete(:actor, actor)
- |> Multi.run(:remove_banner, fn _repo,
- %{actor: %Actor{banner: %File{url: url}}} = _picture ->
- MobilizonWeb.Upload.remove(url)
+ |> Multi.run(:remove_banner, fn _repo, %{actor: %Actor{}} = _picture ->
+ remove_banner(actor)
end)
- |> Multi.run(:remove_avatar, fn _repo,
- %{actor: %Actor{avatar: %File{url: url}}} = _picture ->
- MobilizonWeb.Upload.remove(url)
+ |> Multi.run(:remove_avatar, fn _repo, %{actor: %Actor{}} = _picture ->
+ remove_avatar(actor)
end)
|> Repo.transaction() do
{:ok, %{actor: %Actor{} = actor}} ->
@@ -989,4 +987,27 @@ defmodule Mobilizon.Actors do
def change_follower(%Follower{} = follower) do
Follower.changeset(follower, %{})
end
+
+ defp remove_banner(%Actor{banner: nil} = actor), do: {:ok, actor}
+
+ defp remove_banner(%Actor{banner: %File{url: url}} = actor) do
+ safe_remove_file(url, actor)
+ end
+
+ defp remove_avatar(%Actor{avatar: nil} = actor), do: {:ok, actor}
+
+ defp remove_avatar(%Actor{avatar: %File{url: url}} = actor) do
+ safe_remove_file(url, actor)
+ end
+
+ defp safe_remove_file(url, %Actor{} = actor) do
+ with {:ok, _value} <- MobilizonWeb.Upload.remove(url) do
+ {:ok, actor}
+ else
+ {:error, error} ->
+ Logger.error("Error while removing an upload file")
+ Logger.error(inspect(error))
+ {:ok, actor}
+ end
+ end
end
diff --git a/lib/mobilizon_web/resolvers/person.ex b/lib/mobilizon_web/resolvers/person.ex
index 7867859f6..dd6fbb1d7 100644
--- a/lib/mobilizon_web/resolvers/person.ex
+++ b/lib/mobilizon_web/resolvers/person.ex
@@ -69,9 +69,80 @@ defmodule MobilizonWeb.Resolvers.Person do
{:error, "You need to be logged-in to create a new identity"}
end
+ @doc """
+ This function is used to update an existing identity
+ """
+ def update_person(
+ _parent,
+ %{preferred_username: preferred_username} = args,
+ %{
+ context: %{
+ current_user: user
+ }
+ } = _resolution
+ ) do
+ args = Map.put(args, :user_id, user.id)
+
+ with {:find_actor, %Actor{} = actor} <-
+ {:find_actor, Actors.get_actor_by_name(preferred_username)},
+ {:is_owned, true, _} <- User.owns_actor(user, actor.id),
+ args <- save_attached_pictures(args),
+ {:ok, actor} <- Actors.update_actor(actor, args) do
+ {:ok, actor}
+ else
+ {:find_actor, nil} ->
+ {:error, "Actor not found"}
+
+ {:is_owned, false} ->
+ {:error, "Actor is not owned by authenticated user"}
+ end
+ end
+
+ def update_person(_parent, _args, _resolution) do
+ {:error, "You need to be logged-in to update an identity"}
+ end
+
+ @doc """
+ This function is used to delete an existing identity
+ """
+ def delete_person(
+ _parent,
+ %{preferred_username: preferred_username} = _args,
+ %{
+ context: %{
+ current_user: user
+ }
+ } = _resolution
+ ) do
+ with {:find_actor, %Actor{} = actor} <-
+ {:find_actor, Actors.get_actor_by_name(preferred_username)},
+ {:is_owned, true, _} <- User.owns_actor(user, actor.id),
+ {:last_identity, false} <- {:last_identity, last_identity?(user)},
+ {:ok, actor} <- Actors.delete_actor(actor) do
+ {:ok, actor}
+ else
+ {:find_actor, nil} ->
+ {:error, "Actor not found"}
+
+ {:last_identity, true} ->
+ {:error, "Cannot remove the last identity of a user"}
+
+ {:is_owned, false} ->
+ {:error, "Actor is not owned by authenticated user"}
+ end
+ end
+
+ def delete_person(_parent, _args, _resolution) do
+ {:error, "You need to be logged-in to delete an identity"}
+ end
+
+ defp last_identity?(user) do
+ length(Users.get_actors_for_user(user)) <= 1
+ end
+
defp save_attached_pictures(args) do
Enum.reduce([:avatar, :banner], args, fn key, args ->
- if Map.has_key?(args, key) do
+ if Map.has_key?(args, key) && !is_nil(args[key][:picture]) do
pic = args[key][:picture]
with {:ok, %{"name" => name, "url" => [%{"href" => url, "mediaType" => content_type}]}} <-
diff --git a/lib/mobilizon_web/schema/actors/person.ex b/lib/mobilizon_web/schema/actors/person.ex
index 942c39568..a8e278456 100644
--- a/lib/mobilizon_web/schema/actors/person.ex
+++ b/lib/mobilizon_web/schema/actors/person.ex
@@ -101,6 +101,34 @@ defmodule MobilizonWeb.Schema.Actors.PersonType do
resolve(handle_errors(&Person.create_person/3))
end
+ @desc "Update an identity"
+ field :update_person, :person do
+ arg(:preferred_username, non_null(:string))
+
+ arg(:name, :string, description: "The displayed name for this profile")
+
+ arg(:summary, :string, description: "The summary for this profile")
+
+ arg(:avatar, :picture_input,
+ description:
+ "The avatar for the profile, either as an object or directly the ID of an existing Picture"
+ )
+
+ arg(:banner, :picture_input,
+ description:
+ "The banner for the profile, either as an object or directly the ID of an existing Picture"
+ )
+
+ resolve(handle_errors(&Person.update_person/3))
+ end
+
+ @desc "Delete an identity"
+ field :delete_person, :person do
+ arg(:preferred_username, non_null(:string))
+
+ resolve(handle_errors(&Person.delete_person/3))
+ end
+
@desc "Register a first profile on registration"
field :register_person, :person do
arg(:preferred_username, non_null(:string))
diff --git a/test/mobilizon_web/resolvers/person_resolver_test.exs b/test/mobilizon_web/resolvers/person_resolver_test.exs
index 278e45845..131834edb 100644
--- a/test/mobilizon_web/resolvers/person_resolver_test.exs
+++ b/test/mobilizon_web/resolvers/person_resolver_test.exs
@@ -213,6 +213,235 @@ defmodule MobilizonWeb.Resolvers.PersonResolverTest do
MobilizonWeb.Endpoint.url() <> "/media/"
end
+ test "update_person/3 updates an existing identity", context do
+ user = insert(:user)
+ insert(:actor, user: user, preferred_username: "riri")
+
+ mutation = """
+ mutation {
+ updatePerson(
+ preferredUsername: "riri",
+ name: "riri updated",
+ summary: "summary updated",
+ banner: {
+ picture: {
+ file: "landscape.jpg",
+ name: "irish landscape",
+ alt: "The beautiful atlantic way"
+ }
+ }
+ ) {
+ id,
+ preferredUsername,
+ name,
+ summary,
+ avatar {
+ id,
+ url
+ },
+ banner {
+ id,
+ name,
+ url
+ }
+ }
+ }
+ """
+
+ map = %{
+ "query" => mutation,
+ "landscape.jpg" => %Plug.Upload{
+ path: "test/fixtures/picture.png",
+ filename: "landscape.jpg"
+ }
+ }
+
+ res =
+ context.conn
+ |> put_req_header("content-type", "multipart/form-data")
+ |> post("/api", map)
+
+ assert json_response(res, 200)["data"]["updatePerson"] == nil
+
+ assert hd(json_response(res, 200)["errors"])["message"] ==
+ "You need to be logged-in to update an identity"
+
+ res =
+ context.conn
+ |> auth_conn(user)
+ |> put_req_header("content-type", "multipart/form-data")
+ |> post("/api", map)
+
+ res_person = json_response(res, 200)["data"]["updatePerson"]
+
+ assert res_person["preferredUsername"] == "riri"
+ assert res_person["name"] == "riri updated"
+ assert res_person["summary"] == "summary updated"
+
+ assert res_person["banner"]["id"]
+ assert res_person["banner"]["name"] == "The beautiful atlantic way"
+ assert res_person["banner"]["url"] =~ MobilizonWeb.Endpoint.url() <> "/media/"
+ end
+
+ test "update_person/3 should fail to update a not owned identity", context do
+ user1 = insert(:user)
+ user2 = insert(:user)
+ insert(:actor, user: user2, preferred_username: "riri")
+
+ mutation = """
+ mutation {
+ updatePerson(
+ preferredUsername: "riri",
+ name: "riri updated",
+ ) {
+ id,
+ }
+ }
+ """
+
+ res =
+ context.conn
+ |> auth_conn(user1)
+ |> post("/api", AbsintheHelpers.mutation_skeleton(mutation))
+
+ assert json_response(res, 200)["data"]["updatePerson"] == nil
+
+ assert hd(json_response(res, 200)["errors"])["message"] ==
+ "Actor is not owned by authenticated user"
+ end
+
+ test "update_person/3 should fail to update a not existing identity", context do
+ user = insert(:user)
+ insert(:actor, user: user, preferred_username: "riri")
+
+ mutation = """
+ mutation {
+ updatePerson(
+ preferredUsername: "not_existing",
+ name: "riri updated",
+ ) {
+ id,
+ }
+ }
+ """
+
+ res =
+ context.conn
+ |> auth_conn(user)
+ |> post("/api", AbsintheHelpers.mutation_skeleton(mutation))
+
+ assert json_response(res, 200)["data"]["updatePerson"] == nil
+
+ assert hd(json_response(res, 200)["errors"])["message"] ==
+ "Actor not found"
+ end
+
+ test "delete_person/3 should fail to update a not owned identity", context do
+ user1 = insert(:user)
+ user2 = insert(:user)
+ insert(:actor, user: user2, preferred_username: "riri")
+
+ mutation = """
+ mutation {
+ deletePerson(preferredUsername: "riri") {
+ id,
+ }
+ }
+ """
+
+ res =
+ context.conn
+ |> auth_conn(user1)
+ |> post("/api", AbsintheHelpers.mutation_skeleton(mutation))
+
+ assert json_response(res, 200)["data"]["updatePerson"] == nil
+
+ assert hd(json_response(res, 200)["errors"])["message"] ==
+ "Actor is not owned by authenticated user"
+ end
+
+ test "delete_person/3 should fail to delete a not existing identity", context do
+ user = insert(:user)
+ insert(:actor, user: user, preferred_username: "riri")
+
+ mutation = """
+ mutation {
+ deletePerson(preferredUsername: "fifi") {
+ id,
+ }
+ }
+ """
+
+ res =
+ context.conn
+ |> auth_conn(user)
+ |> post("/api", AbsintheHelpers.mutation_skeleton(mutation))
+
+ assert json_response(res, 200)["data"]["updatePerson"] == nil
+
+ assert hd(json_response(res, 200)["errors"])["message"] ==
+ "Actor not found"
+ end
+
+ test "delete_person/3 should fail to delete the last user identity", context do
+ user = insert(:user)
+ insert(:actor, user: user, preferred_username: "riri")
+
+ mutation = """
+ mutation {
+ deletePerson(preferredUsername: "riri") {
+ id,
+ }
+ }
+ """
+
+ res =
+ context.conn
+ |> auth_conn(user)
+ |> post("/api", AbsintheHelpers.mutation_skeleton(mutation))
+
+ assert json_response(res, 200)["data"]["updatePerson"] == nil
+
+ assert hd(json_response(res, 200)["errors"])["message"] ==
+ "Cannot remove the last identity of a user"
+ end
+
+ test "delete_person/3 should delete a user identity", context do
+ user = insert(:user)
+ insert(:actor, user: user, preferred_username: "riri")
+ insert(:actor, user: user, preferred_username: "fifi")
+
+ mutation = """
+ mutation {
+ deletePerson(preferredUsername: "riri") {
+ id,
+ }
+ }
+ """
+
+ res =
+ context.conn
+ |> auth_conn(user)
+ |> post("/api", AbsintheHelpers.mutation_skeleton(mutation))
+
+ assert json_response(res, 200)["errors"] == nil
+
+ query = """
+ {
+ person(preferredUsername: "riri") {
+ id,
+ }
+ }
+ """
+
+ res =
+ context.conn
+ |> auth_conn(user)
+ |> get("/api", AbsintheHelpers.query_skeleton(query, "person"))
+
+ assert hd(json_response(res, 200)["errors"])["message"] == "Person with name riri not found"
+ end
+
test "get_current_person/3 can return the events the person is going to", context do
user = insert(:user)
actor = insert(:actor, user: user)
+ {{ identity.displayName() }}
+ I create an identity
+
+
+ + +
+
+
+
+
+
+ Delete this identity
+
+
+