fix: Make caching class return undefined if property does not exist (#…

…247)

* Make these optional items return undefined if they do not exist

src/Config/OssIndexServerConfig.spec.ts

@@ -38,4 +38,18 @@ describe('OssIndexServerConfig', async () => {
     mock.restore();
     sinon.restore();
   });
+
+  it('should return undefined when property does not exist', async () => {
+    sinon.stub(os, 'homedir').returns('/nonsense');
+    mock({ '/nonsense': {} });
+
+    const conf = new OssIndexServerConfig();
+
+    expect(conf.getUsername()).to.equal(undefined);
+    expect(conf.getToken()).to.equal(undefined);
+    expect(conf.getCacheLocation()).to.equal(undefined);
+
+    mock.restore();
+    sinon.restore();
+  });
 });

src/Config/OssIndexServerConfig.ts

@@ -27,16 +27,25 @@ export class OssIndexServerConfig extends Config {
     }
   }
 
-  public getUsername(): string {
-    return this.username;
+  public getUsername(): string | undefined {
+    if (this.username != '') {
+      return this.username;
+    }
+    return undefined;
   }
 
-  public getToken(): string {
-    return this.token;
+  public getToken(): string | undefined {
+    if (this.token != '') {
+      return this.token;
+    }
+    return undefined;
   }
 
-  public getCacheLocation(): string {
-    return this.cacheLocation;
+  public getCacheLocation(): string | undefined {
+    if (this.cacheLocation != '') {
+      return this.cacheLocation;
+    }
+    return undefined;
   }
 
   public async clearCache(): Promise<boolean> {
@@ -53,9 +62,13 @@ export class OssIndexServerConfig extends Config {
 
   public getConfigFromFile(saveLocation: string = this.getConfigLocation()): OssIndexServerConfig {
     const doc = safeLoad(readFileSync(saveLocation, 'utf8')) as OssIndexServerConfigOnDisk;
-    if (doc && doc.Username && doc.Token && doc.CacheLocation) {
+    if (doc && doc.Username) {
       this.username = doc.Username;
+    }
+    if (doc && doc.Token) {
       this.token = doc.Token;
+    }
+    if (doc && doc.CacheLocation) {
       this.cacheLocation = doc.CacheLocation;
     }