From 203f2091de445d7f13136d158f617061bdc6f726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Tue, 26 Mar 2019 14:28:55 +0100
Subject: [PATCH] Implement `id takes precedence over slug`

---
 .../pages/profile/{_id/index.vue => _id.vue}  | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)
 rename webapp/pages/profile/{_id/index.vue => _id.vue} (51%)

diff --git a/webapp/pages/profile/_id/index.vue b/webapp/pages/profile/_id.vue
similarity index 51%
rename from webapp/pages/profile/_id/index.vue
rename to webapp/pages/profile/_id.vue
index 78e16f8fb..eee8d610a 100644
--- a/webapp/pages/profile/_id/index.vue
+++ b/webapp/pages/profile/_id.vue
@@ -1,3 +1,7 @@
+<template>
+  <nuxt-child />
+</template>
+
 <script>
 import gql from 'graphql-tag'
 
@@ -22,23 +26,26 @@ export default {
   layout: 'blank',
   async asyncData(context) {
     const {
-      params: { id: idOrSlug },
+      params: { id, slug },
       redirect,
       error,
       app: { apolloProvider }
     } = context
+    const idOrSlug = id
 
     const variables = { idOrSlug }
     const client = apolloProvider.defaultClient
 
-    const tryToRedirect = async query => {
-      const idRes = await client.query({ query, variables })
-      const user = idRes.data.User[0]
-      if (user) redirect(`/profile/${user.id}/${user.slug}`)
-    }
+    let response
+    let user
+    response = await client.query({ query: queryId, variables })
+    user = response.data.User[0]
+    if (user && user.slug === slug) return // all good
+    if (user && user.slug !== slug) redirect(`/profile/${user.id}/${user.slug}`)
 
-    await tryToRedirect(queryId)
-    await tryToRedirect(querySlug)
+    response = await client.query({ query: querySlug, variables })
+    user = response.data.User[0]
+    if (user) redirect(`/profile/${user.id}/${user.slug}`)
 
     return error({ statusCode: 404 })
   }