let debouncedSaveTimer: NodeJS.Timeout
let unsaved = false
@@ -17,7 +16,7 @@
async function save() {
try {
- await update_dictionary({ id: dictionary_id, [field]: value })
+ await update_dictionary({ [field]: value })
unsaved = false
} catch (err) {
alert(err)
diff --git a/packages/site/src/routes/admin/dictionaries/DictionaryRow.svelte b/packages/site/src/routes/admin/dictionaries/DictionaryRow.svelte
index 400a16221..6a5b11bbb 100644
--- a/packages/site/src/routes/admin/dictionaries/DictionaryRow.svelte
+++ b/packages/site/src/routes/admin/dictionaries/DictionaryRow.svelte
@@ -1,26 +1,31 @@
|
window.open(`/${dictionary.id}`)} class="absolute top-0 left-0 text-xs text-gray-400 cursor-pointer">{index + 1}
-
+
|
|
-
- {#each $invites || [] as invite}
+ {
+ await add_editor({ role: 'manager', user_id, dictionary_id: dictionary.id })
+ await load_data()
+ }}
+ remove_editor={async (user_id) => {
+ await remove_editor({ user_id, dictionary_id: dictionary.id })
+ await load_data()
+ }}
+ invite_editor={async () => {
+ await inviteHelper('manager', dictionary.id)
+ await load_data()
+ }}
+ {users} />
+ {#each dictionary.invites as invite}
{#if invite.role === 'manager'}
- updateOnline(`dictionaries/${dictionary.id}/invites/${invite.id}`, {
- status: 'cancelled',
- })}>
+ on_delete_invite={async () => {
+ const { error } = await supabase.from('invites').update({ status: 'cancelled' }).eq('id', invite.id)
+ if (error) {
+ alert(error.message)
+ console.error(error)
+ } else {
+ await load_data()
+ }
+ }}>
@@ -64,39 +87,52 @@
|
-
- {#each $invites || [] as invite}
+ {
+ await add_editor({ role: 'contributor', user_id, dictionary_id: dictionary.id })
+ await load_data()
+ }}
+ remove_editor={async (user_id) => {
+ await remove_editor({ user_id, dictionary_id: dictionary.id })
+ await load_data()
+ }}
+ invite_editor={async () => {
+ await inviteHelper('contributor', dictionary.id)
+ await load_data()
+ }}
+ {users} />
+ {#each dictionary.invites as invite}
{#if invite.role === 'contributor'}
- updateOnline(`dictionaries/${dictionary.id}/invites/${invite.id}`, {
- status: 'cancelled',
- })}>
+ on_delete_invite={async () => {
+ const { error } = await supabase.from('invites').update({ status: 'cancelled' }).eq('id', invite.id)
+ if (error) {
+ alert(error.message)
+ console.error(error)
+ } else {
+ await load_data()
+ }
+ }}>
{/if}
{/each}
|
-
-
-
- |
|
|
@@ -116,7 +152,6 @@
on:update={({ detail: { lat, lng } }) => {
const [, ...rest] = dictionary.coordinates?.points || []
update_dictionary({
- id: dictionary.id,
coordinates: {
points: [{ coordinates: { latitude: lat, longitude: lng } }, ...rest],
regions: dictionary.coordinates?.regions,
@@ -126,7 +161,6 @@
on:remove={() => {
const [, ...rest] = dictionary.coordinates?.points || []
update_dictionary({
- id: dictionary.id,
coordinates: {
points: rest,
regions: dictionary.coordinates?.regions,
@@ -142,7 +176,6 @@
|
@@ -158,14 +191,12 @@
const name = prompt('Enter alternate name:')
if (name) {
update_dictionary({
- id: dictionary.id,
alternate_names: [...(dictionary.alternate_names || []), name],
})
}
}}
on:itemremoved={({ detail: { value } }) => {
update_dictionary({
- id: dictionary.id,
alternate_names: dictionary.alternate_names.filter(name => name !== value),
})
}} />
@@ -193,7 +224,6 @@
onclick={() => {
if (confirm('Toggle con lang status?')) {
update_dictionary({
- id: dictionary.id,
con_language_description: !dictionary.con_language_description ? 'YES' : null,
})
}
diff --git a/packages/site/src/routes/admin/dictionaries/RolesManagment.svelte b/packages/site/src/routes/admin/dictionaries/RolesManagment.svelte
index 64e5ff691..44cbfd9e7 100644
--- a/packages/site/src/routes/admin/dictionaries/RolesManagment.svelte
+++ b/packages/site/src/routes/admin/dictionaries/RolesManagment.svelte
@@ -1,47 +1,26 @@
-
+
h.name)}
+ strings={editors.map(({ full_name, email }) => full_name || email)}
canEdit
addMessage="Add"
- on:itemclicked={e => alert(helpers[e.detail.index].id)}
- on:itemremoved={async e => await remove(helpers[e.detail.index], dictionary.id, role)}
- on:additem={role === 'writeInCollaborator' ? addWriteInCollaborator : toggleSelectUserModal} />
+ on:itemclicked={e => alert(editors[e.detail.index].id)}
+ on:itemremoved={async e => await remove_editor(editors[e.detail.index].id)}
+ on:additem={toggle} />
- {#if show && role !== 'writeInCollaborator'}
- {#await import('../users/SelectUserModal.svelte') then { default: SelectUserModal }}
-
+ {#if show}
+ {#await import('./SelectUserModal.svelte') then { default: SelectUserModal }}
+
{/await}
{/if}
diff --git a/packages/site/src/routes/admin/dictionaries/SelectDictionaryModal.svelte b/packages/site/src/routes/admin/dictionaries/SelectDictionaryModal.svelte
deleted file mode 100644
index 09879118f..000000000
--- a/packages/site/src/routes/admin/dictionaries/SelectDictionaryModal.svelte
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-
- Select Dictionary to let {user.displayName} be a {role}
-
-
-
- {#each filteredDictionaries as dictionary}
-
- {/each}
-
-
-
-
-
diff --git a/packages/site/src/routes/admin/dictionaries/SelectUserModal.svelte b/packages/site/src/routes/admin/dictionaries/SelectUserModal.svelte
new file mode 100644
index 000000000..af5e272cc
--- /dev/null
+++ b/packages/site/src/routes/admin/dictionaries/SelectUserModal.svelte
@@ -0,0 +1,38 @@
+
+
+
+ Select a user to add role to
+
+ {#each filteredUsers as user}
+
+ {:else}
+
+ {/each}
+
+
+
+
diff --git a/packages/site/src/routes/admin/dictionaries/SortDictionaries.svelte b/packages/site/src/routes/admin/dictionaries/SortDictionaries.svelte
index b75b6367d..fed0ef6be 100644
--- a/packages/site/src/routes/admin/dictionaries/SortDictionaries.svelte
+++ b/packages/site/src/routes/admin/dictionaries/SortDictionaries.svelte
@@ -1,52 +1,32 @@
- {#each userFields as field}
+ {#each dictionary_fields as field}
setSortSettings(field.key)}
diff --git a/packages/site/src/routes/admin/dictionaries/dictionaryWithHelpers.d.ts b/packages/site/src/routes/admin/dictionaries/dictionaryWithHelpers.d.ts
deleted file mode 100644
index 2341abacc..000000000
--- a/packages/site/src/routes/admin/dictionaries/dictionaryWithHelpers.d.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import type { Readable } from 'svelte/store'
-import type { DictionaryView, IHelper, IInvite } from '@living-dictionaries/types'
-
-type DictionaryWithHelperStores = DictionaryView & {
- managers: Readable
- contributors: Readable
- writeInCollaborators: Readable
- invites: Readable
- getManagers: Promise
- getContributors: Promise
- getWriteInCollaborators: Promise
- getInvites: Promise
-}
-
-type DictionaryWithHelpers = DictionaryView & {
- managers: IHelper[]
- contributors: IHelper[]
- writeInCollaborators: IHelper[]
- invites: IInvite[]
-}
diff --git a/packages/site/src/routes/admin/dictionaries/dictionaryWithHelpers.types.ts b/packages/site/src/routes/admin/dictionaries/dictionaryWithHelpers.types.ts
new file mode 100644
index 000000000..1f1900f64
--- /dev/null
+++ b/packages/site/src/routes/admin/dictionaries/dictionaryWithHelpers.types.ts
@@ -0,0 +1,7 @@
+import type { DictionaryView, Tables } from '@living-dictionaries/types'
+import type { UserWithDictionaryRoles } from '@living-dictionaries/types/supabase/users.types'
+
+export type DictionaryWithHelpers = DictionaryView & {
+ editors: UserWithDictionaryRoles[]
+ invites: Tables<'invites'>[]
+}
diff --git a/packages/site/src/routes/admin/dictionaries/export.ts b/packages/site/src/routes/admin/dictionaries/export.ts
index e8df3f754..403510cd4 100644
--- a/packages/site/src/routes/admin/dictionaries/export.ts
+++ b/packages/site/src/routes/admin/dictionaries/export.ts
@@ -1,6 +1,7 @@
-import type { DictionaryWithHelperStores, DictionaryWithHelpers } from './dictionaryWithHelpers'
+import type { DictionaryWithHelpers } from './dictionaryWithHelpers.types'
import { downloadObjectsAsCSV } from '$lib/export/csv'
-import { type StandardDictionaryForCSV, prepareDictionaryForCsv, dictionary_headers as standard_headers, timestamp_to_string_date } from '$lib/export/prepareDictionariesForCsv'
+import { type StandardDictionaryForCSV, prepareDictionaryForCsv, dictionary_headers as standard_headers } from '$lib/export/prepareDictionariesForCsv'
+import { supabase_date_to_friendly } from '$lib/helpers/time'
enum AdminDictionaryCSVFields {
entryCount = 'Entries',
@@ -14,7 +15,6 @@ enum AdminDictionaryCSVFields {
conLangDescription = 'Conlang Description',
managers = 'Managers',
contributors = 'Contributors',
- writeInCollaborators = 'Write-In Collaborators',
invites = 'Pending Invites',
}
@@ -25,9 +25,7 @@ type AdminDictionaryForCSV = {
const admin_headers: AdminDictionaryForCSV = { ...AdminDictionaryCSVFields }
-export async function exportAdminDictionariesAsCSV(dictionariesAndHelpers: DictionaryWithHelperStores[], section: 'public' | 'private' | 'other') {
- const dictionaries = await getAllDictionariesAndHelpers(dictionariesAndHelpers)
-
+export function exportAdminDictionariesAsCSV(dictionaries: DictionaryWithHelpers[], section: 'public' | 'private' | 'other') {
const formatted_dictionaries: (StandardDictionaryForCSV & AdminDictionaryForCSV)[] = dictionaries.map((dictionary) => {
const standard_dictionary = prepareDictionaryForCsv(dictionary)
const admin_dictionary: AdminDictionaryForCSV = {
@@ -43,12 +41,10 @@ export async function exportAdminDictionariesAsCSV(dictionariesAndHelpers: Dicti
alternate_orthographies: dictionary.orthographies?.map(({ name }) => name.default)?.join(', '),
created_at: dictionary.created_at,
- // data from subcollections
- managers: dictionary.managers.map(({ name }) => name).join(', '),
- contributors: dictionary.contributors.map(({ name }) => name).join(', '),
- writeInCollaborators: dictionary.writeInCollaborators.map(({ name }) => name).join(', '),
+ managers: dictionary.editors.filter(({ dictionary_roles }) => dictionary_roles.some(({ role }) => role === 'manager')).map(({ full_name, email }) => full_name || email).join(', '),
+ contributors: dictionary.editors.filter(({ dictionary_roles }) => dictionary_roles.some(({ role }) => role === 'contributor')).map(({ full_name, email }) => full_name || email).join(', '),
invites: dictionary.invites.map((invite) => {
- return `${invite.inviterName} (${invite.inviterEmail}) invited ${invite.targetEmail} as ${invite.role} on ${timestamp_to_string_date(invite.createdAt)}`
+ return `${invite.inviter_email} invited ${invite.target_email} as ${invite.role} on ${supabase_date_to_friendly(invite.created_at)}`
}).join(', '),
}
@@ -61,19 +57,3 @@ export async function exportAdminDictionariesAsCSV(dictionariesAndHelpers: Dicti
`living-dictionaries-${section}`,
)
}
-
-async function getAllDictionariesAndHelpers(
- dictionariesAndHelpers: DictionaryWithHelperStores[],
-): Promise {
- const dictionaries: DictionaryWithHelpers[] = []
- for (const dictionary of dictionariesAndHelpers) {
- dictionaries.push({
- ...dictionary,
- managers: await dictionary.getManagers,
- contributors: await dictionary.getContributors,
- writeInCollaborators: await dictionary.getWriteInCollaborators,
- invites: await dictionary.getInvites,
- })
- }
- return dictionaries
-}
diff --git a/packages/site/src/routes/admin/users/+page.svelte b/packages/site/src/routes/admin/users/+page.svelte
index 7db99b480..6e6017999 100644
--- a/packages/site/src/routes/admin/users/+page.svelte
+++ b/packages/site/src/routes/admin/users/+page.svelte
@@ -1,15 +1,33 @@
-
-
-
-
-
-
-
-
-
- {#each sortedUsers as user (user.uid)}
-
- {/each}
-
-
-
-
+
+
+
+
+
+
+
+ {#each sortedUsers as user (user.id)}
+
+ {/each}
+
+
+
+ 1 && JSON.stringify(user, null, 1)}>
|
- {user.displayName}
+ {user.email}
|
- {user.email}
+ {user.full_name || ''}
|
-
-
- {#if intersecting}
-
- {/if}
- |
+ {
+ await remove_editor({ dictionary_id, user_id: user.id })
+ await load_data()
+ }}
+ add_dictionary={async (dictionary_id) => {
+ await add_editor({ dictionary_id, user_id: user.id, role: 'manager' })
+ await load_data()
+ }} />
+
-
-
- {#if intersecting}
-
- {/if}
- |
+ {
+ await remove_editor({ dictionary_id, user_id: user.id })
+ await load_data()
+ }}
+ add_dictionary={async (dictionary_id) => {
+ await add_editor({ dictionary_id, user_id: user.id, role: 'contributor' })
+ await load_data()
+ }} />
+
- {#if user.lastVisit}{printDate(user.lastVisit.toDate())}{/if}
+ {#if user.last_sign_in_at}{supabase_date_to_friendly(user.last_sign_in_at)}{/if}
|
- {#if user.createdAt}{printDate(user.createdAt.toDate())}{/if}
+ {#if user.created_at}{supabase_date_to_friendly(user.created_at)}{/if}
|
- {#if user.unsubscribe}
+ {#if user.unsubscribed_from_emails}
+ }}>{supabase_date_to_friendly(user.unsubscribed_from_emails)}
{:else}
{/if}
|
diff --git a/packages/site/src/routes/api/db/check-permission.ts b/packages/site/src/routes/api/db/check-permission.ts
index bd6f8431d..a3031b300 100644
--- a/packages/site/src/routes/api/db/check-permission.ts
+++ b/packages/site/src/routes/api/db/check-permission.ts
@@ -1,38 +1,10 @@
-import type { IUser } from '@living-dictionaries/types'
-import { getDb } from '$lib/server/firebase-admin'
+import type { Supabase } from '$lib/supabase'
-let db: FirebaseFirestore.Firestore
+export async function check_can_edit(supabase: Supabase, dictionary_id: string) {
+ const { data: roles, error } = await supabase.from('dictionary_roles').select()
+ if (error) throw new Error(error.message)
-export async function check_can_edit(user_id: string, dictionary_id: string) {
- if (!db)
- db = getDb()
-
- const dictionaryManagers = await db.collection(`dictionaries/${dictionary_id}/managers`).get()
- const isDictionaryManager = dictionaryManagers.docs.some(({ id }) => id === user_id)
- if (isDictionaryManager) return true
-
- const dictionaryContributors = await db.collection(`dictionaries/${dictionary_id}/contributors`).get()
- const isDictionaryContributor = dictionaryContributors.docs.some(({ id }) => id === user_id)
- if (isDictionaryContributor) return true
-
- const userSnap = await db.doc(`users/${user_id}`).get()
- const { roles } = userSnap.data() as IUser
- if (roles?.admin) return true
-
- throw new Error('Is not authorized to make changes to this dictionary.')
-}
-
-export async function check_manager(user_id: string, dictionary_id: string) {
- if (!db)
- db = getDb()
-
- const dictionaryManagers = await db.collection(`dictionaries/${dictionary_id}/managers`).get()
- const isDictionaryManager = dictionaryManagers.docs.some(({ id }) => id === user_id)
- if (isDictionaryManager) return true
-
- const userSnap = await db.doc(`users/${user_id}`).get()
- const { roles } = userSnap.data() as IUser
- if (roles?.admin) return true
+ if (roles.some(({ dictionary_id: _dictionary_id, role }) => _dictionary_id === dictionary_id && (role === 'manager' || role === 'contributor'))) return true
throw new Error('Is not authorized to make changes to this dictionary.')
}
diff --git a/packages/site/src/routes/api/db/content-update/+server.ts b/packages/site/src/routes/api/db/content-update/+server.ts
index 69802329f..4352d5759 100644
--- a/packages/site/src/routes/api/db/content-update/+server.ts
+++ b/packages/site/src/routes/api/db/content-update/+server.ts
@@ -3,49 +3,29 @@ import { json, error as kit_error } from '@sveltejs/kit'
import type { ContentUpdateRequestBody, TablesInsert } from '@living-dictionaries/types'
import { check_can_edit } from '../check-permission'
import type { RequestHandler } from './$types'
-import { decodeToken } from '$lib/server/firebase-admin'
import { getAdminSupabaseClient } from '$lib/supabase/admin'
import { ResponseCodes } from '$lib/constants'
-import { dev } from '$app/environment'
export type ContentUpdateResponseBody = TablesInsert<'content_updates'>
-export const POST: RequestHandler = async ({ request }) => {
+export const POST: RequestHandler = async ({ request, locals: { getSession } }) => {
try {
const body = await request.json() as ContentUpdateRequestBody
- const { update_id, import_meta, auth_token, dictionary_id, import_id, type, data } = body
+ const { update_id, dictionary_id, import_id, type, data } = body
const admin_supabase = getAdminSupabaseClient()
- let user_id: string
+ const { data: session_data, error: _error, supabase } = await getSession()
+ if (_error || !session_data?.user)
+ kit_error(ResponseCodes.UNAUTHORIZED, { message: _error.message || 'Unauthorized' })
+ const user_id = session_data.user.id
- if (dev)
- // @ts-expect-error
- user_id = import_meta?.user_id || data?.updated_by || data?.created_by
-
- if (auth_token) {
- const decoded_token = await decodeToken(auth_token)
- if (!decoded_token?.uid)
- throw new Error('No user id found in token')
-
- await check_can_edit(decoded_token.uid, dictionary_id)
-
- const { data } = await admin_supabase.from('user_emails')
- .select('id')
- .eq('email', decoded_token.email!)
- .single()
- if (!data?.id)
- throw new Error('No user id found in database')
- user_id = data.id
+ if (!session_data.user.app_metadata.admin) {
+ await check_can_edit(supabase, dictionary_id)
}
- if (!user_id)
- throw new Error('No user id found. Pass it into the user_id_from_local field or use a valid auth_token.')
-
- const timestamp = dev
// @ts-expect-error
- ? import_meta?.timestamp || data?.updated_at || data?.created_at || new Date().toISOString()
- : new Date().toISOString()
+ const timestamp = data?.updated_at || data?.created_at || new Date().toISOString()
const c_u_meta = {
created_by: user_id,
diff --git a/packages/site/src/routes/api/db/create-dictionary/+server.ts b/packages/site/src/routes/api/db/create-dictionary/+server.ts
index b91490043..27c9133e3 100644
--- a/packages/site/src/routes/api/db/create-dictionary/+server.ts
+++ b/packages/site/src/routes/api/db/create-dictionary/+server.ts
@@ -1,48 +1,28 @@
import { json, error as kit_error } from '@sveltejs/kit'
-import type { IUser, TablesInsert } from '@living-dictionaries/types'
+import type { TablesInsert } from '@living-dictionaries/types'
import type { RequestHandler } from './$types'
-import { decodeToken } from '$lib/server/firebase-admin'
-import { getAdminSupabaseClient } from '$lib/supabase/admin'
import { ResponseCodes } from '$lib/constants'
import { send_dictionary_emails } from '$api/email/new_dictionary/dictionary-emails'
export interface CreateDictionaryRequestBody {
- auth_token: string
- dictionary: Omit, 'created_by' | 'updated_by'>
- fb_user: IUser
+ dictionary: TablesInsert<'dictionaries'>
}
-export const POST: RequestHandler = async ({ request }) => {
- try {
- const { auth_token, dictionary, fb_user } = await request.json() as CreateDictionaryRequestBody
-
- const admin_supabase = getAdminSupabaseClient()
-
- if (!auth_token)
- throw new Error('missing auth_token')
+export const POST: RequestHandler = async ({ request, locals: { getSession } }) => {
+ const { data: session_data, error: _error, supabase } = await getSession()
+ if (_error || !session_data?.user)
+ kit_error(ResponseCodes.UNAUTHORIZED, { message: _error.message || 'Unauthorized' })
- const decoded_token = await decodeToken(auth_token)
- if (!decoded_token?.uid)
- throw new Error('No user id found in token')
-
- const { data: user } = await admin_supabase.from('user_emails')
- .select('id')
- .eq('email', decoded_token.email!)
- .single()
- if (!user?.id)
- throw new Error('No user id found in database')
+ try {
+ const { dictionary } = await request.json() as CreateDictionaryRequestBody
- const { data: saved_dictionary, error } = await admin_supabase.from('dictionaries').insert({
- ...dictionary,
- created_by: user.id,
- updated_by: user.id,
- }).select().single()
+ const { data: saved_dictionary, error } = await supabase.from('dictionaries').insert(dictionary).select().single()
if (error) {
console.error({ error })
throw new Error(error.message)
}
- await send_dictionary_emails(saved_dictionary, fb_user)
+ await send_dictionary_emails(saved_dictionary, session_data.user.email)
return json(null)
} catch (err) {
diff --git a/packages/site/src/routes/api/db/create-dictionary/_call.ts b/packages/site/src/routes/api/db/create-dictionary/_call.ts
index 015b605c0..ff271b4a2 100644
--- a/packages/site/src/routes/api/db/create-dictionary/_call.ts
+++ b/packages/site/src/routes/api/db/create-dictionary/_call.ts
@@ -1,10 +1,6 @@
-import { authState } from 'sveltefirets'
-import { get } from 'svelte/store'
import type { CreateDictionaryRequestBody } from './+server'
import { post_request } from '$lib/helpers/get-post-requests'
-export async function api_create_dictionary(body: Omit) {
- const auth_state_user = get(authState)
- const auth_token = await auth_state_user.getIdToken()
- return await post_request(`/api/db/create-dictionary`, { ...body, auth_token })
+export async function api_create_dictionary(body: CreateDictionaryRequestBody) {
+ return await post_request(`/api/db/create-dictionary`, body)
}
diff --git a/packages/site/src/routes/api/db/update-dev-admin-role/+server.ts b/packages/site/src/routes/api/db/update-dev-admin-role/+server.ts
index 3b70dd42e..f38778825 100644
--- a/packages/site/src/routes/api/db/update-dev-admin-role/+server.ts
+++ b/packages/site/src/routes/api/db/update-dev-admin-role/+server.ts
@@ -1,34 +1,35 @@
-import { firebaseConfig } from 'sveltefirets'
import { error, json } from '@sveltejs/kit'
import type { RequestHandler } from './$types'
import { ResponseCodes } from '$lib/constants'
-import { decodeToken, getDb } from '$lib/server/firebase-admin'
+import { mode } from '$lib/supabase'
+import { getAdminSupabaseClient } from '$lib/supabase/admin'
export interface UpdateDevAdminRoleRequestBody {
- role: number
- auth_token: string
+ role_level: number
}
-export const POST: RequestHandler = async ({ request }) => {
- const { role, auth_token } = await request.json() as UpdateDevAdminRoleRequestBody
+export const POST: RequestHandler = async ({ request, locals: { getSession } }) => {
+ const { role_level } = await request.json() as UpdateDevAdminRoleRequestBody
- if (firebaseConfig.projectId !== 'talking-dictionaries-dev')
+ if (mode !== 'development')
error(ResponseCodes.BAD_REQUEST, `Only works on dev`)
- if (typeof role !== 'number')
+ if (typeof role_level !== 'number')
error(ResponseCodes.BAD_REQUEST, `Role must be a number`)
- console.info({ role })
- const db = getDb()
- const decodedToken = await decodeToken(auth_token)
- if (!decodedToken?.uid)
- throw new Error('No user id found in token')
-
- await db.doc(`users/${decodedToken.uid}`).update({
- roles: {
- admin: role,
- },
- })
+ const { data: session_data, error: _error } = await getSession()
+ if (_error || !session_data?.user)
+ error(ResponseCodes.UNAUTHORIZED, { message: _error.message || 'Unauthorized' })
+
+ const admin_supabase = getAdminSupabaseClient()
+
+ const { error: update_role_error } = await admin_supabase.auth.admin.updateUserById(
+ session_data.user.id,
+ { app_metadata: { admin: role_level } },
+ )
+
+ if (update_role_error)
+ error(ResponseCodes.INTERNAL_SERVER_ERROR, { message: update_role_error.message })
return json('success')
}
diff --git a/packages/site/src/routes/api/db/update-dev-admin-role/_call.ts b/packages/site/src/routes/api/db/update-dev-admin-role/_call.ts
new file mode 100644
index 000000000..b34c7f842
--- /dev/null
+++ b/packages/site/src/routes/api/db/update-dev-admin-role/_call.ts
@@ -0,0 +1,6 @@
+import type { UpdateDevAdminRoleRequestBody } from './+server'
+import { post_request } from '$lib/helpers/get-post-requests'
+
+export async function api_update_dev_admin_role(body: UpdateDevAdminRoleRequestBody) {
+ return await post_request(`/api/db/update-dev-admin-role`, body)
+}
diff --git a/packages/site/src/routes/api/db/update-dictionary/+server.ts b/packages/site/src/routes/api/db/update-dictionary/+server.ts
deleted file mode 100644
index 09f1fa3d5..000000000
--- a/packages/site/src/routes/api/db/update-dictionary/+server.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { json, error as kit_error } from '@sveltejs/kit'
-import type { Tables, TablesUpdate } from '@living-dictionaries/types'
-import { check_manager } from '../check-permission'
-import type { RequestHandler } from './$types'
-import { decodeToken } from '$lib/server/firebase-admin'
-import { getAdminSupabaseClient } from '$lib/supabase/admin'
-import { ResponseCodes } from '$lib/constants'
-
-export interface UpdateDictionaryRequestBody {
- auth_token: string
- dictionary: TablesUpdate<'dictionaries'>
-}
-
-export interface UpdateDictionaryResponseBody {
- saved_dictionary: Tables<'dictionaries'>
-}
-
-export const POST: RequestHandler = async ({ request }) => {
- try {
- const { auth_token, dictionary } = await request.json() as UpdateDictionaryRequestBody
-
- const admin_supabase = getAdminSupabaseClient()
-
- if (!auth_token)
- throw new Error('missing auth_token')
-
- const decoded_token = await decodeToken(auth_token)
- if (!decoded_token?.uid)
- throw new Error('No user id found in token')
-
- await check_manager(decoded_token.uid, dictionary.id)
-
- const { data: user } = await admin_supabase.from('user_emails')
- .select('id')
- .eq('email', decoded_token.email!)
- .single()
- if (!user?.id)
- throw new Error('No user id found in database')
-
- const { data: saved_dictionary, error } = await admin_supabase.from('dictionaries').update({
- ...dictionary,
- updated_by: user.id,
- })
- .eq('id', dictionary.id)
- .select().single()
- if (error) {
- console.error({ error })
- throw new Error(error.message)
- }
-
- return json({ saved_dictionary } satisfies UpdateDictionaryResponseBody)
- } catch (err) {
- console.error(`Error creating dictionary: ${err.message}`)
- kit_error(ResponseCodes.INTERNAL_SERVER_ERROR, `Error creating dictionary: ${err.message}`)
- }
-}
diff --git a/packages/site/src/routes/api/db/update-dictionary/_call.ts b/packages/site/src/routes/api/db/update-dictionary/_call.ts
deleted file mode 100644
index a78dd3a98..000000000
--- a/packages/site/src/routes/api/db/update-dictionary/_call.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { TablesUpdate } from '@living-dictionaries/types'
-import { authState } from 'sveltefirets'
-import { get } from 'svelte/store'
-import type { UpdateDictionaryRequestBody, UpdateDictionaryResponseBody } from './+server'
-import { post_request } from '$lib/helpers/get-post-requests'
-
-export async function api_update_dictionary(dictionary: TablesUpdate<'dictionaries'> & { id: string }) {
- const auth_state_user = get(authState)
- const auth_token = await auth_state_user.getIdToken()
- return await post_request(`/api/db/update-dictionary`, { auth_token, dictionary })
-}
diff --git a/packages/site/src/routes/api/email/addresses.ts b/packages/site/src/routes/api/email/addresses.ts
index bd8bffd17..54b8be39b 100644
--- a/packages/site/src/routes/api/email/addresses.ts
+++ b/packages/site/src/routes/api/email/addresses.ts
@@ -1,4 +1,3 @@
-import { firebaseConfig } from 'sveltefirets'
import type { Address } from './send-email'
import { dev } from '$app/environment'
@@ -23,7 +22,7 @@ export function getAdminRecipients(initiatorEmail: string): Address[] {
{ email: 'diego@livingtongues.org' },
]
- if (dev || firebaseConfig.projectId === 'talking-dictionaries-dev')
+ if (dev)
return recipients
return [
@@ -39,7 +38,7 @@ export function getSupportMessageRecipients({ dev }: { dev: boolean }): Address[
{ email: 'diego@livingtongues.org' },
]
- if (dev || firebaseConfig.projectId === 'talking-dictionaries-dev')
+ if (dev)
return recipients
return [
@@ -54,7 +53,7 @@ export function getLanguageLearningMaterialsRecipients({ dev }: { dev: boolean }
{ email: 'diego@livingtongues.org' },
]
- if (dev || firebaseConfig.projectId === 'talking-dictionaries-dev')
+ if (dev)
return recipients
return [
diff --git a/packages/site/src/routes/api/email/announcement/+server.ts b/packages/site/src/routes/api/email/announcement/+server.ts
index c70bfa996..c63ee795f 100644
--- a/packages/site/src/routes/api/email/announcement/+server.ts
+++ b/packages/site/src/routes/api/email/announcement/+server.ts
@@ -1,5 +1,4 @@
import { error, json } from '@sveltejs/kit'
-import type { IUser } from '@living-dictionaries/types'
import { send_email } from '../send-email'
import { render_component_to_html } from '../render-component-to-html'
import { jacobAddress, no_reply_address } from '../addresses'
@@ -7,7 +6,6 @@ import type { RequestHandler } from './$types'
import MigrationClosure from './MigrationClosure.svelte'
import { ResponseCodes } from '$lib/constants'
import { dev } from '$app/environment'
-import { getDb } from '$lib/server/firebase-admin'
const batchSize = 50
@@ -16,10 +14,8 @@ export const GET: RequestHandler = async () => {
error(ResponseCodes.INTERNAL_SERVER_ERROR, { message: 'Not allowed' })
try {
- const db = getDb()
- const userSnapshots = await db.collection('users').get()
- const users = userSnapshots.docs.map(doc => doc.data() as IUser)
- const user_emails = users.map(user => ({ email: user.email }))
+ // const user_emails = users.map(user => ({ email: user.email }))
+ const user_emails = [] // TODO: get from supabase next time using 'user_emails' view
// return json({ emails_to_send: users.map(user => user.email).splice(received) })
diff --git a/packages/site/src/routes/api/email/invite/+server.ts b/packages/site/src/routes/api/email/invite/+server.ts
index f015e7a95..03f615ed7 100644
--- a/packages/site/src/routes/api/email/invite/+server.ts
+++ b/packages/site/src/routes/api/email/invite/+server.ts
@@ -1,60 +1,56 @@
import { error, json } from '@sveltejs/kit'
-import type { IInvite, IUser } from '@living-dictionaries/types'
+import type { TablesInsert } from '@living-dictionaries/types'
import { getAdminRecipients } from '../addresses'
import { send_email } from '../send-email'
import type { RequestHandler } from './$types'
-import { decodeToken, getDb } from '$lib/server/firebase-admin'
import { ResponseCodes } from '$lib/constants'
-export interface InviteRequestBody {
- auth_token: string
- dictionaryId: string
- invite: IInvite
+export type InviteRequestBody = Pick, 'dictionary_id' | 'role' | 'target_email'> & {
+ origin: string
}
-export const POST: RequestHandler = async ({ request }) => {
- const { auth_token, dictionaryId, invite } = await request.json() as InviteRequestBody
- const { dictionaryName, inviterName, role, targetEmail, inviterEmail } = invite
+export const POST: RequestHandler = async ({ request, locals: { getSession } }) => {
+ const { data: session_data, error: _error, supabase } = await getSession()
+ if (_error || !session_data?.user)
+ error(ResponseCodes.UNAUTHORIZED, { message: _error.message || 'Unauthorized' })
- const decodedToken = await decodeToken(auth_token)
- if (!decodedToken?.uid)
- error(ResponseCodes.UNAUTHORIZED, { message: 'Unauthorized' })
- if (inviterEmail !== decodedToken.email)
- error(ResponseCodes.BAD_REQUEST, { message: 'Requesting from incorrect account' })
-
- const db = getDb()
-
- const checkForPermission = async () => {
- const dictionaryManagers = await db.collection(`dictionaries/${dictionaryId}/managers`).get()
- const isDictionaryManager = dictionaryManagers.docs.some(({ id }) => id === decodedToken.uid)
- if (isDictionaryManager) return true
-
- const userSnap = await db.doc(`users/${decodedToken.uid}`).get()
- const { roles } = userSnap.data() as IUser
- if (roles?.admin) return true
-
- error(ResponseCodes.BAD_REQUEST, { message: 'Is not a manager of this dictionary.' })
- }
- await checkForPermission()
-
- const inviteRef = await db.collection(`dictionaries/${dictionaryId}/invites`).add(invite)
-
- const roleMessage
+ try {
+ const data = await request.json() as InviteRequestBody
+ const { role, dictionary_id, target_email, origin } = data
+
+ const inviter_email = session_data.user.email
+ const { data: invite, error: insert_invite_error } = await supabase.from('invites').insert({
+ dictionary_id,
+ role,
+ target_email,
+ inviter_email,
+ status: 'queued',
+ }).select().single()
+
+ if (insert_invite_error)
+ throw new Error(insert_invite_error.message)
+
+ const roleMessage
= role === 'manager'
? 'manager'
: 'contributor, which allows you to add and edit entries'
- try {
+ const { data: dictionary, error: dictionary_error } = await supabase.from('dictionaries').select('name').eq('id', dictionary_id).single()
+ if (dictionary_error)
+ throw new Error(dictionary_error.message)
+
+ const inviter_name_or_email = session_data.user.user_metadata.full_name || session_data.user.email
+
await send_email({
- to: [{ email: targetEmail }],
- reply_to: { email: inviterEmail },
- subject: `${inviterName} has invited you to contribute to the ${dictionaryName} Living Dictionary`,
+ to: [{ email: target_email }],
+ reply_to: { email: inviter_email },
+ subject: `${inviter_name_or_email} has invited you to contribute to the ${dictionary.name} Living Dictionary`,
type: 'text/plain',
body: `Hello,
-${inviterName} has invited you to work on the ${dictionaryName} Living Dictionary as a ${roleMessage}. If you would like to help with this dictionary, then open this link: https://livingdictionaries.app/${dictionaryId}/invite/${inviteRef.id} to access the dictionary.
+${inviter_name_or_email} has invited you to work on the ${dictionary.name} Living Dictionary as a ${roleMessage}. If you would like to help with this dictionary, then open this link: ${origin}/${dictionary_id}/invite/${invite.id} to access the dictionary.
-If you have any questions for ${inviterName}, send an email to ${inviterEmail} or just reply to this email.
+If you have any questions for ${inviter_name_or_email}, send an email to ${inviter_email} or just reply to this email.
Thank you,
Living Tongues Institute for Endangered Languages
@@ -63,28 +59,30 @@ https://livingtongues.org (Living Tongues Homepage)
https://livingdictionaries.app (Living Dictionaries website)`,
})
- const adminRecipients = getAdminRecipients(inviterEmail)
- if (!adminRecipients.find(({ email }) => email === inviterEmail)) {
+ const adminRecipients = getAdminRecipients(inviter_email)
+ if (!adminRecipients.find(({ email }) => email === inviter_email)) {
await send_email({
to: adminRecipients,
- reply_to: { email: inviterEmail },
- subject: `${inviterName} has invited ${targetEmail} to contribute to the ${dictionaryName} Living Dictionary`,
+ reply_to: { email: inviter_email },
+ subject: `${inviter_name_or_email} has invited ${target_email} to contribute to the ${dictionary.name} Living Dictionary`,
type: 'text/plain',
body: `Hello Admins,
-${inviterName} has invited ${targetEmail} to work on the ${dictionaryName} Living Dictionary as a ${roleMessage}.
+ ${inviter_name_or_email} has invited ${target_email} to work on the ${dictionary.name} Living Dictionary as a ${roleMessage}.
+
+ Dictionary URL: https://livingdictionaries.app/${dictionary_id}
-Dictionary URL: https://livingdictionaries.app/${dictionaryId}
-
-If you have any questions for ${inviterName}, just reply to this email.
+ If you have any questions for ${inviter_name_or_email}, just reply to this email.
-Thanks,
-Our automatic Vercel function
+ Thanks,
+ Our automatic Vercel function
-https://livingdictionaries.app`,
+ https://livingdictionaries.app`,
})
}
- await inviteRef.update({ status: 'sent' })
+ const { error: update_error } = await supabase.from('invites').update({ status: 'sent' }).eq('id', invite.id)
+ if (update_error)
+ throw new Error(update_error.message)
return json('success')
} catch (err) {
diff --git a/packages/site/src/routes/api/email/invite/_call.ts b/packages/site/src/routes/api/email/invite/_call.ts
new file mode 100644
index 000000000..ec0f627c8
--- /dev/null
+++ b/packages/site/src/routes/api/email/invite/_call.ts
@@ -0,0 +1,6 @@
+import type { InviteRequestBody } from './+server'
+import { post_request } from '$lib/helpers/get-post-requests'
+
+export async function api_dictionary_invite(body: InviteRequestBody) {
+ return await post_request(`/api/email/invite`, body)
+}
diff --git a/packages/site/src/routes/api/email/new_dictionary/composeMessages.test.ts b/packages/site/src/routes/api/email/new_dictionary/composeMessages.test.ts
index e06b184c1..969af7b69 100644
--- a/packages/site/src/routes/api/email/new_dictionary/composeMessages.test.ts
+++ b/packages/site/src/routes/api/email/new_dictionary/composeMessages.test.ts
@@ -1,4 +1,4 @@
-import type { IUser, Tables } from '@living-dictionaries/types'
+import type { Tables } from '@living-dictionaries/types'
import { notifyAdminsOnNewDictionary } from './composeMessages'
test('composeAdminNotice returns', () => {
@@ -14,14 +14,13 @@ test('composeAdminNotice returns', () => {
points: [{ coordinates: { latitude: 1, longitude: 2 } }],
},
} as Tables<'dictionaries'>
- const user: IUser = {
- displayName: 'James Johnson',
+ const user = {
email: 'jamesj@gmail.com',
}
- expect(notifyAdminsOnNewDictionary(dictionary, user)).toMatchInlineSnapshot(`
+ expect(notifyAdminsOnNewDictionary(dictionary, user.email)).toMatchInlineSnapshot(`
"Hey Admins,
- James Johnson created a new Living Dictionary named Test-Dictionary. Here's the details:
+ jamesj@gmail.com created a new Living Dictionary named Test-Dictionary. Here's the details:
URL: https://livingdictionaries.app/testID
@@ -40,7 +39,7 @@ test('composeAdminNotice returns', () => {
Author's Connection: "Something about how I know this community and more..."
ConLang Description: "undefined"
- We sent James Johnson an automatic dictionary-info email to jamesj@gmail.com, but you can also get in touch with them if needed.
+ We sent an automatic dictionary-info email to jamesj@gmail.com, but you can also get in touch with them if needed.
Thanks,
Our automatic Vercel Function
diff --git a/packages/site/src/routes/api/email/new_dictionary/composeMessages.ts b/packages/site/src/routes/api/email/new_dictionary/composeMessages.ts
index 94c6bf342..20a9d3efa 100644
--- a/packages/site/src/routes/api/email/new_dictionary/composeMessages.ts
+++ b/packages/site/src/routes/api/email/new_dictionary/composeMessages.ts
@@ -1,9 +1,9 @@
-import type { IUser, Tables } from '@living-dictionaries/types'
+import type { Tables } from '@living-dictionaries/types'
-export function notifyAdminsOnNewDictionary(dictionary: Tables<'dictionaries'>, user: IUser) {
+export function notifyAdminsOnNewDictionary(dictionary: Tables<'dictionaries'>, email: string) {
return `Hey Admins,
- ${user.displayName} created a new Living Dictionary named ${dictionary.name}. Here's the details:
+ ${email} created a new Living Dictionary named ${dictionary.name}. Here's the details:
URL: https://livingdictionaries.app/${dictionary.id}
@@ -26,9 +26,7 @@ export function notifyAdminsOnNewDictionary(dictionary: Tables<'dictionaries'>,
Author's Connection: "${dictionary.author_connection}"
ConLang Description: "${dictionary.con_language_description}"
- We sent ${user.displayName} an automatic dictionary-info email to ${
- user.email
-}, but you can also get in touch with them if needed.
+ We sent an automatic dictionary-info email to ${email}, but you can also get in touch with them if needed.
Thanks,
Our automatic Vercel Function
diff --git a/packages/site/src/routes/api/email/new_dictionary/dictionary-emails.ts b/packages/site/src/routes/api/email/new_dictionary/dictionary-emails.ts
index d912a4373..28847258e 100644
--- a/packages/site/src/routes/api/email/new_dictionary/dictionary-emails.ts
+++ b/packages/site/src/routes/api/email/new_dictionary/dictionary-emails.ts
@@ -1,23 +1,23 @@
-import type { IUser, Tables } from '@living-dictionaries/types'
+import type { Tables } from '@living-dictionaries/types'
import { getAdminRecipients } from '../addresses'
import newDictionary from '../html/newDictionary'
import { send_email } from '../send-email'
import { notifyAdminsOnNewDictionary } from './composeMessages'
-export async function send_dictionary_emails(dictionary: Tables<'dictionaries'>, user: IUser) {
+export async function send_dictionary_emails(dictionary: Tables<'dictionaries'>, email: string) {
try {
await send_email({
- to: [{ email: user.email }],
+ to: [{ email }],
subject: 'New Living Dictionary Created',
type: 'text/html',
body: newDictionary(dictionary.name, dictionary.id),
})
await send_email({
- to: getAdminRecipients(user.email),
+ to: getAdminRecipients(email),
subject: `Living Dictionary created: ${dictionary.name}`,
type: 'text/plain',
- body: notifyAdminsOnNewDictionary(dictionary, user),
+ body: notifyAdminsOnNewDictionary(dictionary, email),
})
} catch (err) {
console.error(`Error with email send request: ${err.message}`)
diff --git a/packages/site/src/routes/api/email/new_user/+server.ts b/packages/site/src/routes/api/email/new_user/+server.ts
index 62f40c317..035bdea81 100644
--- a/packages/site/src/routes/api/email/new_user/+server.ts
+++ b/packages/site/src/routes/api/email/new_user/+server.ts
@@ -1,55 +1,47 @@
import { error, json } from '@sveltejs/kit'
-import type { IUser } from '@living-dictionaries/types'
import { getAdminRecipients } from '../addresses'
import newUserWelcome from '../html/newUserWelcome'
import { send_email } from '../send-email'
-import { save_user_to_supabase } from './save-user-to-supabase'
import type { RequestHandler } from './$types'
import { ResponseCodes } from '$lib/constants'
-import { decodeToken } from '$lib/server/firebase-admin'
-export interface NewUserRequestBody {
- auth_token: string
- user: IUser
+export interface NewUserEmailRequestBody {
+ // language: LanguageCode
}
-export const POST: RequestHandler = async ({ request }) => {
- const { auth_token, user } = await request.json() as NewUserRequestBody
-
- const decodedToken = await decodeToken(auth_token)
- if (!decodedToken?.uid)
- error(ResponseCodes.UNAUTHORIZED, { message: 'Unauthorized' })
- if (user.email !== decodedToken.email)
- error(ResponseCodes.BAD_REQUEST, { message: 'token email does not match user email' })
+export const POST: RequestHandler = async ({ locals: { getSession } }) => {
+ const { data: session_data, error: _error, supabase } = await getSession()
+ if (_error || !session_data?.user)
+ error(ResponseCodes.UNAUTHORIZED, { message: _error.message || 'Unauthorized' })
try {
await send_email({
- to: [{ email: user.email }],
+ to: [{ email: session_data.user.email }],
subject: 'Thank you for creating a Living Dictionaries account!',
type: 'text/html',
body: newUserWelcome,
})
- const supabase_user_id = await save_user_to_supabase(user)
- console.info({ supabase_user_id })
-
await send_email({
- to: getAdminRecipients(decodedToken.email),
- subject: `New Living Dictionaries user: ${user.displayName}`,
+ to: getAdminRecipients(session_data.user.email),
+ subject: `New Living Dictionaries user: ${session_data.user.email}`,
type: 'text/plain',
body: `Hey Admins,
-${user.displayName} has just created a Living Dictionaries account, and we sent an automatic welcome email to ${user.email}
+${session_data.user.email} has just created a Living Dictionaries account, and we sent them an automatic welcome email.
-Thanks,
-Our automatic Vercel Function
+~ Our automatic Vercel Function
https://livingdictionaries.app`,
})
- return json('success')
+ const { error: updating_welcome_email_error } = await supabase.from('user_data').update({ welcome_email_sent: new Date().toISOString() }).eq('id', session_data.user.id)
+ if (updating_welcome_email_error)
+ console.error({ updating_welcome_email_error })
+
+ return json({ result: 'success' })
} catch (err) {
- console.error(`Error with email send request: ${err.message}`)
- error(ResponseCodes.INTERNAL_SERVER_ERROR, `Error with email send request: ${err.message}`)
+ console.error(`Error with welcome email send request: ${err.message}`)
+ error(ResponseCodes.INTERNAL_SERVER_ERROR, `Error with welcome email send request: ${err.message}`)
}
}
diff --git a/packages/site/src/routes/api/email/new_user/_call.ts b/packages/site/src/routes/api/email/new_user/_call.ts
new file mode 100644
index 000000000..cc18aff88
--- /dev/null
+++ b/packages/site/src/routes/api/email/new_user/_call.ts
@@ -0,0 +1,6 @@
+import type { NewUserEmailRequestBody } from './+server'
+import { post_request } from '$lib/helpers/get-post-requests'
+
+export async function api_email_new_user(body: NewUserEmailRequestBody) {
+ return await post_request(`/api/email/new_user`, body)
+}
diff --git a/packages/site/src/routes/api/email/new_user/save-user-to-supabase.ts b/packages/site/src/routes/api/email/new_user/save-user-to-supabase.ts
deleted file mode 100644
index c0bd4bc0a..000000000
--- a/packages/site/src/routes/api/email/new_user/save-user-to-supabase.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import type { GoogleAuthUserMetaData, IUser } from '@living-dictionaries/types'
-import { getAdminSupabaseClient } from '$lib/supabase/admin'
-
-export async function save_user_to_supabase(user: IUser): Promise {
- console.info({ user })
- const adminSupabase = getAdminSupabaseClient()
- const { data, error } = await adminSupabase.auth.admin.createUser({
- email: user.email,
- email_confirm: true,
- app_metadata: { fb_uid: user.uid },
- user_metadata: get_firebase_user_meta_data(user),
- })
- console.info({ data, error })
- return data?.user?.id
-}
-
-function get_firebase_user_meta_data({ displayName, photoURL }: IUser) {
- const metadata: GoogleAuthUserMetaData = {}
- if (displayName)
- metadata.full_name = displayName
- if (photoURL)
- metadata.avatar_url = photoURL
- return metadata
-}
diff --git a/packages/site/src/routes/api/email/otp/+server.ts b/packages/site/src/routes/api/email/otp/+server.ts
new file mode 100644
index 000000000..2136a1420
--- /dev/null
+++ b/packages/site/src/routes/api/email/otp/+server.ts
@@ -0,0 +1,43 @@
+import { error, json } from '@sveltejs/kit'
+import { send_email } from '../send-email'
+import type { RequestHandler } from './$types'
+import { dev } from '$app/environment'
+import { ResponseCodes } from '$lib/constants'
+import { getAdminSupabaseClient } from '$lib/supabase/admin'
+
+export interface OTPEmailRequestBody {
+ email: string
+}
+
+export interface OTPEmailResponseBody {
+ result: 'success'
+ otp?: string
+}
+
+export const POST: RequestHandler = async ({ request }) => {
+ const { email } = await request.json() as OTPEmailRequestBody
+ if (!email)
+ error(ResponseCodes.BAD_REQUEST, 'No email provided')
+
+ const admin_supabase = getAdminSupabaseClient()
+ const { data, error: get_link_error } = await admin_supabase.auth.admin.generateLink({ email, type: 'magiclink' })
+ if (get_link_error)
+ error(500, get_link_error)
+
+ if (dev)
+ return json({ result: 'success', otp: data.properties.email_otp } satisfies OTPEmailResponseBody)
+
+ try {
+ await send_email({
+ to: [{ email }],
+ subject: 'Your One-Time Passcode for Living Dictionaries',
+ body: `${data.properties.email_otp} is your one-time passcode for Living Dictionaries.`,
+ type: 'text/plain',
+ })
+
+ return json({ result: 'success' } satisfies OTPEmailResponseBody)
+ } catch (err) {
+ console.error(`Error with email send request: ${err.message}`)
+ error(ResponseCodes.INTERNAL_SERVER_ERROR, `Error with email send request: ${err.message}`)
+ }
+}
diff --git a/packages/site/src/routes/api/email/otp/_call.ts b/packages/site/src/routes/api/email/otp/_call.ts
new file mode 100644
index 000000000..b5647e5e8
--- /dev/null
+++ b/packages/site/src/routes/api/email/otp/_call.ts
@@ -0,0 +1,6 @@
+import type { OTPEmailRequestBody, OTPEmailResponseBody } from './+server'
+import { post_request } from '$lib/helpers/get-post-requests'
+
+export async function api_email_otp(body: OTPEmailRequestBody) {
+ return await post_request(`/api/email/otp`, body)
+}
diff --git a/packages/site/src/routes/api/email/request_access/+server.ts b/packages/site/src/routes/api/email/request_access/+server.ts
index 5b0139126..13746bf69 100644
--- a/packages/site/src/routes/api/email/request_access/+server.ts
+++ b/packages/site/src/routes/api/email/request_access/+server.ts
@@ -1,11 +1,10 @@
-import type { IHelper, IUser } from '@living-dictionaries/types'
import { error, json } from '@sveltejs/kit'
import { getSupportMessageRecipients } from '../addresses'
import { type Address, send_email } from '../send-email'
import type { RequestHandler } from './$types'
import { dev } from '$app/environment'
-import { getDb } from '$lib/server/firebase-admin'
import { ResponseCodes } from '$lib/constants'
+import { getAdminSupabaseClient } from '$lib/supabase/admin'
export interface RequestAccessBody {
email: string
@@ -16,17 +15,27 @@ export interface RequestAccessBody {
dictionaryName: string
}
-async function getManagerAddresses(dictionaryId: string): Promise {
- const db = getDb()
- const managers = (await db.collection(`dictionaries/${dictionaryId}/managers`).get()).docs.map(doc => doc.data() as IHelper)
- const userPromises = managers.map((manager) => {
- return db.doc(`users/${manager.id}`).get()
- })
- const users = (await Promise.all(userPromises)).map(doc => doc.data() as IUser)
- return users.map((user) => {
+async function get_manager_addresses(dictionary_id: string): Promise {
+ const admin_supabase = getAdminSupabaseClient()
+
+ const { data: managers, error: manager_error } = await admin_supabase.from('dictionary_roles')
+ .select(`
+ dictionary_id,
+ user_id,
+ role,
+ profile:profiles_view (
+ full_name,
+ email
+ )
+ `)
+ .eq('role', 'manager')
+ .eq('dictionary_id', dictionary_id)
+ if (manager_error) throw new Error(manager_error.message)
+
+ return managers.map((manager) => {
return {
- name: user.displayName,
- email: user.email,
+ name: manager.profile.full_name,
+ email: manager.profile.email,
}
})
}
@@ -35,7 +44,7 @@ export const POST: RequestHandler = async ({ request }) => {
try {
const { email, message, name, url, dictionaryId, dictionaryName } = await request.json() as RequestAccessBody
- const managerAddresses = await getManagerAddresses(dictionaryId)
+ const managerAddresses = await get_manager_addresses(dictionaryId)
await send_email({
to: [...getSupportMessageRecipients({ dev }), ...managerAddresses],
reply_to: { email },
diff --git a/packages/site/src/routes/api/email/request_access/_call.ts b/packages/site/src/routes/api/email/request_access/_call.ts
new file mode 100644
index 000000000..4e5a35e02
--- /dev/null
+++ b/packages/site/src/routes/api/email/request_access/_call.ts
@@ -0,0 +1,6 @@
+import type { RequestAccessBody } from './+server'
+import { post_request } from '$lib/helpers/get-post-requests'
+
+export async function api_request_access(body: RequestAccessBody) {
+ return await post_request(`/api/email/request_access`, body)
+}
diff --git a/packages/site/src/routes/api/email/send-email.ts b/packages/site/src/routes/api/email/send-email.ts
index 787df5f9e..de9398739 100644
--- a/packages/site/src/routes/api/email/send-email.ts
+++ b/packages/site/src/routes/api/email/send-email.ts
@@ -1,69 +1,18 @@
+// import { DKIM_PRIVATE_KEY, MAILCHANNELS_API_KEY } from '$env/static/private'
+import { SESClient, SendEmailCommand, type SendEmailCommandOutput } from '@aws-sdk/client-ses'
import { dictionary_address, no_reply_address } from './addresses'
-import { DKIM_PRIVATE_KEY, MAILCHANNELS_API_KEY } from '$env/static/private'
+import { AWS_SES_ACCESS_KEY_ID, AWS_SES_REGION, AWS_SES_SECRET_ACCESS_KEY } from '$env/static/private'
-const MAILCHANNELS_API_URL = 'https://api.mailchannels.net/tx/v1/send'
-
-export async function send_email({ from, to, cc, bcc, reply_to, subject, body, type, dry_run }: EmailParts) {
- if (!MAILCHANNELS_API_KEY)
- throw new Error('MAILCHANNELS_API_KEY env variable not configured')
-
- if (!DKIM_PRIVATE_KEY)
- throw new Error('DKIM_PRIVATE_KEY env variable not configured')
-
- if (to.length + (cc?.length || 0) + (bcc?.length || 0) > 1000)
- throw new Error('Maximum of 1000 recipients allowed')
-
- const mail_channels_send_body: MailChannelsSendBody = {
- personalizations: [{
- to,
- cc: cc || [],
- bcc: bcc || [],
- dkim_domain: 'livingdictionaries.app',
- dkim_selector: 'notification',
- dkim_private_key: DKIM_PRIVATE_KEY,
- }],
- from: from || no_reply_address,
- reply_to: reply_to || dictionary_address,
- subject,
- content: [{
- type,
- value: body,
- }],
- }
-
- const url = dry_run ? `${MAILCHANNELS_API_URL}?dry-run=true` : MAILCHANNELS_API_URL
-
- const response = await fetch(url, {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- 'X-API-Key': MAILCHANNELS_API_KEY,
- },
- body: JSON.stringify(mail_channels_send_body),
- })
-
- // receives status 202 from MailChannels to indicate send pending
- if (!response.status.toString().startsWith('2')) {
- const body = await response.json()
- throw new Error(`MailChannels error: ${response.status} ${body.errors?.[0]}`)
- }
- return response
-}
-
-/** See https://api.mailchannels.net/tx/v1/documentation */
export interface EmailParts {
from?: Address
- /** 1-1000 */
to: Address[]
- /** 0-1000 */
cc?: Address[]
- /** 0-1000 */
bcc?: Address[]
reply_to?: Address
subject: string
body: string
type: 'text/plain' | 'text/html'
- /** Defaults to false, when setting true the message will not be sent. Instead, the fully rendered message is returned from MailChannels. */
+ /** Defaults to false, when setting true the message will not be sent. */
dry_run?: boolean
}
@@ -72,34 +21,89 @@ export interface Address {
name?: string
}
-/** Source https://api.mailchannels.net/tx/v1/documentation */
-interface MailChannelsSendBody {
- subject: string
- content: {
- /** The mime type of the content you are including in your email */
- type: 'text/plain' | 'text/html'
- /** The actual content of the specified mime type that you are including in the message */
- value: string
- }[]
- from: Address
- personalizations: {
- /** 1-1000 */
- to: Address[]
- from?: Address
- reply_to?: Address
- /** 0-1000 */
- cc?: Address[]
- /** 0-1000 */
- bcc?: Address[]
- subject?: string
- /* see https://mailchannels.zendesk.com/hc/en-us/articles/7122849237389-Adding-a-DKIM-Signature */
- dkim_domain: string
- /* Encoded in Base64 */
- dkim_private_key: string
- dkim_selector: string
- headers?: Record // same as other headers
- }[] // (0...1000)
- reply_to?: Address
- /** A JSON object containing key/value pairs of header names and the value to substitute for them. The Key/value pairs must be strings. You must ensure these are properly encoded if they contain unicode characters. Must not be one of the reserved headers (received, dkim-signature, Content-Type, Content-Transfer-Encoding, To, From, Subject, Reply-To, CC, BCC). */
- headers?: Record
+function format_address({ name, email }: Address): string {
+ return name ? `${name} <${email}>` : email
+}
+
+// Rate-limiting variables
+let sent_timestamps: number[] = [] // Tracks timestamps of sent emails
+let sending_promise = Promise.resolve() as unknown as Promise // Ensures sequential sending
+
+export function send_email({ from, to, cc, bcc, reply_to, subject, body, type, dry_run }: EmailParts) {
+ const send_single_email = async (recipient: Address) => {
+ if (dry_run) {
+ console.info('Dry run: email not sent')
+ console.info('From:', format_address(from || no_reply_address))
+ console.info('To:', format_address(recipient))
+ if (cc)
+ console.info('CC:', cc.map(format_address).join(', '))
+ if (bcc)
+ console.info('BCC:', bcc.map(format_address).join(', '))
+ console.info('Reply-To:', format_address(reply_to || dictionary_address))
+ console.info('Subject:', subject)
+ console.info('Body:', body)
+ return { message: 'Dry run completed, email not sent' }
+ }
+
+ // Remove timestamps older than 1 second
+ const now = Date.now()
+ sent_timestamps = sent_timestamps.filter(ts => now - ts < 1000)
+ // If 7 or more emails were sent in the last second, wait
+ if (sent_timestamps.length >= 7) {
+ const [oldest] = sent_timestamps
+ const waitTime = oldest + 1000 - now
+ if (waitTime > 0) {
+ await new Promise(resolve => setTimeout(resolve, waitTime))
+ }
+ }
+
+ if (!AWS_SES_ACCESS_KEY_ID || !AWS_SES_REGION || !AWS_SES_SECRET_ACCESS_KEY) {
+ throw new Error('AWS_SES credentials not configured')
+ }
+
+ const sesClient = new SESClient({
+ region: AWS_SES_REGION,
+ credentials: {
+ accessKeyId: AWS_SES_ACCESS_KEY_ID,
+ secretAccessKey: AWS_SES_SECRET_ACCESS_KEY,
+ },
+ })
+
+ try {
+ const command = new SendEmailCommand({
+ Source: format_address(from || no_reply_address),
+ Destination: {
+ ToAddresses: [format_address(recipient)], // Single recipient per email
+ CcAddresses: cc?.map(format_address) || [],
+ BccAddresses: bcc?.map(format_address) || [],
+ },
+ Message: {
+ Subject: { Data: subject },
+ Body: {
+ [type === 'text/plain' ? 'Text' : 'Html']: { Data: body },
+ },
+ },
+ ReplyToAddresses: [format_address(reply_to || dictionary_address)],
+ })
+
+ const response = await sesClient.send(command)
+ console.info('Email sent successfully to', recipient.email, 'Message ID:', response.MessageId)
+ // Record timestamp after successful send
+ sent_timestamps.push(Date.now())
+ return response
+ } catch (error) {
+ console.error('Error sending email to', recipient.email, ':', error)
+ throw new Error(`Failed to send email to ${recipient.email}: ${error.message}`)
+ }
+ }
+
+ // Chain email sends for all recipients sequentially
+ for (const recipient of to) {
+ sending_promise = sending_promise.then(() => send_single_email(recipient))
+ }
+
+ // Return the promise chain so the caller can await completion
+ return sending_promise
}
diff --git a/packages/site/src/routes/api/gcs_serving_url/+server.ts b/packages/site/src/routes/api/gcs_serving_url/+server.ts
index 1e0f3d855..4de897cbb 100644
--- a/packages/site/src/routes/api/gcs_serving_url/+server.ts
+++ b/packages/site/src/routes/api/gcs_serving_url/+server.ts
@@ -1,11 +1,9 @@
import { error, json } from '@sveltejs/kit'
import type { RequestHandler } from './$types'
import { PROCESS_IMAGE_URL } from '$env/static/private'
-import { decodeToken } from '$lib/server/firebase-admin'
import { ResponseCodes } from '$lib/constants'
export interface GCSServingUrlRequestBody {
- auth_token: string
storage_path: string
}
@@ -13,20 +11,20 @@ export interface GCSServingUrlResponseBody {
serving_url: string
}
-export const POST: RequestHandler = async ({ request, fetch }) => {
+export const POST: RequestHandler = async ({ request, fetch, locals: { getSession } }) => {
if (!PROCESS_IMAGE_URL)
error(ResponseCodes.INTERNAL_SERVER_ERROR, 'Missing PROCESS_IMAGE_URL')
- const { auth_token, storage_path } = await request.json() as GCSServingUrlRequestBody
+ const { data: session_data, error: _error } = await getSession()
+ if (_error || !session_data?.user)
+ error(ResponseCodes.UNAUTHORIZED, { message: _error.message || 'Unauthorized' })
+
+ const { storage_path } = await request.json() as GCSServingUrlRequestBody
if (!storage_path)
error(ResponseCodes.BAD_REQUEST, 'Missing storage_location')
try {
- const decodedToken = await decodeToken(auth_token)
- if (!decodedToken?.uid)
- throw new Error('No user id found in token')
-
const processAndLocationUrl = `${PROCESS_IMAGE_URL}/${storage_path}`
const result = await fetch(processAndLocationUrl)
diff --git a/packages/site/src/routes/api/gcs_serving_url/_call.ts b/packages/site/src/routes/api/gcs_serving_url/_call.ts
index 6db1a0ee2..0825f6dea 100644
--- a/packages/site/src/routes/api/gcs_serving_url/_call.ts
+++ b/packages/site/src/routes/api/gcs_serving_url/_call.ts
@@ -1,11 +1,6 @@
-import { get } from 'svelte/store'
-import { authState } from 'sveltefirets'
import type { GCSServingUrlRequestBody, GCSServingUrlResponseBody } from './+server'
import { post_request } from '$lib/helpers/get-post-requests'
-export async function api_gcs_serving_url(body: Omit) {
- const auth_state_user = get(authState)
- const auth_token = await auth_state_user.getIdToken()
-
- return await post_request(`/api/gcs_serving_url`, { ...body, auth_token })
+export async function api_gcs_serving_url(body: GCSServingUrlRequestBody) {
+ return await post_request(`/api/gcs_serving_url`, body)
}
diff --git a/packages/site/src/routes/api/upload/+server.ts b/packages/site/src/routes/api/upload/+server.ts
index 67a70168c..a573e1727 100644
--- a/packages/site/src/routes/api/upload/+server.ts
+++ b/packages/site/src/routes/api/upload/+server.ts
@@ -1,14 +1,12 @@
import { PutObjectCommand } from '@aws-sdk/client-s3'
import { getSignedUrl } from '@aws-sdk/s3-request-presigner'
-import { error, json } from '@sveltejs/kit'
-import { firebaseConfig } from 'sveltefirets'
+import { type RequestHandler, error, json } from '@sveltejs/kit'
import { check_can_edit } from '$api/db/check-permission'
import { ResponseCodes } from '$lib/constants'
import { GCLOUD_MEDIA_BUCKET_S3 } from '$lib/server/gcloud'
-import { decodeToken } from '$lib/server/firebase-admin'
+import { mode } from '$lib/supabase'
export interface UploadRequestBody {
- auth_token: string
folder: string
dictionary_id: string
file_name: string
@@ -22,18 +20,17 @@ export interface UploadResponseBody {
item_id: string
}
-export async function POST({ request }) {
- try {
- const { auth_token, folder, dictionary_id, file_name, file_type } = await request.json() as UploadRequestBody
-
- if (!auth_token)
- throw new Error('missing auth_token')
+export const POST: RequestHandler = async ({ request, locals: { getSession } }) => {
+ const { data: session_data, error: _error, supabase } = await getSession()
+ if (_error || !session_data?.user)
+ error(ResponseCodes.UNAUTHORIZED, { message: _error.message || 'Unauthorized' })
- const decoded_token = await decodeToken(auth_token)
- if (!decoded_token?.uid)
- throw new Error('No user id found in token')
+ try {
+ const { folder, dictionary_id, file_name, file_type } = await request.json() as UploadRequestBody
- await check_can_edit(decoded_token.uid, dictionary_id)
+ if (!session_data.user.app_metadata.admin) {
+ await check_can_edit(supabase, dictionary_id)
+ }
if (!folder)
throw new Error('Missing folder')
@@ -42,7 +39,7 @@ export async function POST({ request }) {
if (!file_type?.trim())
throw new Error('Missing file_type')
- const bucket = firebaseConfig.storageBucket
+ const bucket = mode === 'development' ? 'talking-dictionaries-dev.appspot.com' : 'talking-dictionaries-alpha.appspot.com'
const extension = file_name.split('.').pop()
const item_id = Date.now().toString()
const object_key = `${folder}/${item_id}.${extension}`
@@ -58,7 +55,7 @@ export async function POST({ request }) {
return json({ presigned_upload_url, bucket, object_key, item_id } satisfies UploadResponseBody)
} catch (err) {
- console.error(`Error creating dictionary: ${err.message}`)
- error(ResponseCodes.INTERNAL_SERVER_ERROR, `Error creating dictionary: ${err.message}`)
+ console.error(`Error uploading: ${err.message}`)
+ error(ResponseCodes.INTERNAL_SERVER_ERROR, `Error uploading: ${err.message}`)
}
}
diff --git a/packages/site/src/routes/api/upload/_call.ts b/packages/site/src/routes/api/upload/_call.ts
index 2eca254c0..d9522aed5 100644
--- a/packages/site/src/routes/api/upload/_call.ts
+++ b/packages/site/src/routes/api/upload/_call.ts
@@ -1,10 +1,6 @@
-import { get } from 'svelte/store'
-import { authState } from 'sveltefirets'
import type { UploadRequestBody, UploadResponseBody } from './+server'
import { post_request } from '$lib/helpers/get-post-requests'
-export async function api_upload(body: Omit) {
- const auth_state_user = get(authState)
- const auth_token = await auth_state_user.getIdToken()
- return await post_request(`/api/upload`, { ...body, auth_token })
+export async function api_upload(body: UploadRequestBody) {
+ return await post_request(`/api/upload`, body)
}
diff --git a/packages/site/src/routes/create-dictionary/+page.svelte b/packages/site/src/routes/create-dictionary/+page.svelte
index 41c9f1add..ce75e45bf 100644
--- a/packages/site/src/routes/create-dictionary/+page.svelte
+++ b/packages/site/src/routes/create-dictionary/+page.svelte
@@ -1,9 +1,17 @@
-
-
{$page.data.t('create.create_new_dictionary')}
-
-
- {$page.data.t('misc.out_of_service')}
-
- {$page.data.t('misc.transmitter')}
-
-
+ {$page.data.t('terms.agree_by_submit')}
+ {$page.data.t('dictionary.terms_of_use')}.
+ | | 
](https://svelte.dev/)
[
](https://kit.svelte.dev/)
[
](https://unocss.dev/integrations/svelte-scoped)
-[
](https://firebase.google.com/)
+[
](https://vercel.com/)
[
](https://www.orama.com/)
[
](https://cloud.google.com/storage)
diff --git a/packages/functions/deleteMediaOnDictionaryDelete.ts b/packages/functions/deleteMediaOnDictionaryDelete.ts
deleted file mode 100644
index 42b7e604d..000000000
--- a/packages/functions/deleteMediaOnDictionaryDelete.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// const bucket = admin.storage().bucket()
-
-// return bucket.deleteFiles({
-// prefix: `${dictionaryId}`,
-// })
diff --git a/packages/functions/interfaceExplanations.ts b/packages/functions/interfaceExplanations.ts
deleted file mode 100644
index d24586576..000000000
--- a/packages/functions/interfaceExplanations.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-export const entryInterface = {
- id:
- 'Unique Entry ID - use this for links to the entry on Living Dictionaries, as well as to compare new imports with previous data',
- lx:
- 'lexeme is the linguistic term meaning the \'headword\' for the dictionary entry - this is the word or phrase in the vernacular language which is being described by all of the other data, being photographed, and recorded',
- gl: {
- en:
- 'English gloss - the word/phrase used in English that is a translation of the lexeme into English',
- es:
- 'Multiple keys can show up in the gloss object - one for each language which the lexemes in this dictionary are being made available in. So for a dictionary that makes words understandable to English and Spanish speakers, you would see a gloss object with \'en\' and \'es\' keys (keys are the bcp codes for languages)',
- },
- in: 'interlinearization',
- lo:
- 'Local/Alternate Orthography - some languages have two writings systems or more, and these fields give opportunity for expressing these alternate writing systems - Look at the optional dictionary.alternateOrthographies object to learn the name of each orthography',
- lo2: 'Local Orthography 2...',
- lo3: 'Local Orthography 3...',
- lo4: 'Local Orthography 4...',
- lo5: 'Local Orthography 5...',
- di: 'dialect',
- ph: 'phonetic pronunciation - usually written in IPA (international phonetic alphabet)',
- ps: 'part of speech abrreviation (see partOfSpeechMappings)',
- sdn: 'array of semantic domain number strings (see semanticDomainNumberMappings)',
- sd: 'semantic domain strings (deprecated)',
- nt: 'notes',
- xv: 'example vernacular',
- xs:
- 'example sentences object formatted in same manner as gl object, except the \'vn\' key refers to the vernacular language',
- mr: 'morphology (of the lexeme)',
- sf: {
- speakerName: 'name of speaker in recorded sound file',
- sp: 'id speaker in recorded sound file',
- ts: 'timestamp of recording',
- audioURL: 'Audio file location',
- },
- pf: {
- imageURL: 'Image file location',
- },
- ca: 'created at',
- ua: 'updated at',
- ei: 'Elicitation Id',
-}
diff --git a/packages/scripts/config-firebase.ts b/packages/scripts/config-firebase.ts
index f9f57d24c..ffa81491e 100644
--- a/packages/scripts/config-firebase.ts
+++ b/packages/scripts/config-firebase.ts
@@ -7,14 +7,14 @@ import { firebase_dev_service_account, firebase_prod_service_account } from './s
import './record-logs'
program
- .option('-e, --environment [dev/prod]', 'Firebase/Supabase Project', 'dev')
+ .option('-fb, --firebase [dev/prod]', 'Firebase Project', 'dev')
.allowUnknownOption() // because config is shared by multiple scripts
.parse(process.argv)
-export const environment = program.opts().environment === 'prod' ? 'prod' : 'dev'
-console.log(`Firebase running on ${environment}`)
+export const firebase_environment = program.opts().firebase === 'prod' ? 'prod' : 'dev'
+console.log(`Firebase running on ${firebase_environment}`)
-const serviceAccount = environment === 'dev' ? firebase_dev_service_account : firebase_prod_service_account
+const serviceAccount = firebase_environment === 'dev' ? firebase_dev_service_account : firebase_prod_service_account
export const projectId = serviceAccount.project_id
initializeApp({
diff --git a/packages/scripts/download-audio.ts b/packages/scripts/download-audio.ts
new file mode 100644
index 000000000..615bc3845
--- /dev/null
+++ b/packages/scripts/download-audio.ts
@@ -0,0 +1,54 @@
+import * as fs from 'node:fs'
+import { pipeline } from 'node:stream/promises'
+import { GetObjectCommand } from '@aws-sdk/client-s3'
+import type { AudioWithSpeakerIds, EntryMainFields, SenseWithSentences } from '@living-dictionaries/types/supabase/entry.interface'
+import { friendlyName } from '@living-dictionaries/site/src/routes/[dictionaryId]/export/friendlyName'
+import { GCLOUD_MEDIA_BUCKET_S3 } from './gcs'
+import { admin_supabase } from './config-supabase'
+
+const directory_path = 'downloaded'
+
+async function download_dictionary_audio(dictionary_id: string) {
+ let entries: {
+ main: EntryMainFields
+ audios?: AudioWithSpeakerIds[]
+ senses?: SenseWithSentences[]
+ }[] = []
+ let offset = 0
+ const limit = 1000
+
+ do {
+ const { data, error } = await admin_supabase.from('materialized_entries_view')
+ .select('id, main, audios, senses')
+ .eq('dictionary_id', dictionary_id)
+ .range(offset, offset + limit - 1)
+
+ if (error) {
+ console.error('Error fetching entries:', error)
+ throw new Error(error.message)
+ }
+
+ entries = entries.concat(data)
+ offset += limit
+ } while (entries.length % limit === 0 && entries.length !== 0)
+
+ const photo_ids = entries.flatMap(({ senses }) => (senses || []).map(({ photo_ids }) => photo_ids).flat()).filter(Boolean) // just for logging
+ const audio_ids = entries.flatMap(({ audios }) => (audios || []).map(({ id }) => id)) // just for logging
+ console.log({ entries_length: entries.length, photo_ids_length: photo_ids.length, audio_ids_length: audio_ids.length })
+
+ for (const entry of entries.splice(0, 200)) {
+ for (const audio of entry.audios || []) {
+ const { Body } = await GCLOUD_MEDIA_BUCKET_S3.send(new GetObjectCommand({
+ Bucket: 'talking-dictionaries-alpha.appspot.com',
+ Key: audio.storage_path,
+ }))
+
+ const friendly_audio_name = friendlyName(entry, audio.storage_path)
+ const filePath = `${directory_path}/${friendly_audio_name}`
+ // @ts-expect-error Body isn't typed as a ReadableStream but it still works
+ await pipeline(Body, fs.createWriteStream(filePath))
+ }
+ }
+}
+
+download_dictionary_audio('babanki')
diff --git a/packages/scripts/gcs.ts b/packages/scripts/gcs.ts
new file mode 100644
index 000000000..819c35a02
--- /dev/null
+++ b/packages/scripts/gcs.ts
@@ -0,0 +1,15 @@
+import { S3Client } from '@aws-sdk/client-s3'
+import { config } from 'dotenv'
+
+config({ path: '../site/.env.production.local' })
+
+const GCLOUD_MEDIA_BUCKET_S3 = new S3Client({
+ region: 'us',
+ endpoint: `https://storage.googleapis.com`,
+ credentials: {
+ accessKeyId: process.env.GCLOUD_MEDIA_BUCKET_ACCESS_KEY_ID!, // Get these by going to Settings in your bucket > Interoperability and creating a Service Account HMAC (may also require creating a new service account)
+ secretAccessKey: process.env.GCLOUD_MEDIA_BUCKET_SECRET_ACCESS_KEY!,
+ },
+})
+
+export { GCLOUD_MEDIA_BUCKET_S3 }
diff --git a/packages/scripts/migrate-to-supabase/editors-info-invites-partners.ts b/packages/scripts/migrate-to-supabase/editors-info-invites-partners.ts
new file mode 100644
index 000000000..f4cb7c6ee
--- /dev/null
+++ b/packages/scripts/migrate-to-supabase/editors-info-invites-partners.ts
@@ -0,0 +1,234 @@
+import { writeFileSync } from 'node:fs'
+import path, { dirname } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import type { IHelper, IInvite } from '@living-dictionaries/types/invite.interface'
+import type { Citation, IAbout, IGrammar, Partner } from '@living-dictionaries/types/dictionary.interface'
+import { db } from '../config-firebase'
+import { admin_supabase, environment, postgres } from '../config-supabase'
+import { reset_local_db } from '../reset-local-db'
+import { sql_file_string } from '../import/to-sql-string'
+import { jacob_ld_user_id } from '../constants'
+import { sync_users_across_and_write_fb_sb_mappings, write_users_to_disk } from './users'
+import { load_fb_to_sb_user_ids } from './get-user-id'
+import { generate_inserts } from './generate-inserts'
+
+migrate_the_rest()
+
+async function migrate_the_rest() {
+ if (environment === 'dev') {
+ await reset_local_db()
+ }
+ // if (environment === 'prod') {
+ // await save_dictionaries()
+ // }
+ await write_users_to_disk() // just do once when testing, and once when final run
+ await sync_users_across_and_write_fb_sb_mappings() // needs run twice, first to sync users, then to save them to disk
+ await sync_users_across_and_write_fb_sb_mappings() // needs run twice, first to sync users, then to save them to disk
+ await load_fb_to_sb_user_ids()
+
+ const dictionaries = await load_saved_dictionaries()
+
+ const fb_managers = await get_managers_by_dictionary_id()
+ const fb_contributors = await get_contributors_by_dictionary_id()
+ const fb_writeInCollaborators = await get_writeInCollaborators_by_dictionary_id()
+ const fb_invites = await get_invites_by_dictionary_id()
+ const fb_partners = await get_partners_by_dictionary_id()
+ const fb_dictionary_infos = await get_info_by_dictionary_id()
+
+ let sql_query = 'BEGIN;' // Start a transaction
+ if (environment === 'dev') {
+ for (const { id, name } of dictionaries) {
+ const dictionary_sql = sql_file_string('dictionaries', { id, name, created_by: jacob_ld_user_id, updated_by: jacob_ld_user_id })
+ sql_query += `${dictionary_sql}\n`
+ }
+ }
+
+ const sql = generate_inserts({
+ dictionary_ids: dictionaries.map(({ id }) => id),
+ fb_managers,
+ fb_contributors,
+ fb_writeInCollaborators,
+ fb_dictionary_infos,
+ fb_invites,
+ fb_partners,
+ })
+ sql_query += `${sql}\n`
+ sql_query += '\nCOMMIT;' // End the transaction
+ try {
+ writeFileSync(`./logs/${Date.now()}_migrate-the-rest-query.sql`, sql_query)
+ console.log('executing sql query')
+ await postgres.execute_query(sql_query)
+ console.log('finished')
+ } catch (err) {
+ console.error(err)
+ await postgres.execute_query('ROLLBACK;') // Rollback the transaction in case of error
+ }
+}
+
+const FOLDER = 'firestore-data'
+const __dirname = dirname(fileURLToPath(import.meta.url))
+
+async function save_dictionaries() {
+ const { data: dictionaries_1 } = await admin_supabase.from('dictionaries')
+ .select('id, name')
+ .order('id', { ascending: true })
+ .range(0, 999)
+ const { data: dictionaries_2 } = await admin_supabase.from('dictionaries')
+ .select('id, name')
+ .order('id', { ascending: true })
+ .range(1000, 1999)
+
+ writeFileSync(path.resolve(__dirname, FOLDER, 'dictionaries.json'), JSON.stringify([...dictionaries_1, ...dictionaries_2], null, 2))
+}
+
+async function load_saved_dictionaries() {
+ const dictionaries = (await import('./firestore-data/dictionaries.json')).default
+ return dictionaries
+}
+
+// get managers using collection group from dictionaries/{dictionary_id}/managers
+async function get_managers_by_dictionary_id() {
+ const fb_managers: Record