Merge pull request #97 from bigcommerce/revert-95-appex-279

Revert "fix(common): APPEX-279 delete all store users on uninstall"

Author: bc-zachary

lib/auth.ts

@@ -84,10 +84,10 @@ export function decodePayload(encodedContext: string) {
     return jwt.verify(encodedContext, JWT_KEY);
 }
 
-// Removes store and storeUsers on uninstall
+// Removes store and storeUser on uninstall
 export async function removeDataStore(session: SessionProps) {
     await db.deleteStore(session);
-    await db.deleteStoreUsers(session);
+    await db.deleteUser(session);
 }
 
 // Removes users from app - getSession() for user will fail after user is removed

lib/dbs/firebase.ts

@@ -1,17 +1,5 @@
 import { initializeApp } from 'firebase/app';
-import {
-    collection,
-    deleteDoc,
-    doc,
-    getDoc,
-    getDocs,
-    getFirestore,
-    query,
-    setDoc,
-    updateDoc,
-    where,
-    writeBatch,
-} from 'firebase/firestore';
+import { deleteDoc, doc, getDoc, getFirestore, setDoc, updateDoc } from 'firebase/firestore';
 import { SessionProps, UserData } from '../../types';
 
 // Firebase config and initialization
@@ -103,20 +91,6 @@ export async function deleteUser({ context, user, sub }: SessionProps) {
     await deleteDoc(ref);
 }
 
-export async function deleteStoreUsers({ context, sub }: SessionProps) {
-    const contextString = context ?? sub;
-    const storeHash = contextString?.split('/')[1] || '';
-    const storeUsersRef = query(collection(db, 'storeUsers'), where('storeHash', '==', storeHash));
-    const storeUsers = await getDocs(storeUsersRef);
-    const batch = writeBatch(db);
-
-    storeUsers.docs.forEach(doc => {
-        batch.delete(doc.ref);
-    });
-
-    await batch.commit();
-}
-
 export async function hasStoreUser(storeHash: string, userId: string) {
     if (!storeHash || !userId) return false;
 
@@ -133,9 +107,7 @@ export async function getStoreToken(storeHash: string) {
     return storeDoc.data()?.accessToken ?? null;
 }
 
-export async function deleteStore({ context, sub }: SessionProps) {
-    const contextString = context ?? sub;
-    const storeHash = contextString?.split('/')[1] || '';
+export async function deleteStore({ store_hash: storeHash }: SessionProps) {
     const ref = doc(db, 'store', storeHash);
 
     await deleteDoc(ref);

lib/dbs/mysql.ts

@@ -71,12 +71,6 @@ export async function deleteUser({ context, user, sub }: SessionProps) {
     await query('DELETE FROM storeUsers WHERE userId = ? AND storeHash = ?', values);
 }
 
-export async function deleteStoreUsers({ context, sub }: SessionProps) {
-    const contextString = context ?? sub;
-    const storeHash = contextString?.split('/')[1] || '';
-    await query('DELETE FROM storeUsers WHERE storeHash = ?', storeHash);
-}
-
 export async function hasStoreUser(storeHash: string, userId: string) {
     if (!storeHash || !userId) return false;
 
@@ -94,8 +88,6 @@ export async function getStoreToken(storeHash: string) {
     return results.length ? results[0].accessToken : null;
 }
 
-export async function deleteStore({ context, sub }: SessionProps) {
-    const contextString = context ?? sub;
-    const storeHash = contextString?.split('/')[1] || '';
+export async function deleteStore({ store_hash: storeHash }: SessionProps) {
     await query('DELETE FROM stores WHERE storeHash = ?', storeHash);
 }

types/db.ts

@@ -20,5 +20,4 @@ export interface Db {
     getStoreToken(storeId: string): string | null;
     deleteStore(session: SessionProps): Promise<void>;
     deleteUser(session: SessionProps): Promise<void>;
-    deleteStoreUsers(session: SessionProps): Promise<void>;
 }