Merge pull request #650 from rtucker-mozilla/master

Checking for authentication on profile pages by PageProfile.vue first

Author: rtucker-mozilla

src/components/profile/Profile.vue

@@ -1,15 +1,5 @@
 <template>
-  <main class="profile" >
-    <div
-      v-if="typeof(accessInformation) === 'undefined'"
-    >
-    <p>
-      You must login to view profile.
-    </p>
-    </div>
-    <div
-      v-if="typeof(accessInformation) != 'undefined'"
-    >
+  <main class="profile">
     <div
       :class="
         'profile__section' +
@@ -243,7 +233,6 @@
         ></ViewKeys>
       </template>
     </ProfileSection>
-    </div>
   </main>
 </template>
 
@@ -354,11 +343,7 @@ export default {
       };
     },
     userOnOwnProfile() {
-      try {
-        return this.$store.state.scope.uuid === this.uuid.value;
-      } catch(e){
-        return false;
-      }
+      return this.$store.state.scope.uuid === this.uuid.value;
     },
     identitiesWrapper() {
       return new Identities(this.identities);
@@ -467,4 +452,4 @@ export default {
     top: -7em;
   }
 }
-</style>
+</style>

src/pages/PageProfile.vue

@@ -23,6 +23,7 @@
           :allowStaffOnlyFields="allowStaffOnlyFields"
         ></Profile>
       </template>
+      <PagePermissionRequired v-else-if="error && (!data)"></PagePermissionRequired>
       <Page404 v-else-if="error || (data && data.profile === null)"></Page404>
       <LoadingSpinner v-else></LoadingSpinner>
     </template>
@@ -36,6 +37,7 @@ import { DISPLAY_PROFILE } from '@/queries/profile';
 import Related from '@/assets/js/related';
 import PreviewAs from '@/components/profile/PreviewAs.vue';
 import Page404 from './PageUnknown.vue';
+import PagePermissionRequired from './PagePermissionRequired.vue';
 
 export default {
   name: 'PageProfile',