Refactor Configuration validation to use assertParamExists for apiUrl…

… check
openfga · Oct 2, 2024 · efb2400 · efb2400
1 parent c4a69b2
commit efb2400
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/client.ts b/client.ts
@@ -210,9 +210,6 @@ export class OpenFgaClient extends BaseAPI {
     } else {
       this.configuration = new ClientConfiguration(configuration);
     }
-    const { apiUrl } = this.configuration; 
-    assertParamExists("OpenFgaClient", "apiUrl", apiUrl);
-
     this.configuration.isValid();
     this.api = new OpenFgaApi(this.configuration, axios);
     this.storeId = configuration.storeId;

diff --git a/configuration.ts b/configuration.ts
@@ -186,10 +186,9 @@ export class Configuration {
    * @throws {FgaValidationError}
    */
   public isValid(): boolean {
-    if (!this.apiUrl) {
-      assertParamExists("Configuration", "apiScheme", this.apiScheme);
-      assertParamExists("Configuration", "apiHost", this.apiHost);
-    }
+    if (!this.apiUrl && !this.apiScheme && !this.apiHost) {
+         assertParamExists("Configuration", "apiUrl", this.apiUrl);
+       }
 
     if (!isWellFormedUriString(this.getBasePath())) {
       throw new FgaValidationError(