From f5d4816c3d41f88e07f2618f72b726250e972bdb Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 8 Oct 2019 18:13:06 +0200
Subject: [PATCH 1/9] Properly handle account deleted

Close #191

Also fix an issue with public events not being accessible when requested
as another logged-in user.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/components/NavBar.vue         |  9 ++++++++-
 lib/mobilizon_web/resolvers/event.ex | 14 +++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/js/src/components/NavBar.vue b/js/src/components/NavBar.vue
index 7b77a5fce..ef22d4b14 100644
--- a/js/src/components/NavBar.vue
+++ b/js/src/components/NavBar.vue
@@ -15,7 +15,7 @@
         <search-field />
       </b-navbar-item>
 
-      <b-navbar-dropdown v-if="currentUser.isLoggedIn" right>
+      <b-navbar-dropdown v-if="currentActor.id && currentUser.isLoggedIn" right>
         <template slot="label" v-if="currentActor" class="navbar-dropdown-profile">
           <figure class="image is-32x32" v-if="currentActor.avatar">
             <img class="is-rounded" alt="avatarUrl" :src="currentActor.avatar.url">
@@ -97,6 +97,7 @@ import { RouteName } from '@/router';
       skip() {
         return this.currentUser.isLoggedIn === false;
       },
+      error({ graphQLErrors }) { this.handleErrors(graphQLErrors); },
     },
     config: {
       query: CONFIG,
@@ -135,6 +136,12 @@ export default class NavBar extends Vue {
     }
   }
 
