feat update metods

Author: sansan88

functions/src/auth/user.delete.ts

@@ -2,18 +2,18 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable max-len */
-import * as functions from 'firebase-functions/v1';
 import {logger} from 'firebase-functions';
 import {UserRecord} from 'firebase-functions/v1/auth';
 import firebaseDAO from '../firebaseSingleton.js';
+import {EventContext} from 'firebase-functions/v1';
 
 const db = firebaseDAO.instance.db;
 const storage = firebaseDAO.instance.storage;
-const admin = firebaseDAO.instance.auth;
+const auth = firebaseDAO.instance.auth;
 
 // SEND BYE FirestoreEvent
-export async function authUserDeleteUserSendByEmail(user: UserRecord, context: functions.EventContext) {
-  return admin.firestore().collection('mail').add({
+export async function authUserDeleteUserSendByEmail(user: UserRecord, context: EventContext) {
+  return db.collection('mail').add({
     to: user.email,
     template: {
       name: 'UserDeleteEmail',
@@ -24,11 +24,11 @@ export async function authUserDeleteUserSendByEmail(user: UserRecord, context: f
   });
 }
 
-export async function authUserDeleteUserAccount(user: UserRecord, context: functions.EventContext) {
+export async function authUserDeleteUserAccount(user: UserRecord, context: EventContext) {
   logger.info('delete user cleanup functions to delete user media, revoke refresh token for: ' + user.uid);
 
   // force logout in app
-  await admin.auth().revokeRefreshTokens(user.uid).catch((error: any)=>{
+  await auth.revokeRefreshTokens(user.uid).catch((error: any)=>{
     logger.info(`error revokeRefreshTokens -> most likely already done by deleting user, ${error}`);
   });
 
@@ -135,7 +135,7 @@ export async function authUserDeleteUserAccount(user: UserRecord, context: funct
   await db.collection('userProfile').doc(user.uid).delete();
 
   // Delete account in firebase --> Should be done already
-  return admin.auth().deleteUser(user.uid).catch((error: any)=> {
+  return auth.deleteUser(user.uid).catch((error: any)=> {
     logger.info(`error deleting user -> most likely already done, ${error}`);
   });
 }

functions/src/index.ts

@@ -47,7 +47,7 @@ import graphqlServer from './graphql/server.js';
 
 import {onDocumentUpdated, onDocumentDeleted, onDocumentCreated} from 'firebase-functions/v2/firestore';
 
-import {beforeUserSignedIn, beforeUserCreated} from 'firebase-functions/v2/identity';
+import {beforeUserCreated} from 'firebase-functions/v2/identity';
 
 import {onSchedule} from 'firebase-functions/v2/scheduler';
 
@@ -85,12 +85,11 @@ export const deleteUserAccount = functions.auth.user().onDelete(authUserDeleteUs
   };
 });*/
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any
-export const beforeSignIn = beforeUserSignedIn((_event): any => {
+/* export const beforeSignIn = beforeUserSignedIn((_event): any => {
   return {
     allow: true,
   };
-});
+}); */
 
 // GRAPHQL API -> Updated to 2nd gen
 export const api = onRequest({