PR review fixes

Author: kkartunov

src-ts/lib/profile-provider/profile-functions/profile-factory/user-role.enum.ts

@@ -1,4 +1,5 @@
 export enum UserRole {
+    gamificationAdmin = 'Gamification Admin',
     customer = 'Self-Service Customer',
     member = 'Topcoder User',
 }

src-ts/lib/profile-provider/user-profile.model.ts

@@ -10,8 +10,8 @@ export interface UserProfile {
     isMember?: boolean
     lastName: string
     photoURL?: string
-    roles?: Array<string>,
+    roles: Array<string>
     status: string
     updatedAt: number
-    userId: number,
+    userId: number
 }

src-ts/lib/restricted-page/RestrictedPage.tsx

@@ -12,6 +12,6 @@ export const RestrictedPage: ReactElement =
     title='Thanks for visiting'
   >
     <div className={styles.container}>
-      <p>Unfortenatly, you are not permitted to access the site. If you feel you should be able to, please contact us at <a href='mailto:support@topcoder.com'>support@topcoder.com</a>.</p>
+      <p>Unfortunately, you are not permitted to access the site. If you feel you should be able to, please <a href='/support'>contact us</a>.</p>
     </div>
   </ContentLayout>

src-ts/lib/route-provider/require-auth-provider/require-auth.provider.tsx

@@ -5,8 +5,8 @@ import { RestrictedPage } from '../../restricted-page'
 
 interface RequireAuthProviderProps {
     children: JSX.Element
-    loginUrl: string,
-    rolesRequired?: Array<string>,
+    loginUrl: string
+    rolesRequired?: Array<string>
 }
 
 function RequireAuthProvider(props: RequireAuthProviderProps): JSX.Element {
@@ -23,9 +23,13 @@ function RequireAuthProvider(props: RequireAuthProviderProps): JSX.Element {
     // check the user's roles, allow access or show restricted page
     if (!!profile) {
         if (props.rolesRequired) {
-            if (!profile.roles) { return RestrictedPage }
-            const intersection: Array<string> = profile.roles?.filter(r => props.rolesRequired?.includes(r))
-            if (intersection.length !== props.rolesRequired.length) { return RestrictedPage }
+            if (!profile.roles) {
+                return RestrictedPage
+            }
+            // if the profile doesn't include all the required roles, show the restricted page
+            if (props.rolesRequired.some(role => !profile.roles.includes(role))) {
+                return RestrictedPage
+            }
             return props.children
         } else {
             return props.children

src-ts/tools/gamification-admin/GamificationAdmin.tsx

@@ -7,8 +7,6 @@ import {
 } from '../../lib'
 
 export const toolTitle: string = 'Gamification Admin'
-export const baseUrl: string = '/gamification-admin'
-export const rolesRequired: Array<string> = ['Gamification Admin']
 
 const GamificationAdmin: FC<{}> = () => {
 

src-ts/tools/gamification-admin/gamification-admin.routes.tsx

@@ -1,10 +1,13 @@
 import { PlatformRoute } from '../../lib'
 
-import GamificationAdmin, { baseUrl, rolesRequired, toolTitle } from './GamificationAdmin'
+import GamificationAdmin, { toolTitle } from './GamificationAdmin'
 import BadgeDetailPage from './pages/badge-detail/BadgeDetailPage'
 import BadgeListingPage from './pages/badge-listing/BadgeListingPage'
 import CreateBadgePage from './pages/create-badge/CreateBadgePage'
 
+export const baseUrl: string = '/gamification-admin'
+export const rolesRequired: Array<string> = ['Gamification Admin']
+
 export const gamificationAdminRoutes: Array<PlatformRoute> = [
     {
         authRequired: true,