+  async handleErrors(errors: GraphQLError) {
+    if (errors[0].message === 'You need to be logged-in to view your list of identities') {
+      await this.logout();
+    }
+  }
+
   async logout() {
     await logout(this.$apollo.provider.defaultClient);
     this.$buefy.notification.open({
diff --git a/lib/mobilizon_web/resolvers/event.ex b/lib/mobilizon_web/resolvers/event.ex
index 5dc961fb2..97518cf04 100644
--- a/lib/mobilizon_web/resolvers/event.ex
+++ b/lib/mobilizon_web/resolvers/event.ex
@@ -31,11 +31,11 @@ defmodule MobilizonWeb.Resolvers.Event do
     {:error, :events_max_limit_reached}
   end
 
-  def find_event(
-        _parent,
-        %{uuid: uuid},
-        %{context: %{current_user: %User{id: user_id}}} = _resolution
-      ) do
+  defp find_private_event(
+         _parent,
+         %{uuid: uuid},
+         %{context: %{current_user: %User{id: user_id}}} = _resolution
+       ) do
     case {:has_event, Mobilizon.Events.get_own_event_by_uuid_with_preload(uuid, user_id)} do
       {:has_event, %Event{} = event} ->
         {:ok, Map.put(event, :organizer_actor, Person.proxify_pictures(event.organizer_actor))}
@@ -45,13 +45,13 @@ defmodule MobilizonWeb.Resolvers.Event do
     end
   end
 
-  def find_event(_parent, %{uuid: uuid}, _resolution) do
+  def find_event(parent, %{uuid: uuid} = args, resolution) do
     case {:has_event, Mobilizon.Events.get_public_event_by_uuid_with_preload(uuid)} do
       {:has_event, %Event{} = event} ->
         {:ok, Map.put(event, :organizer_actor, Person.proxify_pictures(event.organizer_actor))}
 
       {:has_event, _} ->
-        {:error, "Event with UUID #{uuid} not found"}
+        find_private_event(parent, args, resolution)
     end
   end
 

From 5e110fd0426085f4bdda5c9c6e2c9be4a20f2aaf Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 8 Oct 2019 18:28:35 +0200
Subject: [PATCH 2/9] Make sure the registration email is sent with the correct
 locale

Closes #189

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/graphql/user.ts                   | 4 ++--
 js/src/i18n/en_US.json                   | 2 +-
 js/src/i18n/fr_FR.json                   | 2 +-
 js/src/i18n/oc.json                      | 2 +-
 js/src/views/User/Register.vue           | 2 ++
 js/src/views/User/ResendConfirmation.vue | 2 +-
 js/src/views/User/SendPasswordReset.vue  | 2 +-
 7 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/js/src/graphql/user.ts b/js/src/graphql/user.ts
index ae7ee2629..6a3e82081 100644
--- a/js/src/graphql/user.ts
+++ b/js/src/graphql/user.ts
@@ -1,8 +1,8 @@
 import gql from 'graphql-tag';
 
 export const CREATE_USER = gql`
-mutation CreateUser($email: String!, $password: String!) {
-  createUser(email: $email, password: $password) {
+mutation CreateUser($email: String!, $password: String!, $locale: String) {
+  createUser(email: $email, password: $password, locale: $locale) {
     email,
     confirmationSentAt
   }
diff --git a/js/src/i18n/en_US.json b/js/src/i18n/en_US.json
index 6357caac5..14c63e478 100644
--- a/js/src/i18n/en_US.json
+++ b/js/src/i18n/en_US.json
@@ -173,7 +173,7 @@
 	"Past events": "Passed events",
 	"Pick an identity": "Pick an identity",
 	"Please be nice to each other": "Please be nice to each other",
-	"Please check you spam folder if you didn't receive the email.": "Please check you spam folder if you didn't receive the email.",
+	"Please check your spam folder if you didn't receive the email.": "Please check your spam folder if you didn't receive the email.",
 	"Please contact this instance's Mobilizon admin if you think this is a mistake.": "Please contact this instance's Mobilizon admin if you think this is a mistake.",
 	"Please make sure the address is correct and that the page hasn't been moved.": "Please make sure the address is correct and that the page hasn't been moved.",
 	"Please read the full rules": "Please read the full rules",
diff --git a/js/src/i18n/fr_FR.json b/js/src/i18n/fr_FR.json
index 1b87577d2..e8d9e5987 100644
--- a/js/src/i18n/fr_FR.json
+++ b/js/src/i18n/fr_FR.json
@@ -159,7 +159,7 @@
     "Past events": "Événements passés",
     "Pick an identity": "Choisissez une identité",
     "Please be nice to each other": "Soyez sympas entre vous",
-    "Please check you spam folder if you didn't receive the email.": "Merci de vérifier votre dossier des indésirables si vous n'avez pas reçu l'email.",
+    "Please check your spam folder if you didn't receive the email.": "Merci de vérifier votre dossier des indésirables si vous n'avez pas reçu l'email.",
     "Please contact this instance's Mobilizon admin if you think this is a mistake.": "Veuillez contacter l'administrateur de cette instance Mobilizon si vous pensez qu’il s’agit d’une erreur.",
     "Please make sure the address is correct and that the page hasn't been moved.": "Assurez‐vous que l’adresse est correcte et que la page n’a pas été déplacée.",
     "Please read the full rules": "Merci de lire les règles complètes",
diff --git a/js/src/i18n/oc.json b/js/src/i18n/oc.json
index 82f28745f..d80296929 100644
--- a/js/src/i18n/oc.json
+++ b/js/src/i18n/oc.json
@@ -224,7 +224,7 @@
     "The event organizer has chosen to approve manually the participations to this event. You will receive a notification when your participation has been approved": "L’organizator de l’eveniment causèt d’aprovar manualament las participacions d’aqueste eveniment. Recebretz una notificacion quand serà aprovada",
     "The event came from another instance. Your participation will be confirmed after we confirm it with the other instance.": "L’eveniment ven d’una autra instància. Vòstra participacion serà confirmada aprèp qu’ajam recebut la confirmacion de l’autra instància.",
     "Please contact this instance's Mobilizon admin if you think this is a mistake.": "Volgatz contactar l’administrator d’aquesta instància Mobilizon se pensatz qu’es una error.",
-    "Please check you spam folder if you didn't receive the email.": "Mercés de verificar vòstre dorsièr de messatges indesirables s’avètz pas recebut lo corrièl.",
+    "Please check your spam folder if you didn't receive the email.": "Mercés de verificar vòstre dorsièr de messatges indesirables s’avètz pas recebut lo corrièl.",
     "If this identity is the only administrator of some groups, you need to delete them before being able to delete this identity.": "S’aquesta identitat es l’unica que pòt administrar unes grops, vos cal los suprimir d’en primièr per dire de poder suprimir aquesta identitat.",
     "The content came from another server. Transfer an anonymous copy of the report?": "Lo contengut ven d’una autra instància. Transferir una còpia anonima del senhalament ?",
     "Please make sure the address is correct and that the page hasn't been moved.": "Asseguratz-vos que l’adreça es corrècta e que la pagina es pas estada desplaçada.",
diff --git a/js/src/views/User/Register.vue b/js/src/views/User/Register.vue
index 3cbf2945a..589da6977 100644
--- a/js/src/views/User/Register.vue
+++ b/js/src/views/User/Register.vue
@@ -115,6 +115,7 @@ export default class Register extends Vue {
   credentials = {
     email: this.email,
     password: this.password,
+    locale: 'en',
   };
   errors: object = {};
   sendingValidation: boolean = false;
@@ -122,6 +123,7 @@ export default class Register extends Vue {
   RouteName = RouteName;
 
   async submit() {
+    this.credentials.locale = this.$i18n.locale;
     try {
       this.sendingValidation = true;
       this.errors = {};
diff --git a/js/src/views/User/ResendConfirmation.vue b/js/src/views/User/ResendConfirmation.vue
index 283866c16..afb34c854 100644
--- a/js/src/views/User/ResendConfirmation.vue
+++ b/js/src/views/User/ResendConfirmation.vue
@@ -17,7 +17,7 @@
           {{ $t('If an account with this email exists, we just sent another confirmation email to {email}', {email: credentials.email}) }}
         </b-message>
         <b-message type="is-info">
-          {{ $t("Please check you spam folder if you didn't receive the email.") }}
+          {{ $t("Please check your spam folder if you didn't receive the email.") }}
         </b-message>
       </div>
     </div>
diff --git a/js/src/views/User/SendPasswordReset.vue b/js/src/views/User/SendPasswordReset.vue
index 5583d8165..5ad1150ed 100644
--- a/js/src/views/User/SendPasswordReset.vue
+++ b/js/src/views/User/SendPasswordReset.vue
@@ -18,7 +18,7 @@
           {{ $t('We just sent an email to {email}', {email: credentials.email}) }}
         </b-message>
         <b-message type="is-info">
-          {{ $t("Please check you spam folder if you didn't receive the email.") }}
+          {{ $t("Please check your spam folder if you didn't receive the email.") }}
         </b-message>
       </div>
     </div>

From 89c7a3854b2856b9364d0c1da8471b86cdba5c18 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 8 Oct 2019 19:32:48 +0200
Subject: [PATCH 3/9] Fix sending empty picture when updating identity without
 updated picture

Closes #188

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/graphql/actor.ts                       | 12 +++++++++
 js/src/utils/image.ts                         | 14 ++++++++++
 .../views/Account/children/EditIdentity.vue   | 26 ++++++++++++++-----
 3 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/js/src/graphql/actor.ts b/js/src/graphql/actor.ts
index 105bd5b48..b3fd867ba 100644
--- a/js/src/graphql/actor.ts
+++ b/js/src/graphql/actor.ts
@@ -11,16 +11,19 @@ query($username: String!) {
     preferredUsername,
     suspended,
     avatar {
+      id,
       name,
       url
     },
     banner {
+      id,
       url
     },
     feedTokens {
         token
     },
     organizedEvents {
+        id,
         uuid,
         title,
         beginsOn
@@ -40,6 +43,7 @@ export const GET_PERSON = gql`
             preferredUsername,
             suspended,
             avatar {
+                id,
                 name,
                 url
             },
@@ -50,6 +54,7 @@ export const GET_PERSON = gql`
                 token
             },
             organizedEvents {
+                id,
                 uuid,
                 title,
                 beginsOn
@@ -63,6 +68,7 @@ query {
   loggedPerson {
     id,
     avatar {
+      id,
       url
     },
     preferredUsername,
@@ -109,6 +115,7 @@ query LoggedUserParticipations($afterDateTime: DateTime, $beforeDateTime: DateTi
                   name,
                   domain,
                   avatar {
+                      id,
                       url
                   }
               },
@@ -129,6 +136,7 @@ query LoggedUserParticipations($afterDateTime: DateTime, $beforeDateTime: DateTi
               name,
               domain,
               avatar {
+                  id,
                   url
               }
           }
@@ -156,6 +164,7 @@ export const LOGGED_USER_DRAFTS = gql`
                     name,
                     domain,
                     avatar {
+                        id,
                         url
                     }
                 },
@@ -176,6 +185,7 @@ query {
   identities {
     id,
     avatar {
+        id,
         url
     },
     preferredUsername,
@@ -196,6 +206,7 @@ mutation CreatePerson($preferredUsername: String!, $name: String!, $summary: Str
     name,
     summary,
     avatar {
+      id,
       url
     }
   }
@@ -215,6 +226,7 @@ export const UPDATE_PERSON = gql`
       name,
       summary,
       avatar {
+        id,
         url
       },
     }
diff --git a/js/src/utils/image.ts b/js/src/utils/image.ts
index 8eeba866b..372eab73e 100644
--- a/js/src/utils/image.ts
+++ b/js/src/utils/image.ts
@@ -22,3 +22,17 @@ export function buildFileVariable<T>(file: File | null, name: string, alt?: stri
     },
   };
 }
+
+export function readFileAsync(file: File): Promise<string|ArrayBuffer|null> {
+  return new Promise((resolve, reject) => {
+    const reader = new FileReader();
+
+    reader.onload = () => {
+      resolve(reader.result);
+    };
+
+    reader.onerror = reject;
+
+    reader.readAsBinaryString(file);
+  });
+}
diff --git a/js/src/views/Account/children/EditIdentity.vue b/js/src/views/Account/children/EditIdentity.vue
index 93bd14621..aa46a3928 100644
--- a/js/src/views/Account/children/EditIdentity.vue
+++ b/js/src/views/Account/children/EditIdentity.vue
@@ -94,7 +94,7 @@ import PictureUpload from '@/components/PictureUpload.vue';
 import { MOBILIZON_INSTANCE_HOST } from '@/api/_entrypoint';
 import { Dialog } from 'buefy/dist/components/dialog';
 import { RouteName } from '@/router';
-import { buildFileFromIPicture, buildFileVariable } from '@/utils/image';
+import { buildFileFromIPicture, buildFileVariable, readFileAsync } from '@/utils/image';
 import { changeIdentity } from '@/utils/auth';
 
 @Component({
@@ -198,9 +198,11 @@ export default class EditIdentity extends Vue {
 
   async updateIdentity() {
     try {
+      const variables = await this.buildVariables();
+
       await this.$apollo.mutate({
         mutation: UPDATE_PERSON,
-        variables: this.buildVariables(),
+        variables,
         update: (store, { data: { updatePerson } }) => {
           const data = store.readQuery<{ identities: IPerson[] }>({ query: IDENTITIES });
 
@@ -225,9 +227,11 @@ export default class EditIdentity extends Vue {
 
   async createIdentity() {
     try {
+      const variables = await this.buildVariables();
+
       await this.$apollo.mutate({
         mutation: CREATE_PERSON,
-        variables: this.buildVariables(),
+        variables,
         update: (store, { data: { createPerson } }) => {
           const data = store.readQuery<{ identities: IPerson[] }>({ query: IDENTITIES });
 
@@ -305,10 +309,20 @@ export default class EditIdentity extends Vue {
                 .replace(/[^a-z0-9._]/g, '');
   }
 
-  private buildVariables() {
-    const avatarObj = buildFileVariable(this.avatarFile, 'avatar', `${this.identity.preferredUsername}'s avatar`);
+  private async buildVariables() {
+    const oldAvatarFile = await buildFileFromIPicture(this.identity.avatar);
+    const oldAvatarFileContent = await readFileAsync(oldAvatarFile);
+    const newAvatarFileContent = await readFileAsync(this.avatarFile);
 
-    return Object.assign({}, this.identity, avatarObj);
+    const avatarObj = buildFileVariable(this.avatarFile, 'avatar', `${this.identity.preferredUsername}'s avatar`);
+    const res = Object.assign({}, this.identity, avatarObj);
+    /**
+     * If the avatar didn't change, no need to try reuploading it
+     */
+    if (oldAvatarFileContent === newAvatarFileContent) {
+      res.avatar = {};
+    }
+    return res;
   }
 
   private async redirectIfNoIdentitySelected (identityParam?: string) {

From 4f487c84ae4e31b0dde5727f6ff8edcd550cd07f Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 8 Oct 2019 19:41:14 +0200
Subject: [PATCH 4/9] Remove own current identity events from featured events

Events from other identities are still displayed

Closes #187

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/views/Home.vue | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/js/src/views/Home.vue b/js/src/views/Home.vue
index d0845476c..c41ebf0e9 100644
--- a/js/src/views/Home.vue
+++ b/js/src/views/Home.vue
@@ -30,7 +30,7 @@
           {{ $t('Welcome back {username}', { username: currentActor.displayName() }) }}
         </b-message>
       </section>
-      <section v-if="currentActor && goingToEvents.size > 0" class="container">
+      <section v-if="currentActor.id && goingToEvents.size > 0" class="container">
         <h3 class="title">
           {{ $t("Upcoming") }}
         </h3>
@@ -81,8 +81,8 @@
       <section class="events-featured">
         <h3 class="title">{{ $t('Featured events') }}</h3>
         <b-loading :active.sync="$apollo.loading"></b-loading>
-        <div v-if="events.length > 0" class="columns is-multiline">
-          <div class="column is-one-third-desktop" v-for="event in events.slice(0, 6)" :key="event.uuid">
+        <div v-if="filteredFeaturedEvents.length > 0" class="columns is-multiline">
+          <div class="column is-one-third-desktop" v-for="event in filteredFeaturedEvents.slice(0, 6)" :key="event.uuid">
             <EventCard
               :event="event"
             />
@@ -224,6 +224,11 @@ export default class Home extends Vue {
     return res;
   }
 
+  get filteredFeaturedEvents() {
+    if (this.currentUser.isLoggedIn === false || !this.currentActor.id) return this.events;
+    return this.events.filter(event => event.organizerActor.id !== this.currentActor.id);
+  }
+
   geoLocalize() {
     const router = this.$router;
     const sessionCity = sessionStorage.getItem('City');

From 27ca73e57094fe10c2cb345e187760611d2296b0 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 8 Oct 2019 19:47:15 +0200
Subject: [PATCH 5/9] Revert adding picture IDs everywhere

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/graphql/actor.ts | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/js/src/graphql/actor.ts b/js/src/graphql/actor.ts
index b3fd867ba..105bd5b48 100644
--- a/js/src/graphql/actor.ts
+++ b/js/src/graphql/actor.ts
@@ -11,19 +11,16 @@ query($username: String!) {
     preferredUsername,
     suspended,
     avatar {
-      id,
       name,
       url
     },
     banner {
-      id,
       url
     },
     feedTokens {
         token
     },
     organizedEvents {
-        id,
         uuid,
         title,
         beginsOn
@@ -43,7 +40,6 @@ export const GET_PERSON = gql`
             preferredUsername,
             suspended,
             avatar {
-                id,
                 name,
                 url
             },
@@ -54,7 +50,6 @@ export const GET_PERSON = gql`
                 token
             },
             organizedEvents {
-                id,
                 uuid,
                 title,
                 beginsOn
@@ -68,7 +63,6 @@ query {
   loggedPerson {
     id,
     avatar {
-      id,
       url
     },
     preferredUsername,
@@ -115,7 +109,6 @@ query LoggedUserParticipations($afterDateTime: DateTime, $beforeDateTime: DateTi
                   name,
                   domain,
                   avatar {
-                      id,
                       url
                   }
               },
@@ -136,7 +129,6 @@ query LoggedUserParticipations($afterDateTime: DateTime, $beforeDateTime: DateTi
               name,
               domain,
               avatar {
-                  id,
                   url
               }
           }
@@ -164,7 +156,6 @@ export const LOGGED_USER_DRAFTS = gql`
                     name,
                     domain,
                     avatar {
-                        id,
                         url
                     }
                 },
@@ -185,7 +176,6 @@ query {
   identities {
     id,
     avatar {
-        id,
         url
     },
     preferredUsername,
@@ -206,7 +196,6 @@ mutation CreatePerson($preferredUsername: String!, $name: String!, $summary: Str
     name,
     summary,
     avatar {
-      id,
       url
     }
   }
@@ -226,7 +215,6 @@ export const UPDATE_PERSON = gql`
       name,
       summary,
       avatar {
-        id,
         url
       },
     }

From 2eda49bfbb7ffb36f21d65916f3d446b8a396730 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 8 Oct 2019 20:00:26 +0200
Subject: [PATCH 6/9] fix lint issues and errors

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/components/NavBar.vue                   |  1 +
 js/src/views/Account/children/EditIdentity.vue | 13 +++++++------
 js/src/views/Home.vue                          |  6 +++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/js/src/components/NavBar.vue b/js/src/components/NavBar.vue
index ef22d4b14..6632a990d 100644
--- a/js/src/components/NavBar.vue
+++ b/js/src/components/NavBar.vue
@@ -82,6 +82,7 @@ import { ICurrentUser, ICurrentUserRole } from '@/types/current-user.model';
 import Logo from '@/components/Logo.vue';
 import SearchField from '@/components/SearchField.vue';
 import { RouteName } from '@/router';
+import { GraphQLError } from 'graphql';
 
 @Component({
   apollo: {
diff --git a/js/src/views/Account/children/EditIdentity.vue b/js/src/views/Account/children/EditIdentity.vue
index aa46a3928..7233b92ea 100644
--- a/js/src/views/Account/children/EditIdentity.vue
+++ b/js/src/views/Account/children/EditIdentity.vue
@@ -310,17 +310,18 @@ export default class EditIdentity extends Vue {
   }
 
   private async buildVariables() {
-    const oldAvatarFile = await buildFileFromIPicture(this.identity.avatar);
-    const oldAvatarFileContent = await readFileAsync(oldAvatarFile);
-    const newAvatarFileContent = await readFileAsync(this.avatarFile);
-
     const avatarObj = buildFileVariable(this.avatarFile, 'avatar', `${this.identity.preferredUsername}'s avatar`);
     const res = Object.assign({}, this.identity, avatarObj);
     /**
      * If the avatar didn't change, no need to try reuploading it
      */
-    if (oldAvatarFileContent === newAvatarFileContent) {
-      res.avatar = {};
+    if (this.identity.avatar) {
+      const oldAvatarFile = await buildFileFromIPicture(this.identity.avatar) as File;
+      const oldAvatarFileContent = await readFileAsync(oldAvatarFile);
+      const newAvatarFileContent = await readFileAsync(this.avatarFile as File);
+      if (oldAvatarFileContent === newAvatarFileContent) {
+        res.avatar = null;
+      }
     }
     return res;
   }
diff --git a/js/src/views/Home.vue b/js/src/views/Home.vue
index c41ebf0e9..a5c98a1f9 100644
--- a/js/src/views/Home.vue
+++ b/js/src/views/Home.vue
@@ -152,7 +152,7 @@ import { IConfig } from '@/types/config.model';
   },
 })
 export default class Home extends Vue {
-  events: Event[] = [];
+  events: IEvent[] = [];
   locations = [];
   city = { name: null };
   country = { name: null };
@@ -225,8 +225,8 @@ export default class Home extends Vue {
   }
 
   get filteredFeaturedEvents() {
-    if (this.currentUser.isLoggedIn === false || !this.currentActor.id) return this.events;
-    return this.events.filter(event => event.organizerActor.id !== this.currentActor.id);
+    if (!this.currentUser.isLoggedIn || !this.currentActor.id) return this.events;
+    return this.events.filter(event => event.organizerActor && event.organizerActor.id !== this.currentActor.id);
   }
 
   geoLocalize() {

From f55d45bd5a17d6244c2f9bb75d5b9aa4ad4a77b3 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 8 Oct 2019 20:01:00 +0200
Subject: [PATCH 7/9] Add transition to vue router

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/App.vue | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/js/src/App.vue b/js/src/App.vue
index c71c69238..46a295aaa 100644
--- a/js/src/App.vue
+++ b/js/src/App.vue
@@ -2,7 +2,9 @@
   <div id="mobilizon">
     <NavBar />
     <main>
-      <router-view />
+      <transition name="fade">
+        <router-view />
+      </transition>
     </main>
     <mobilizon-footer />
   </div>
@@ -71,18 +73,10 @@ export default class App extends Vue {
 /* Buefy imports */
 @import "~buefy/src/scss/buefy";
 
-.router-enter-active,
-.router-leave-active {
-  transition-property: opacity;
-  transition-duration: 0.25s;
+.fade-enter-active, .fade-leave-active {
+  transition: opacity .75s;
 }
-
-.router-enter-active {
-  transition-delay: 0.25s;
-}
-
-.router-enter,
-.router-leave-active {
+.fade-enter, .fade-leave-to {
   opacity: 0;
 }
 

From 2a5b9a39e5d4d74f76976291110be92121e9e1a6 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 8 Oct 2019 21:31:47 +0200
Subject: [PATCH 8/9] Fix unavailable access to an event

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 lib/mobilizon_web/resolvers/event.ex | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/mobilizon_web/resolvers/event.ex b/lib/mobilizon_web/resolvers/event.ex
index 97518cf04..9fb155bf3 100644
--- a/lib/mobilizon_web/resolvers/event.ex
+++ b/lib/mobilizon_web/resolvers/event.ex
@@ -45,6 +45,9 @@ defmodule MobilizonWeb.Resolvers.Event do
     end
   end
 
+  defp find_private_event(_parent, %{uuid: uuid}, _resolution),
+    do: {:error, "Event with UUID #{uuid} not found"}
+
   def find_event(parent, %{uuid: uuid} = args, resolution) do
     case {:has_event, Mobilizon.Events.get_public_event_by_uuid_with_preload(uuid)} do
       {:has_event, %Event{} = event} ->

From 8548382bc8c74273cf3d1b18e8880397ec6e90bc Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 8 Oct 2019 22:27:14 +0200
Subject: [PATCH 9/9] Fix transition test

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/App.vue                 |   4 +-
 js/src/views/Event/Event.vue   | 373 +++++++++++++++++----------------
 js/tests/e2e/specs/register.js |   1 +
 3 files changed, 193 insertions(+), 185 deletions(-)

diff --git a/js/src/App.vue b/js/src/App.vue
index 46a295aaa..b597c2a10 100644
--- a/js/src/App.vue
+++ b/js/src/App.vue
@@ -2,7 +2,7 @@
   <div id="mobilizon">
     <NavBar />
     <main>
-      <transition name="fade">
+      <transition name="fade" mode="out-in">
         <router-view />
       </transition>
     </main>
@@ -74,7 +74,7 @@ export default class App extends Vue {
 @import "~buefy/src/scss/buefy";
 
 .fade-enter-active, .fade-leave-active {
-  transition: opacity .75s;
+  transition: opacity .5s;
 }
 .fade-enter, .fade-leave-to {
   opacity: 0;
diff --git a/js/src/views/Event/Event.vue b/js/src/views/Event/Event.vue
index c59f134f0..a6ed34a4b 100644
--- a/js/src/views/Event/Event.vue
+++ b/js/src/views/Event/Event.vue
@@ -1,204 +1,204 @@
 <template>
   <div class="container">
     <b-loading :active.sync="$apollo.loading"></b-loading>
-    <div v-if="event">
-      <div class="header-picture container">
-        <figure class="image is-3by1" v-if="event.picture">
-          <img :src="event.picture.url">
-        </figure>
-        <figure class="image is-3by1" v-else>
-          <img src="https://picsum.photos/600/200/">
-        </figure>
-      </div>
-        <section>
-          <div class="title-and-participate-button">
-            <div class="title-wrapper">
-              <div class="date-component">
-                <date-calendar-icon :date="event.beginsOn"></date-calendar-icon>
+    <transition appear name="fade" mode="out-in">
+      <div v-if="event">
+        <div class="header-picture container">
+          <figure class="image is-3by1" v-if="event.picture">
+            <img :src="event.picture.url">
+          </figure>
+          <figure class="image is-3by1" v-else>
+            <img src="https://picsum.photos/600/200/">
+          </figure>
+        </div>
+          <section>
+            <div class="title-and-participate-button">
+              <div class="title-wrapper">
+                <div class="date-component">
+                  <date-calendar-icon :date="event.beginsOn"></date-calendar-icon>
+                </div>
+                <h1 class="title">{{ event.title }}</h1>
+              </div>
+              <div class="has-text-right" v-if="new Date(endDate) > new Date()">
+                <small v-if="event.participantStats.approved > 0 && !actorIsParticipant">
+                    {{ $tc('One person is going', event.participantStats.approved, {approved: event.participantStats.approved}) }}
+                </small>
+                <small v-else-if="event.participantStats.approved > 0 && actorIsParticipant">
+                  {{ $tc('You and one other person are going to this event', event.participantStats.approved - 1, {approved: event.participantStats.approved - 1}) }}
+                </small>
+                <participation-button
+                        v-if="currentActor.id && !actorIsOrganizer && !event.draft"
+                        :participation="participations[0]"
+                        :current-actor="currentActor"
+                        @joinEvent="joinEvent"
+                        @joinModal="isJoinModalActive = true"
+                        @confirmLeave="confirmLeave"
+                />
+              </div>
+              <div v-else>
+                <button class="button is-primary" type="button" slot="trigger" disabled>
+                  <template>
+                    <span>{{ $t('Event already passed')}}</span>
+                  </template>
+                  <b-icon icon="menu-down"></b-icon>
+                </button>
               </div>
-              <h1 class="title">{{ event.title }}</h1>
             </div>
-            <div class="has-text-right" v-if="new Date(endDate) > new Date()">
-              <small v-if="event.participantStats.approved > 0 && !actorIsParticipant">
-                  {{ $tc('One person is going', event.participantStats.approved, {approved: event.participantStats.approved}) }}
-              </small>
-              <small v-else-if="event.participantStats.approved > 0 && actorIsParticipant">
-                {{ $tc('You and one other person are going to this event', event.participantStats.approved - 1, {approved: event.participantStats.approved - 1}) }}
-              </small>
-              <participation-button
-                      v-if="currentActor.id && !actorIsOrganizer && !event.draft"
-                      :participation="participations[0]"
-                      :current-actor="currentActor"
-                      @joinEvent="joinEvent"
-                      @joinModal="isJoinModalActive = true"
-                      @confirmLeave="confirmLeave"
-              />
+            <div class="metadata columns">
+              <div class="column is-three-quarters-desktop">
+                <p class="tags" v-if="event.category || event.tags.length > 0">
+                  <b-tag type="is-warning" size="is-medium" v-if="event.draft">{{ $t('Draft') }}</b-tag>
+                  <b-tag type="is-success" v-if="event.tags" v-for="tag in event.tags" :key="tag.title">{{ tag.title }}</b-tag>
+                  <span v-if="event.tags > 0">⋅</span>
+                  <span class="visibility" v-if="!event.draft">
+                    <b-tag type="is-info" v-if="event.visibility === EventVisibility.PUBLIC">{{ $t('Public event') }}</b-tag>
+                    <b-tag type="is-info" v-if="event.visibility === EventVisibility.UNLISTED">{{ $t('Private event') }}</b-tag>
+                  </span>
+                </p>
+                <div class="date-and-add-to-calendar">
+                  <div class="date-and-privacy" v-if="event.beginsOn">
+                    <b-icon icon="calendar-clock" />
+                    <event-full-date :beginsOn="event.beginsOn" :endsOn="event.endsOn" />
+                  </div>
+                  <a class="add-to-calendar" @click="downloadIcsEvent()" v-if="!event.draft">
+                    <b-icon icon="calendar-plus" />
+                    {{ $t('Add to my calendar') }}
+                  </a>
+                </div>
+                <p class="slug">
+                  {{ event.slug }}
+                </p>
+              </div>
+              <div class="column sidebar">
+                <div class="field has-addons" v-if="currentActor.id">
+                  <p class="control" v-if="actorIsOrganizer || event.draft">
+                    <router-link
+                            class="button"
+                            :to="{ name: RouteName.EDIT_EVENT, params: {eventId: event.uuid}}"
+                    >
+                      {{ $t('Edit') }}
+                    </router-link>
+                  </p>
+                  <p class="control" v-if="actorIsOrganizer || event.draft">
+                    <a class="button is-danger" @click="openDeleteEventModalWrapper">
+                      {{ $t('Delete') }}
+                    </a>
+                  </p>
+                  <p class="control">
+                    <a class="button is-danger" @click="isReportModalActive = true">
+                      {{ $t('Report') }}
+                    </a>
+                  </p>
+                </div>
+                <div class="address-wrapper">
+                  <b-icon icon="map" />
+                  <span v-if="!event.physicalAddress">{{ $t('No address defined') }}</span>
+                  <div class="address" v-if="event.physicalAddress">
+                    <address>
+                      <span class="addressDescription" :title="event.physicalAddress.description">{{ event.physicalAddress.description }}</span>
+                      <span>{{ event.physicalAddress.floor }} {{ event.physicalAddress.street }}</span>
+                      <span>{{ event.physicalAddress.postalCode }} {{ event.physicalAddress.locality }}</span>
+                    </address>
+                    <span class="map-show-button" @click="showMap = !showMap" v-if="event.physicalAddress && event.physicalAddress.geom">
+                      {{ $t('Show map') }}
+                    </span>
+                  </div>
+                  <b-modal v-if="event.physicalAddress && event.physicalAddress.geom" :active.sync="showMap" scroll="keep">
+                    <div class="map">
+                      <map-leaflet
+                              :coords="event.physicalAddress.geom"
+                              :popup="event.physicalAddress.description"
+                      />
+                    </div>
+                  </b-modal>
+                </div>
+                <div class="organizer">
+                  <span>
+                    <span v-if="event.organizerActor">
+                      {{ $t('By {name}', {name: event.organizerActor.name ? event.organizerActor.name : event.organizerActor.preferredUsername}) }}
+                    </span>
+                    <figure v-if="event.organizerActor.avatar" class="image is-48x48">
+                      <img
+                              class="is-rounded"
+                              :src="event.organizerActor.avatar.url"
+                              :alt="event.organizerActor.avatar.alt" />
+                    </figure>
+                  </span>
+                </div>
+              </div>
             </div>
-            <div v-else>
-              <button class="button is-primary" type="button" slot="trigger" disabled>
-                <template>
-                  <span>{{ $t('Event already passed')}}</span>
-                </template>
-                <b-icon icon="menu-down"></b-icon>
-              </button>
+          </section>
+          <div class="description">
+            <div class="description-container container">
+              <h3 class="title">
+                {{ $t('About this event') }}
+              </h3>
+              <p v-if="!event.description">
+                {{ $t("The event organizer didn't add any description.") }}
+              </p>
+              <div class="columns" v-else>
+                <div class="column is-half" v-html="event.description">
+                </div>
+              </div>
             </div>
           </div>
-          <div class="metadata columns">
-            <div class="column is-three-quarters-desktop">
-              <p class="tags" v-if="event.category || event.tags.length > 0">
-                <b-tag type="is-warning" size="is-medium" v-if="event.draft">{{ $t('Draft') }}</b-tag>
-<!--                <span class="tag" v-if="event.category">{{ event.category }}</span>-->
-                <b-tag type="is-success" v-if="event.tags" v-for="tag in event.tags" :key="tag.title">{{ tag.title }}</b-tag>
-                <span v-if="event.tags > 0">⋅</span>
-                <span class="visibility" v-if="!event.draft">
-                  <b-tag type="is-info" v-if="event.visibility === EventVisibility.PUBLIC">{{ $t('Public event') }}</b-tag>
-                  <b-tag type="is-info" v-if="event.visibility === EventVisibility.UNLISTED">{{ $t('Private event') }}</b-tag>
-                </span>
-              </p>
-              <div class="date-and-add-to-calendar">
-                <div class="date-and-privacy" v-if="event.beginsOn">
-                  <b-icon icon="calendar-clock" />
-                  <event-full-date :beginsOn="event.beginsOn" :endsOn="event.endsOn" />
+        <section class="share" v-if="!event.draft">
+          <div class="container">
+            <div class="columns">
+              <div class="column is-half has-text-centered">
+                <h3 class="title">{{ $t('Share this event') }}</h3>
+                <div>
+                  <b-icon icon="mastodon" size="is-large" type="is-primary" />
+                  <a :href="facebookShareUrl" target="_blank" rel="nofollow noopener"><b-icon icon="facebook" size="is-large" type="is-primary" /></a>
+                  <a :href="twitterShareUrl" target="_blank" rel="nofollow noopener"><b-icon icon="twitter" size="is-large" type="is-primary" /></a>
+                  <a :href="emailShareUrl" target="_blank" rel="nofollow noopener"><b-icon icon="email" size="is-large" type="is-primary" /></a>
+                  <!--     TODO: mailto: links are not used anymore, we should provide a popup to redact a message instead    -->
+                  <a :href="linkedInShareUrl" target="_blank" rel="nofollow noopener"><b-icon icon="linkedin" size="is-large" type="is-primary" /></a>
                 </div>
-                <a class="add-to-calendar" @click="downloadIcsEvent()" v-if="!event.draft">
-                  <b-icon icon="calendar-plus" />
+              </div>
+              <hr />
+              <div class="column is-half has-text-right add-to-calendar">
+                <h3 @click="downloadIcsEvent()">
                   {{ $t('Add to my calendar') }}
-                </a>
-              </div>
-              <p class="slug">
-                {{ event.slug }}
-              </p>
-            </div>
-            <div class="column sidebar">
-              <div class="field has-addons" v-if="currentActor.id">
-                <p class="control" v-if="actorIsOrganizer || event.draft">
-                  <router-link
-                          class="button"
-                          :to="{ name: RouteName.EDIT_EVENT, params: {eventId: event.uuid}}"
-                  >
-                    {{ $t('Edit') }}
-                  </router-link>
-                </p>
-                <p class="control" v-if="actorIsOrganizer || event.draft">
-                  <a class="button is-danger" @click="openDeleteEventModalWrapper">
-                    {{ $t('Delete') }}
-                  </a>
-                </p>
-                <p class="control">
-                  <a class="button is-danger" @click="isReportModalActive = true">
-                    {{ $t('Report') }}
-                  </a>
-                </p>
-              </div>
-              <div class="address-wrapper">
-                <b-icon icon="map" />
-                <span v-if="!event.physicalAddress">{{ $t('No address defined') }}</span>
-                <div class="address" v-if="event.physicalAddress">
-                  <address>
-                    <span class="addressDescription" :title="event.physicalAddress.description">{{ event.physicalAddress.description }}</span>
-                    <span>{{ event.physicalAddress.floor }} {{ event.physicalAddress.street }}</span>
-                    <span>{{ event.physicalAddress.postalCode }} {{ event.physicalAddress.locality }}</span>
-  <!--                  <span>{{ event.physicalAddress.region }} {{ event.physicalAddress.country }}</span>-->
-                  </address>
-                  <span class="map-show-button" @click="showMap = !showMap" v-if="event.physicalAddress && event.physicalAddress.geom">
-                    {{ $t('Show map') }}
-                  </span>
-                </div>
-                <b-modal v-if="event.physicalAddress && event.physicalAddress.geom" :active.sync="showMap" scroll="keep">
-                  <div class="map">
-                    <map-leaflet
-                            :coords="event.physicalAddress.geom"
-                            :popup="event.physicalAddress.description"
-                    />
-                  </div>
-                </b-modal>
-              </div>
-              <div class="organizer">
-                <span>
-                  <span v-if="event.organizerActor">
-                    {{ $t('By {name}', {name: event.organizerActor.name ? event.organizerActor.name : event.organizerActor.preferredUsername}) }}
-                  </span>
-                  <figure v-if="event.organizerActor.avatar" class="image is-48x48">
-                    <img
-                            class="is-rounded"
-                            :src="event.organizerActor.avatar.url"
-                            :alt="event.organizerActor.avatar.alt" />
-                  </figure>
-                </span>
+                </h3>
               </div>
             </div>
           </div>
         </section>
-        <div class="description">
-          <div class="description-container container">
-            <h3 class="title">
-              {{ $t('About this event') }}
-            </h3>
-            <p v-if="!event.description">
-              {{ $t("The event organizer didn't add any description.") }}
-            </p>
-            <div class="columns" v-else>
-              <div class="column is-half" v-html="event.description">
-              </div>
-            </div>
-          </div>
-        </div>
-      <section class="share" v-if="!event.draft">
-        <div class="container">
+        <section class="more-events container" v-if="event.relatedEvents.length > 0">
+          <h3 class="title has-text-centered">{{ $t('These events may interest you') }}</h3>
           <div class="columns">
-            <div class="column is-half has-text-centered">
-              <h3 class="title">{{ $t('Share this event') }}</h3>
-              <div>
-                <b-icon icon="mastodon" size="is-large" type="is-primary" />
-                <a :href="facebookShareUrl" target="_blank" rel="nofollow noopener"><b-icon icon="facebook" size="is-large" type="is-primary" /></a>
-                <a :href="twitterShareUrl" target="_blank" rel="nofollow noopener"><b-icon icon="twitter" size="is-large" type="is-primary" /></a>
-                <a :href="emailShareUrl" target="_blank" rel="nofollow noopener"><b-icon icon="email" size="is-large" type="is-primary" /></a>
-                <!--     TODO: mailto: links are not used anymore, we should provide a popup to redact a message instead    -->
-                <a :href="linkedInShareUrl" target="_blank" rel="nofollow noopener"><b-icon icon="linkedin" size="is-large" type="is-primary" /></a>
-              </div>
-            </div>
-            <hr />
-            <div class="column is-half has-text-right add-to-calendar">
-              <h3 @click="downloadIcsEvent()">
-                {{ $t('Add to my calendar') }}
-              </h3>
+            <div class="column is-one-third-desktop" v-for="relatedEvent in event.relatedEvents" :key="relatedEvent.uuid">
+              <EventCard :event="relatedEvent" />
             </div>
           </div>
+        </section>
+        <b-modal :active.sync="isReportModalActive" has-modal-card ref="reportModal">
+          <report-modal :on-confirm="reportEvent" :title="$t('Report this event')" :outside-domain="event.organizerActor.domain" @close="$refs.reportModal.close()" />
+        </b-modal>
+        <b-modal :active.sync="isJoinModalActive" has-modal-card ref="participationModal">
+              <identity-picker v-model="identity">
+                <template v-slot:footer>
+                  <footer class="modal-card-foot">
+                    <button
+                            class="button"
+                            ref="cancelButton"
+                            @click="isJoinModalActive = false">
+                      {{ $t('Cancel') }}
+                    </button>
+                    <button
+                            class="button is-primary"
+                            ref="confirmButton"
+                            @click="joinEvent(identity)">
+                      {{ $t('Confirm my particpation') }}
+                    </button>
+                  </footer>
+                </template>
+              </identity-picker>
+        </b-modal>
         </div>
-      </section>
-      <section class="more-events container" v-if="event.relatedEvents.length > 0">
-        <h3 class="title has-text-centered">{{ $t('These events may interest you') }}</h3>
-        <div class="columns">
-          <div class="column is-one-third-desktop" v-for="relatedEvent in event.relatedEvents" :key="relatedEvent.uuid">
-            <EventCard :event="relatedEvent" />
-          </div>
-        </div>
-      </section>
-      <b-modal :active.sync="isReportModalActive" has-modal-card ref="reportModal">
-        <report-modal :on-confirm="reportEvent" :title="$t('Report this event')" :outside-domain="event.organizerActor.domain" @close="$refs.reportModal.close()" />
-      </b-modal>
-      <b-modal :active.sync="isJoinModalActive" has-modal-card ref="participationModal">
-            <identity-picker v-model="identity">
-              <template v-slot:footer>
-                <footer class="modal-card-foot">
-                  <button
-                          class="button"
-                          ref="cancelButton"
-                          @click="isJoinModalActive = false">
-                    {{ $t('Cancel') }}
-                  </button>
-                  <button
-                          class="button is-primary"
-                          ref="confirmButton"
-                          @click="joinEvent(identity)">
-                    {{ $t('Confirm my particpation') }}
-                  </button>
-                </footer>
-              </template>
-            </identity-picker>
-      </b-modal>
-      </div>
-    </div>
+    </transition>
+  </div>
 </template>
 
 <script lang="ts">
@@ -482,6 +482,13 @@ export default class Event extends EventMixin {
 <style lang="scss" scoped>
   @import "../../variables";
 
+  .fade-enter-active, .fade-leave-active {
+    transition: opacity .5s;
+  }
+  .fade-enter, .fade-leave-to {
+    opacity: 0;
+  }
+
   div.sidebar {
     display: flex;
     flex-wrap: wrap;
diff --git a/js/tests/e2e/specs/register.js b/js/tests/e2e/specs/register.js
index 2553f51bc..602dcdf70 100644
--- a/js/tests/e2e/specs/register.js
+++ b/js/tests/e2e/specs/register.js
@@ -39,6 +39,7 @@ describe('Registration', () => {
     cy.get('form').contains('button.button.is-primary', 'Register').click();
 
     cy.url().should('include', '/register/profile');
+    cy.wait(1000);
     cy.get('form .field').first().contains('label', 'Username').parent().find('input').type('tester');
     cy.get('form .field').eq(2).contains('label', 'Displayed name').parent().find('input').type('tester account');
     cy.get('form .field').eq(3).contains('label', 'Description').parent().find('textarea').type('This is a test account');