caprover-api 0.0.12 → 0.0.14

package/dist/api/ApiManager.d.ts

@@ -42,10 +42,11 @@ export declare class SimpleAuthenticationProvider implements AuthenticationProvi
     onAuthTokenUpdated(newAuthToken: string): void;
 }
 export default class ApiManager {
+    private authProvider;
     private http;
     constructor(baseDomain: string, authProvider: AuthenticationProvider);
     destroy(): void;
-    login(password: string, otpToken?: string): Promise<string>;
+    login(password: string, otpToken?: string): Promise<void>;
     getAllThemes(): Promise<{
         themes: CapRoverTheme[] | undefined;
     }>;

package/dist/api/ApiManager.js

@@ -23,6 +23,7 @@ class SimpleAuthenticationProvider {
 exports.SimpleAuthenticationProvider = SimpleAuthenticationProvider;
 class ApiManager {
     constructor(baseDomain, authProvider) {
+        this.authProvider = authProvider;
         const self = this;
         const URL = baseDomain + '/api/v2';
         this.http = new HttpClient_1.default(URL, () => {
@@ -34,9 +35,6 @@ class ApiManager {
             })
                 .then((authContent) => {
                 return self.login(authContent.password, authContent.otpToken);
-            }) //
-                .then((authToken) => {
-                authProvider.onAuthTokenUpdated(authToken);
             });
         });
     }
@@ -56,6 +54,9 @@ class ApiManager {
         })
             .then(function (data) {
             return data.token;
+        })
+            .then((authToken) => {
+            self.authProvider.onAuthTokenUpdated(authToken);
         });
     }
     getAllThemes() {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "caprover-api",
-    "version": "0.0.12",
+    "version": "0.0.14",
     "description": "API client for CapRover",
     "types": "dist/index.d.ts",
     "main": "dist/index.js",

package/src/api/ApiManager.ts

@@ -65,7 +65,10 @@ export class SimpleAuthenticationProvider implements AuthenticationProvider {
 export default class ApiManager {
     private http: HttpClient
 
-    constructor(baseDomain: string, authProvider: AuthenticationProvider) {
+    constructor(
+        baseDomain: string,
+        private authProvider: AuthenticationProvider
+    ) {
         const self = this
         const URL = baseDomain + '/api/v2'
         this.http = new HttpClient(
@@ -83,9 +86,6 @@ export default class ApiManager {
                             authContent.password,
                             authContent.otpToken
                         )
-                    }) //
-                    .then((authToken) => {
-                        authProvider.onAuthTokenUpdated(authToken)
                     })
             }
         )
@@ -95,7 +95,7 @@ export default class ApiManager {
         this.http.destroy()
     }
 
-    login(password: string, otpToken?: string): Promise<string> {
+    login(password: string, otpToken?: string): Promise<void> {
         const self = this
         const http = self.http
 
@@ -112,6 +112,9 @@ export default class ApiManager {
             .then(function (data) {
                 return data.token
             })
+            .then((authToken) => {
+                self.authProvider.onAuthTokenUpdated(authToken)
+            })
     }
 
     getAllThemes(): Promise<{ themes: CapRoverTheme[] | undefined }> {