Multiple owner of a board

firestore.rules

@@ -1,19 +1,38 @@
 rules_version = '2';
 
 service cloud.firestore {
-  match /databases/{database}/documents/settings/{document} {
-    function hasValidDescription() {
-      return !('description' in request.resource.data) || request.resource.data.description.size() <= 50;
-    }
 
-    function hasEditAccess() {
-      return request.auth != null && (resource.data.owners.size() == 0 || !('owners' in resource.data)
-        || resource.data.owners.hasAny([request.auth.uid]));
+  match /databases/{database}/documents {
+    match /settings/{document} {
+      function hasValidDescription() {
+        return !('description' in request.resource.data) || request.resource.data.description.size() <= 50;
+      }
+
+      function hasEditAccess() {
+        return request.auth != null && (resource.data.owners.size() == 0 || !('owners' in resource.data)
+          || resource.data.owners.hasAny([request.auth.uid]));
+      }
+
+      allow read;
+      allow create: if request.auth != null && hasValidDescription();
+      allow update: if request.auth != null && hasEditAccess() && hasValidDescription();
+      allow delete: if request.auth != null && hasEditAccess();
+
+      // This match applies to invites fetched for a specific board
+      match /invites/{invite} {
+        function settingsData() {
+          return get(/databases/$(database)/documents/settings/$(document)).data
+        }
+
+        allow read, create, delete: if settingsData().owners.hasAny([request.auth.uid]);
+        allow delete: if resource.data.reciever == request.auth.token.email;
+      }
     }
 
-    allow read;
-    allow create: if request.auth != null && hasValidDescription();
-    allow update: if request.auth != null && hasEditAccess() && hasValidDescription();
-    allow delete: if request.auth != null && hasEditAccess();
+    // This match applies to invites fetched through a collection group query
+    match /{somePath=**}/invites/{invite} {
+      allow read: if resource.data.reciever == request.auth.token.email;
+    }
+
   }
 }

functions/src/index.ts

@@ -102,3 +102,90 @@ export const scheduledDeleteOfDocumentsSetToBeDeleted = region('us-central1')
         }
         return null
     })
+
+export const getOwnersDataByBoardIdAsOwner = https.onCall(
+    async (data, context) => {
+        if (!context.auth) {
+            throw new https.HttpsError(
+                'failed-precondition',
+                'The function must be called while authenticated.',
+            )
+        }
+
+        const boardRef = getFirestore().collection('settings').doc(data.boardId)
+        const boardSnapshot = await boardRef.get()
+        if (!boardSnapshot.exists) {
+            throw new https.HttpsError(
+                'invalid-argument',
+                'Requested board was not found.',
+            )
+        }
+        const boardOwners = boardSnapshot.data()?.owners
+        if (!boardOwners.includes(context.auth?.uid)) {
+            throw new https.HttpsError(
+                'permission-denied',
+                'You need to be an owner of this board to get data about other owners.',
+            )
+        }
+
+        const boardOwnersMapped = boardOwners.map((id: string) => ({ uid: id }))
+
+        try {
+            const usersResult = await getAuth().getUsers(boardOwnersMapped)
+            const ownersData = usersResult.users.map((user) => ({
+                uid: user.uid,
+                email: user.email,
+            }))
+            return ownersData
+        } catch {
+            throw new https.HttpsError(
+                'invalid-argument',
+                'Could not get requested data about owners.',
+            )
+        }
+    },
+)
+
+export const addInvitedUserToBoardOwners = https.onCall(
+    async (data, context) => {
+        if (!context.auth) {
+            throw new https.HttpsError(
+                'failed-precondition',
+                'The function must be called while authenticated.',
+            )
+        }
+
+        const boardRef = getFirestore().collection('settings').doc(data.boardId)
+        const boardSnapshot = await boardRef.get()
+        if (!boardSnapshot.exists) {
+            throw new https.HttpsError(
+                'invalid-argument',
+                'Requested board was not found.',
+            )
+        }
+        const boardOwners = boardSnapshot.data()?.owners
+
+        await getFirestore()
+            .collection('settings/' + data.boardId + '/invites')
+            .where('reciever', '==', context.auth?.token.email)
+            .limit(1)
+            .get()
+            .then((inviteDoc) => inviteDoc.docs[0].id)
+            .catch(() => {
+                throw new https.HttpsError(
+                    'permission-denied',
+                    'Requested user does not have an invite for this board',
+                )
+            })
+
+        if (!boardOwners.includes(context.auth?.uid)) {
+            const ownersUpdated: string[] = [...boardOwners, context.auth?.uid]
+            boardRef.update({
+                owners: ownersUpdated,
+            })
+        }
+
+        if (data.accept) {
+        }
+    },
+)

src/containers/MyBoards/BoardCard/OverflowMenu/Modals/DeleteTavleModal.tsx → src/components/Modals/DeleteTavleModal.tsx

