fix uuid generation and retrieval

Author: GyulyVGC

.gitignore

@@ -7,6 +7,7 @@ token.txt
 app_id.txt
 app_secret.txt
 firewall_defaults.json
+uuid.txt
 .env
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 

client_common/package-lock.json

@@ -23,7 +23,8 @@
   "dependencies": {
     "@grpc/grpc-js": "^1.3.2",
     "@grpc/proto-loader": "^0.6.2",
-    "dotenv": "^16.5.0"
+    "dotenv": "^16.5.0",
+    "uuid": "^11.1.0"
   },
   "husky": {
     "hooks": {

client_common/package.json

@@ -1,6 +1,7 @@
 import {AppGuardService} from "./appguard";
 import {AuthorizationRequest} from "./proto/appguard_commands/AuthorizationRequest";
 import {FirewallDefaults} from "./proto/appguard_commands/FirewallDefaults";
+import { v4 as uuidv4 } from 'uuid';
 
 export const TOKEN_FILE = process.cwd() + '/../token.txt'
 export const APP_ID_FILE = process.cwd() + '/../app_id.txt'
@@ -18,12 +19,13 @@ export class AuthHandler {
     constructor(client: AppGuardService) {
         require('dotenv').config()
 
-        let uuid: string = fs.readFileSync(UUID_FILE, 'utf8');
-        if (!uuid || uuid.trim() === '') {
-            uuid = crypto.randomUUID();
-            fs.writeFileSync(UUID_FILE, uuid, {flag: 'w'});
+        let uuid_exists: boolean = fs.existsSync(UUID_FILE);
+        if (uuid_exists) {
+            this.uuid = fs.readFileSync(UUID_FILE, 'utf8');
+        } else {
+            this.uuid = uuidv4();
+            fs.writeFileSync(UUID_FILE, this.uuid, {flag: 'w'})
         }
-        this.uuid = uuid.trim();
 
         this.installation_code = process.env.INSTALLATION_CODE || ''
         this.client = client

client_common/src/auth.ts

@@ -103,6 +103,7 @@ anymatch@~3.1.2:
     "@grpc/grpc-js" "^1.3.2"
     "@grpc/proto-loader" "^0.6.2"
     dotenv "^16.5.0"
+    uuid "^11.1.0"
 
 array-flatten@1.1.1:
   version "1.1.1"