@eiannone/tesla-api 1.11.0 → 1.12.0

package/TeslaApi.js

@@ -129,46 +129,47 @@ class TeslaApi {
         return this.#apiCall(vid + "/command/" + command, "POST", params);
     }
 
-    // async #oauthCall(params) {
-    //     return new Promise((resolve, reject) => {
-    //         const postData = JSON.stringify(params);
-    //         const req = request(BASE_URL + '/oauth/token', {
-    //             headers: { 
-    //                 'user-agent': "TeslaEma",
-    //                 'Content-Type': 'application/json',
-    //                 'Content-Length': postData.length
-    //             },
-    //             timeout: 30000,
-    //             method: 'POST'
-    //         }, res => {
-    //             if (res.statusCode > 199 && res.statusCode < 300) {
-    //                 res.setEncoding('utf8');
-    //                 let rawData = '';
-    //                 res.on('data', chunk => { rawData += chunk; });
-    //                 res.on('end', () => {
-    //                     try {
-    //                         resolve(JSON.parse(rawData));
-    //                     } catch(err) {
-    //                         reject(new ApiError(err));
-    //                     }
-    //                 });
-    //             } else {
-    //                 let errMsg = res.statusMessage + " ("+res.statusCode+")";
-    //                 reject(new ApiError(errMsg, this.#decodeStatus(res.statusCode)));
-    //             }
-    //         });
-    //         req.on('error', e => {
-    //             // Error code examples:
-    //             // - EAI_AGAIN (DNS lookup timeout)
-    //             // - ECONNRESET
-    //             // - ECONNREFUSED
-    //             // - ENOTFOUND
-    //             reject(new ApiError(e.message + " ("+e.code+")", ApiError.NETWORK));
-    //         });
-    //         req.write(postData);
-    //         req.end();
-    //     });
-    // }
+    async #oauthCall(params, bearer_token) {
+        return new Promise((resolve, reject) => {
+            const postData = JSON.stringify(params);
+            const req = request(BASE_URL + '/oauth/token', {
+                headers: { 
+                    'user-agent': "TeslaEma",
+                    'Authorization': "Bearer " + bearer_token,
+                    'Content-Type': 'application/json',
+                    'Content-Length': postData.length
+                },
+                timeout: 30000,
+                method: 'POST'
+            }, res => {
+                if (res.statusCode > 199 && res.statusCode < 300) {
+                    res.setEncoding('utf8');
+                    let rawData = '';
+                    res.on('data', chunk => { rawData += chunk; });
+                    res.on('end', () => {
+                        try {
+                            resolve(JSON.parse(rawData));
+                        } catch(err) {
+                            reject(new ApiError(err));
+                        }
+                    });
+                } else {
+                    let errMsg = res.statusMessage + " ("+res.statusCode+")";
+                    reject(new ApiError(errMsg, this.#decodeStatus(res.statusCode)));
+                }
+            });
+            req.on('error', e => {
+                // Error code examples:
+                // - EAI_AGAIN (DNS lookup timeout)
+                // - ECONNRESET
+                // - ECONNREFUSED
+                // - ENOTFOUND
+                reject(new ApiError(e.message + " ("+e.code+")", ApiError.NETWORK));
+            });
+            req.write(postData);
+            req.end();
+        });
+    }
 
     async #oauthCall2(params) {
         return new Promise((resolve, reject) => {
@@ -222,30 +223,25 @@ class TeslaApi {
             refresh_token,
             scope: 'openid email offline_access'
         };
-        return this.#oauthCall2(payLoad)
-            .then(async (resp) => {
-                this.token = resp.access_token;
-                this.refresh_token = resp.refresh_token;
-                if (typeof this.cb_refreshToken == 'function') {
-                    this.cb_refreshToken(this.token, this.refresh_token);
-                }
-                return resp;
-            })
-            .catch(error => {
-                if (error instanceof Error) error.message += " - Unable to refresh Token";
-                throw error;
-            });
+        try {
+            let resp = await this.#oauthCall2(payLoad);
+            this.refresh_token = resp.refresh_token;
+            let oauth = await this.#oauthCall({
+                grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
+                client_id: '81527cff06843c8634fdc09e8ac0abefb46ac849f38fe1e431c2ef2106796384',
+                client_secret: 'c7257eb71a564034f9419ee651c7d0e5f7aa6bfbd18bafb5c5c033b093bb2fa3'
+            }, resp.access_token);
+            this.token = oauth.access_token;
+            if (typeof this.cb_refreshToken == 'function') {
+                this.cb_refreshToken(this.token, this.refresh_token);
+            }
+            return oauth;   
+        }
+        catch(error) {
+            if (error instanceof Error) error.message += " - Unable to refresh Token";
+            throw error;            
+        }
     }
-
-    // async getTokens(email, password) {
-    //     return this.#oauthCall({
-    //         'grant_type': "password",
-    //         'email': email,
-    //         'password': password,
-    //         'client_id': "81527cff06843c8634fdc09e8ac0abefb46ac849f38fe1e431c2ef2106796384",
-    //         'client_secret': "c7257eb71a564034f9419ee651c7d0e5f7aa6bfbd18bafb5c5c033b093bb2fa3"
-    //     });
-    // }
 }
 
 export { ApiError, TeslaApi }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eiannone/tesla-api",
-    "version": "1.11.0",
+    "version": "1.12.0",
     "description": "Nodejs Tesla API",
     "type": "module",
     "main": "index.js",