@@ -6,12 +6,12 @@ import { GridContainer, GridItem } from '@entur/grid'
 import { PrimaryButton, SecondaryButton } from '@entur/button'
 import { useToast } from '@entur/alert'
 
-import CloseButton from '../../../../../components/LoginModal/CloseButton/CloseButton'
+import sikkerhetBom from '../../assets/images/sikkerhet_bom.png'
+import retinaSikkerhetBom from '../../assets/images/sikkerhet_bom@2x.png'
 
-import sikkerhetBom from '../../../../../assets/images/sikkerhet_bom.png'
-import retinaSikkerhetBom from '../../../../../assets/images/sikkerhet_bom@2x.png'
+import { deleteTavle } from '../../settings/FirestoreStorage'
 
-import { deleteTavle } from '../../../../../settings/FirestoreStorage'
+import CloseButton from './LoginModal/CloseButton/CloseButton'
 
 import './styles.scss'
 

src/containers/LockModal/index.tsx → src/components/Modals/LockModal/index.tsx

@@ -7,15 +7,15 @@ import { Modal } from '@entur/modal'
 import { GridContainer, GridItem } from '@entur/grid'
 import { PrimaryButton } from '@entur/button'
 
-import Check from '../../assets/images/check.png'
-import retinaCheck from '../../assets/images/check@2x.png'
+import Check from '../../../assets/images/check.png'
+import retinaCheck from '../../../assets/images/check@2x.png'
 
-import { analytics } from '../../firebase-init'
-import { useUser } from '../../auth'
-import { useSettingsContext } from '../../settings'
+import { analytics } from '../../../firebase-init'
+import { useUser } from '../../../auth'
+import { useSettingsContext } from '../../../settings'
 
-import CloseButton from '../../components/LoginModal/CloseButton/CloseButton'
-import LoginModal from '../../components/LoginModal'
+import CloseButton from '../LoginModal/CloseButton/CloseButton'
+import LoginModal from '../LoginModal'
 
 import './styles.scss'
 

src/containers/LockModal/styles.scss → src/components/Modals/LockModal/styles.scss

