Dienstag 16:40

bib-cockpit · Oct 24, 2023 · 568e6ee · 568e6ee
1 parent e818bc6
commit 568e6ee
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 17 deletions.
diff --git a/.github/workflows/server_bib-cockpit-server.yml b/.github/workflows/server_bib-cockpit-server.yml
@@ -26,8 +26,6 @@ jobs:
           npm install
           npm run build --if-present
           npm run copy --if-present
-          npx playwright install --with-deps chromium
-
 
       - name: Zip artifact for deployment
         run: zip release.zip ./* -r -q

diff --git a/src/routes/saveprotokollerouts.ts b/src/routes/saveprotokollerouts.ts
@@ -49,6 +49,8 @@ export class SaveProtokolleroutsClass {
 
     try {
 
+      //           npx playwright install --with-deps chromium
+
       let token;
       let tenantId   = this.Config.TENANT_ID;
       let clientId   = this.Config.CLIENT_APPLICATION_ID;

diff --git a/src/routes/sendprotokollerouts.ts b/src/routes/sendprotokollerouts.ts
@@ -55,10 +55,10 @@ export class SendProtokolleroutsClass {
     try {
 
       let token;
-      let tenantId   = this.Config.TENANT_ID;
-      let clientId   = this.Config.CLIENT_APPLICATION_ID;
-      let endpoint   = this.Config.MICROSOFT_LOGIN_ENDPOINT;
-      let Secret     = this.Config.CLIENT_APPLICATION_SECRET;
+      let tenantId: string;
+      let clientId: string;
+      let endpoint: string;
+      let Secret: string;
       let getdata: any;
       let chunk: any;
       let filebuffer;
@@ -71,7 +71,10 @@ export class SendProtokolleroutsClass {
 
       this.sendprotokolllerouter.put('/', async (req: Request, res: Response) => {
 
-
+        tenantId   = this.Config.TENANT_ID;
+        clientId   = this.Config.CLIENT_APPLICATION_ID;
+        endpoint   = this.Config.MICROSOFT_LOGIN_ENDPOINT;
+        Secret     = this.Config.CLIENT_APPLICATION_SECRET;
         filebuffer = [];
 
         console.log('Send Protokoll');
@@ -111,23 +114,29 @@ export class SendProtokolleroutsClass {
           scopes: ['https://graph.microsoft.com/.default'],
         };
 
-        token = await msalClient.acquireTokenByClientCredential(tokenRequest);
+        try {
+
+          token = await msalClient.acquireTokenByClientCredential(tokenRequest);
 
-        graphClient = Client.init({
+          graphClient = Client.init({
 
-          authProvider: done => {
+            authProvider: done => {
 
-            done(null, token.accessToken);
-          }
-        });
+              done(null, token.accessToken);
+            }
+          });
+        }
+        catch(error) {
+
+          console.error('Tokenerror' + error.message);
+
+          res.status(error.statusCode).send({Error: error.message});
+        }
 
         // Datei laden aus Teams
 
         let Url = '/sites/' + this.Const.BAESiteID + '/drive/items/' + FileID + '/content';
 
-        // let Url = '/groups/' + TeamsID + '/drive/items/' + FileID + '/content';
-        // let Url = '/sites/' + this.Const.BAESiteID + '/drive/items/' + DirectoryID + ':/' + Filename + ':/content';
-
         try {
 
           getdata = await graphClient.api(Url).get();
@@ -139,7 +148,7 @@ export class SendProtokolleroutsClass {
           res.status(error.statusCode).send({Error: error.message});
         }
 
-        if(getdata) {
+        if(getdata && getdata !== null) {
 
           getdata.on('readable', () => {
 
@@ -213,7 +222,13 @@ export class SendProtokolleroutsClass {
               res.status(400).send({ Message: mailerror.message });
             });
           });
+        }
+        else {
+
+          console.error('getdata ist nicht bereit.');
+          console.error('Url: ' + Url);
 
+          res.status(400).send({ Message:  'getdata ist nicht bereit.'});
         }
 
       });

diff --git a/tsconfig.json b/tsconfig.json
@@ -5,6 +5,7 @@
     "sourceMap": true,
     "outDir": "dist-server",
     "esModuleInterop": true,
+    "strictPropertyInitialization": false
   },
   "exclude": [
     "node_modules"