@progressive-development/pd-spa-helper 0.1.164 → 0.1.166

package/package.json

@@ -3,7 +3,7 @@
   "description": "Webcomponent pd-spa-helper following open-wc recommendations",
   "license": "MIT",
   "author": "pd-spa-helper",
-  "version": "0.1.164",
+  "version": "0.1.166",
   "main": "dist/src/index.js",
   "module": "dist/src/index.js",
   "exports": {

package/src/PdSpaHelper.ts

@@ -90,6 +90,8 @@ const transformRoutes = () => {
  */
 export const startInit = (config: AppConfiguration) => {
 
+  console.log("Start init for config: ", config);
+
   // set service provider
   setServiceProvider(config.serviceProvider);
   
@@ -101,6 +103,7 @@ export const startInit = (config: AppConfiguration) => {
   // init app
   initAppImpl(config);
 
+  // add login route if set in config
   if (config.navigationConfigParam.includeLogin) {
     config.navigationConfigParam.pages.push({
       name: "login",
@@ -110,15 +113,16 @@ export const startInit = (config: AppConfiguration) => {
       pattern: ["login"],
       auth: false
     });
-
-    // init ready, trigger by even (if getAuth is called before, error is thrown)    
-    document.dispatchEvent(new CustomEvent("init-app-event"));
-    console.log("Init done, Event created");
   }
 
   // generate routes from navigation config
   navigationConfig = config.navigationConfigParam;
   transformedRoutes = transformRoutes();    
+
+  // init ready, trigger by even (if getAuth is called before, error is thrown)    
+  document.dispatchEvent(new CustomEvent("init-app-event"));
+  console.log("Init done, Event created");
+
 };
 
 const TOP_MENU_HEIGHT = 50;

package/src/index.ts

@@ -32,7 +32,8 @@ export {
   logoutImpl,
   isAuthenticatedImpl,
   callFunctionImpl,
-  uploadFile
+  uploadFile,
+  getStorageFileList
 } from './service-provider/service-provider-impl.js'
 
 export { pdStore } from './store/mini-rx.store.js';

package/src/service-provider/firebase/auth.ts

@@ -1,7 +1,22 @@
-import { getAuth, onAuthStateChanged, signInWithEmailAndPassword, signOut, User } from 'firebase/auth';
+import { FirebaseApp } from 'firebase/app';
+import { Auth, getAuth, onAuthStateChanged, signInWithEmailAndPassword, signOut, User } from 'firebase/auth';
+
+let auth: Auth;
+
+/**
+ * During start/load application, initialize functions.  
+ * 
+ * @param {*} app - initialized app. 
+ */
+export const initAuth = (appParam: FirebaseApp) => {
+  auth = getAuth(appParam);
+  console.log("App for auth is set: ", auth);
+}
 
 export const logout = async (): Promise<boolean> => {
-  const auth = getAuth();
+  if (!auth) {
+    throw new Error("logout: Auth was not initialized");
+  }
   try {
     await signOut(auth);
     return true;
@@ -10,12 +25,21 @@ export const logout = async (): Promise<boolean> => {
   }
 };
 
-export const isAuthenticated = (): boolean =>  
-  getAuth().currentUser !== null;
+export const isAuthenticated = (): boolean => {
+  if (!auth) {
+    throw new Error("isAuthenticated: Auth was not initialized");
+  }
+  const authCheck = auth.currentUser !== null;
+  console.log("Check auth: ", authCheck);
+  return authCheck;
+};
 
 
-export const authStateChanged = (callback: Function) => {
-  onAuthStateChanged(getAuth(), (user) => callback(user));        
+export const authStateChanged = (callback: Function) => {  
+  if (!auth) {
+    throw new Error("authStateChanged: Auth was not initialized");
+  }
+  onAuthStateChanged(auth, (user) => callback(user));        
   /* Alter code aus init in pd-spa-helper, hier falsch, noch refactorieren   
   if (user) {
     this._user = user;
@@ -44,9 +68,11 @@ export const authStateChanged = (callback: Function) => {
   }
   */
 }
-    
+
 export const login = async (user:string, sec:string): Promise<User> => {
-  const auth = getAuth();      
+  if (!auth) {
+    throw new Error("login: Auth was not initialized");
+  }
   const credentials = await signInWithEmailAndPassword(auth, user, sec);
-  return credentials.user;   
+  return credentials.user;
 }

package/src/service-provider/firebase/firestorage-client.ts

@@ -1,7 +1,7 @@
 import { FirebaseApp } from 'firebase/app';
-import { FirebaseStorage, StorageReference, UploadResult, getStorage, ref, uploadString } from "firebase/storage";
+import { FirebaseStorage, StorageReference, UploadResult, getStorage, listAll, ref, uploadString } from "firebase/storage";
 
-import { FileStorageConfig, UploadFile } from '../service-provider-model.js';
+import { FileStorageConfig, StorageDocument, UploadFile } from '../service-provider-model.js';
 
 const DEFAULT_STORAGE = "default_storage";
 
@@ -89,6 +89,58 @@ export const uploadFirestorageFile = (file: UploadFile):Promise<UploadResult> =>
   return uploadString(fileRef, file.base64DataURL, 'data_url', metadata);
 };
 
+export const getFirestorageFileList = (storageName: string, refKey: string):Promise<StorageDocument[]> => {  
+
+  if (!storageMap || storageMap.size === 0) {
+    throw new Error("No storage is configured");
+  }  
+
+  // get storage  
+  const storageConf = storageMap.get(storageName);
+  if (!storageConf ) {
+    throw new Error(`Invalid storage name: ${storageName}`);
+  }  
+  if (!storageConf.references || storageConf.references.length === 0) {
+    throw new Error(`No references configured for storage: ${storageName || DEFAULT_STORAGE}`);
+  }
+
+  // get refrence
+  const storageRef = storageConf.references.filter(refIt => refIt.key === refKey)[0];
+      
+  const itemRefs: StorageDocument[] = [];
+  return listAll(storageRef.storageRef)
+    .then((res) => {
+      res.items.forEach((itemRef) => {
+        // All the items under listRef.
+        itemRefs.push({
+          fileName: itemRef.name,
+          filePath: itemRef.fullPath,
+          documentType: "ToDo",
+          // description: "ToDo Some Description",
+          // creator: "ToDo",
+          // creation: new Date(),
+        });
+      });
+
+      // MetaData for each item with own promise
+      /*
+      // Get metadata properties
+      getMetadata(forestRef)
+        .then((metadata) => {
+          // Metadata now contains the metadata for 'images/forest.jpg'
+        }).catch((error) => {
+          // Uh-oh, an error occurred!
+        });
+      */
+      return itemRefs;
+    }).catch((error) => {
+      // TODO: add error handling
+      console.log("Error during file list", error);
+      throw error;
+    });
+
+};
+
 
 /* Firestorage Error List: https://firebase.google.com/docs/storage/web/handle-errors */
 /* 

package/src/service-provider/mock/storage-client.ts

@@ -1,4 +1,4 @@
-import { FileStorageConfig, UploadFile } from '../service-provider-model.js';
+import { FileStorageConfig, StorageDocument, UploadFile } from '../service-provider-model.js';
 
 
 const DEFAULT_STORAGE = "default_storage";
@@ -124,4 +124,15 @@ export const uploadStorageFileMock = (file: UploadFile):Promise<any> => {
   return storageConf.storage.uploadFile(fileRef, file);
 };
 
+export const getMockFileList = (storageName: string, keyRef: string):Promise<StorageDocument[]> => {
+  console.log("Searching for Documents in ", storageName, keyRef);
+  return Promise.resolve([{
+    fileName: "workReport.png",
+    filePath: "workReports/1234234f2fswf/workReport.png",
+    documentType: "ToDo",
+  }]);
+};
+
+
+
 

package/src/service-provider/service-provider-impl.ts

@@ -1,14 +1,14 @@
 import { FirebaseApp, FirebaseOptions, initializeApp } from "firebase/app";
 
-import { authStateChanged, isAuthenticated, login, logout } from "./firebase/auth.js";
+import { authStateChanged, initAuth, isAuthenticated, login, logout } from "./firebase/auth.js";
 import { authStateChangedMock, isAuthenticatedMock, loginMock, logoutMock } from "./mock/auth.js";
-import { AppConfiguration, FileStorageConfig, FunctionDefinition, FunctionResult, FunctionsConfig, ServiceProviderConfiguration, UploadFile } from "./service-provider-model.js";
+import { AppConfiguration, FileStorageConfig, FunctionDefinition, FunctionResult, FunctionsConfig, ServiceProviderConfiguration, StorageDocument, UploadFile } from "./service-provider-model.js";
 import { callFunction, initFunctions } from "./firebase/functions-client.js";
 import { initFirestore } from "./firebase/firestore-client.js";
 import { callFunctionMock, initMockResponse } from "./mock/function-client.js";
 import { ServiceCallController } from "../service-call-controller2.js";
-import { initFirestorage, uploadFirestorageFile } from "./firebase/firestorage-client.js";
-import { initStorageMock, uploadStorageFileMock } from "./mock/storage-client.js";
+import { getFirestorageFileList, initFirestorage, uploadFirestorageFile } from "./firebase/firestorage-client.js";
+import { getMockFileList, initStorageMock, uploadStorageFileMock } from "./mock/storage-client.js";
 
 let provider: ServiceProviderConfiguration | undefined;
 let controller: ServiceCallController;
@@ -36,10 +36,12 @@ const initFirebaseApplicationServices = (
   storageConfig?: FileStorageConfig, 
 ) => {
   // do something with the app, init db, firestore and functions    
+  initAuth(firebaseApp);
   initFunctions(firebaseApp, functionsConfig);
   initFirestore(firebaseApp);  
   initFirestorage(firebaseApp, firebaseConfig.storageBucket, storageConfig);
-  
+
+  console.log("Firebase App with functions, firestore and firestorage initialized");  
 }
 
 export const initAppImpl = (config: AppConfiguration) => {
@@ -153,4 +155,14 @@ export const uploadFile = (file: UploadFile): Promise<unknown> => {
     return uploadStorageFileMock(file)
   }
   return throwUndefinedProviderError();  
+}
+
+export const getStorageFileList = (storageName: string, keyRef: string): Promise<StorageDocument[]> => {  
+  if (provider === "firebase") {
+    return getFirestorageFileList(storageName, keyRef);
+  }
+  if (provider === "mock") {
+    return getMockFileList(storageName, keyRef);
+  }
+  return throwUndefinedProviderError();  
 }

package/src/service-provider/service-provider-model.ts

@@ -127,4 +127,11 @@ export interface UploadFile {
   subFolderName?: string,
 }
 
-
+export interface StorageDocument {
+  fileName: string,
+  documentType: string,
+  filePath: string,
+  description?:string,  
+  creation?:Date,
+  creator?:string,
+}