@@ -1,4 +1,4 @@
-@import '../../assets/styles/import.scss';
+@import '../../../assets/styles/import.scss';
 
 .lock-modal.eds-modal__content {
     padding-top: 0.8rem;

src/components/LoginModal/EmailLogin/index.tsx → src/components/Modals/LoginModal/EmailLogin/index.tsx

@@ -10,10 +10,10 @@ import { PrimaryButton } from '@entur/button'
 import { Heading3, Link } from '@entur/typography'
 import { SmallExpandableAlertBox } from '@entur/alert'
 
-import { auth } from '../../../auth'
-import { useFormFields } from '../../../utils'
-import sikkerhetBom from '../../../assets/images/sikkerhet_bom.png'
-import retinaSikkerhetBom from '../../../assets/images/sikkerhet_bom@2x.png'
+import { auth } from '../../../../auth'
+import { useFormFields } from '../../../../utils'
+import sikkerhetBom from '../../../../assets/images/sikkerhet_bom.png'
+import retinaSikkerhetBom from '../../../../assets/images/sikkerhet_bom@2x.png'
 
 import { ModalType } from '..'
 import CloseButton from '../CloseButton/CloseButton'

src/components/LoginModal/EmailSent/index.tsx → src/components/Modals/LoginModal/EmailSent/index.tsx

@@ -9,8 +9,8 @@ import { Heading3, Paragraph } from '@entur/typography'
 import { ModalType } from '..'
 import CloseButton from '../CloseButton/CloseButton'
 
-import Check from '../../../assets/images/check.png'
-import retinaCheck from '../../../assets/images/check@2x.png'
+import Check from '../../../../assets/images/check.png'
+import retinaCheck from '../../../../assets/images/check@2x.png'
 
 export interface UserResetPassword {
     email: string

src/components/LoginModal/LoginOptions/index.tsx → src/components/Modals/LoginModal/LoginOptions/index.tsx

@@ -6,8 +6,8 @@ import { PrimaryButton, SecondaryButton } from '@entur/button'
 
 import { ModalType, LoginCase } from '..'
 
-import sikkerhetBom from '../../../assets/images/sikkerhet_bom.png'
-import retinaSikkerhetBom from '../../../assets/images/sikkerhet_bom@2x.png'
+import sikkerhetBom from '../../../../assets/images/sikkerhet_bom.png'
+import retinaSikkerhetBom from '../../../../assets/images/sikkerhet_bom@2x.png'
 
 interface Props {
     setModalType: Dispatch<SetStateAction<ModalType>>
@@ -26,6 +26,8 @@ const description = (loginCase: LoginCase): string => {
             return 'For å sette en personlig Tavla-lenke til avgangstavla, må du ha en konto.'
         case 'error':
             return 'For å redigere denne tavla, må du først logge inn på kontoen den tilhører.'
+        case 'share':
+            return 'For å dele en tavle med andre, må du eie den og være logget inn.'
         default:
             return 'Logg inn for å få tilgang på ekstra funksjonalitet, som å se dine tavler eller last opp logo.'
     }

src/components/LoginModal/ResetPassword/index.tsx → src/components/Modals/LoginModal/ResetPassword/index.tsx

@@ -9,10 +9,10 @@ import { EmailIcon, BackArrowIcon } from '@entur/icons'
 import { PrimaryButton } from '@entur/button'
 import { Heading3, Paragraph } from '@entur/typography'
 
-import { auth } from '../../../auth'
-import { useFormFields } from '../../../utils'
-import sikkerhetBom from '../../../assets/images/sikkerhet_bom.png'
-import retinaSikkerhetBom from '../../../assets/images/sikkerhet_bom@2x.png'
+import { auth } from '../../../../auth'
+import { useFormFields } from '../../../../utils'
+import sikkerhetBom from '../../../../assets/images/sikkerhet_bom.png'
+import retinaSikkerhetBom from '../../../../assets/images/sikkerhet_bom@2x.png'
 import { ModalType } from '..'
 
 import CloseButton from '../CloseButton/CloseButton'

src/components/LoginModal/Signup/index.tsx → src/components/Modals/LoginModal/Signup/index.tsx

@@ -9,10 +9,10 @@ import { EmailIcon, ClosedLockIcon, BackArrowIcon } from '@entur/icons'
 import { PrimaryButton } from '@entur/button'
 import { Heading2, Link } from '@entur/typography'
 
-import { auth } from '../../../auth'
-import { useFormFields } from '../../../utils'
-import sikkerhetBom from '../../../assets/images/sikkerhet_bom.png'
-import retinaSikkerhetBom from '../../../assets/images/sikkerhet_bom@2x.png'
+import { auth } from '../../../../auth'
+import { useFormFields } from '../../../../utils'
+import sikkerhetBom from '../../../../assets/images/sikkerhet_bom.png'
+import retinaSikkerhetBom from '../../../../assets/images/sikkerhet_bom@2x.png'
 
 import { ModalType } from '../index'
 import CloseButton from '../CloseButton/CloseButton'

src/components/LoginModal/index.tsx → src/components/Modals/LoginModal/index.tsx

@@ -5,8 +5,8 @@ import type { User } from 'firebase/auth'
 import { useToast } from '@entur/alert'
 import { Modal } from '@entur/modal'
 
-import { useUser } from '../../auth'
-import { usePrevious } from '../../utils'
+import { useUser } from '../../../auth'
+import { usePrevious } from '../../../utils'
 
 import EmailLogin from './EmailLogin'
 import LoginOptions from './LoginOptions'
@@ -22,6 +22,7 @@ export type LoginCase =
     | 'mytables'
     | 'logo'
     | 'link'
+    | 'share'
     | 'error'
     | 'default'
 

src/components/LoginModal/styles.scss → src/components/Modals/LoginModal/styles.scss

@@ -1,4 +1,4 @@
-@import './../../assets/styles/import.scss';
+@import '../../../assets/styles/import.scss';
 
 .eds-modal__overlay {
     background: var(--tavla-modal-overlay-color);

src/containers/MineTavlerModal/index.tsx → src/components/Modals/MineTavlerModal/index.tsx

@@ -8,17 +8,17 @@ import { Heading3, Paragraph } from '@entur/typography'
 import { GridContainer, GridItem } from '@entur/grid'
 import { PrimaryButton, SecondaryButton } from '@entur/button'
 
-import { analytics } from '../../firebase-init'
-import { useUser } from '../../auth'
-import { useSettingsContext } from '../../settings'
+import { analytics } from '../../../firebase-init'
+import { useUser } from '../../../auth'
+import { useSettingsContext } from '../../../settings'
 
-import LoginModal from '../../components/LoginModal'
-import CloseButton from '../../components/LoginModal/CloseButton/CloseButton'
+import LoginModal from '../LoginModal'
+import CloseButton from '../LoginModal/CloseButton/CloseButton'
 
-import sikkerhetBom from '../../assets/images/sikkerhet_bom.png'
-import retinaSikkerhetBom from '../../assets/images/sikkerhet_bom@2x.png'
+import sikkerhetBom from '../../../assets/images/sikkerhet_bom.png'
+import retinaSikkerhetBom from '../../../assets/images/sikkerhet_bom@2x.png'
 
-import { getDocumentId } from '../../utils'
+import { getDocumentId } from '../../../utils'
 
 import './styles.scss'
 

src/containers/MineTavlerModal/styles.scss → src/components/Modals/MineTavlerModal/styles.scss

@@ -1,4 +1,4 @@
-@import '../../assets/styles/import.scss';
+@import '../../../assets/styles/import.scss';
 
 .mine-tavler-modal.eds-modal__content {
     padding: 0.8rem 1.5rem 1.5rem;