Merge branch 'alpha'

karnthis · Nov 24, 2019 · de1053c · de1053c
2 parents 9b0ae02 + 11940de
commit de1053c
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 51 deletions.
diff --git a/classes/Authenticate.js b/classes/Authenticate.js
@@ -28,13 +28,16 @@ module.exports = class Authenticate extends Core {
     }
   }
 
-  buildRequestURL(scopes = []) {
+  buildRequestURL(scopes = [], state = '') {
     const useScope = (this.masterScopes.length > 0) ? this.masterScopes : scopes
+    if (state.includes('&')) console.error(`Request URL state: Must not contain '&' symbol. Sanitizing...`)
     if (useScope.length == 0) throw new Error('must have at least 1 scope selected')
     return [`https://login.eveonline.com/oauth/authorize/?response_type=code`,
-    `redirect_uri=${encodeURI(this.callbackURL)}`,
-    `client_id=${this.clientID}`,
-    `scope=${useScope.join(' ')}`].join('&')
+      `redirect_uri=${encodeURI(this.callbackURL)}`,
+      `client_id=${this.clientID}`,
+      `scope=${useScope.join(' ')}`,
+      `state=${state.replace(/&/g, '')}`
+    ].join('&')
   }
   async setScope(scopes = []) {
     if (scopes == 'all') {

diff --git a/classes/Market.js b/classes/Market.js
@@ -1,31 +1,31 @@
 const Core = require('../libs/Core')
 
-const basePath = 'ddd'
+const basePath = 'markets'
 
-module.exports = class ddd extends Core {
+module.exports = class Market extends Core {
   constructor(cfg = {}) {
     /* cfg == { base, ver, src, agent, db, clientID, clientSecret } */
     super(cfg)
   }
 
   // PUBLIC
-  marketHistory(region_id) {
-    return this._makePublicGet(`markets/${region_id}/history/`)
+  history(region_id) {
+    return this._makePublicGet(`${basePath}/${region_id}/history/`)
   }
-  marketOrders(region_id) {
-    return this._makePublicGet(`markets/${region_id}/orders/`)
+  orders(region_id, extras) {
+    return this._makePublicGet(`${basePath}/${region_id}/orders/`, extras)
   }
-  marketTypes(region_id) {
-    return this._makePublicGet(`markets/${region_id}/types/`)
+  types(region_id) {
+    return this._makePublicGet(`${basePath}/${region_id}/types/`)
   }
-  marketGroups() {
-    return this._makePublicGet(`markets/groups/`)
+  groups() {
+    return this._makePublicGet(`${basePath}/groups/`)
   }
-  marketGroup(market_group_id) {
-    return this._makePublicGet(`markets/groups/${market_group_id}/`)
+  group(market_group_id) {
+    return this._makePublicGet(`${basePath}/groups/${market_group_id}/`)
   }
-  marketPrices() {
-    return this._makePublicGet(`markets/prices/`)
+  prices() {
+    return this._makePublicGet(`${basePath}/prices/`)
   }
 
   // RESTRICTED

diff --git a/libs/Core.js b/libs/Core.js
@@ -28,8 +28,8 @@ module.exports = class Core {
   }
 
   // **** FUNCTIONS **** \\
-  _makePublicGet(path) {
-    return basicGet(path, this.dataPack)
+  _makePublicGet(path, extras) {
+    return (extras) ? basicGet(path, extras, this.dataPack) : basicGet(path, this.dataPack)
   }
   _makePublicPost(path, payload) {
     const options = {

diff --git a/libs/Requests.js b/libs/Requests.js
@@ -4,14 +4,15 @@ const { URL } = require('./Validate')
 
 module.exports = {
 
-  basicGet(path, data) {
+  basicGet(path, extras = [], data) {
     const options = {
       method: 'GET',
       headers: {
         'User-Agent': data.userAgent
       }
     }
-    const url = `${data.urlPt1}${cleanURL(path)}${data.urlPt2}`
+    const partUrl = `${data.urlPt1}${cleanURL(path)}${data.urlPt2}`
+    const url = [partUrl, ...extras].join('&')
     return allRequest(url, options)
   },
   sendPathRequest(path, options = {}, data, payload = '') {
@@ -27,30 +28,7 @@ module.exports = {
   },
   sendTokenRequest(url, options = {}) {
     return allRequest(url, options)
-  }
-
-
-  // getRequest(url, options) {
-  //   return new Promise((resolve, reject) => {
-  //     if (URL(url)) {
-  //       console.log(url)
-  //       get(url, options, (res) => {
-  //         res.setEncoding('utf8');
-  //         let body = ''
-  //         const status = res.statusCode
-  //         res.on('data', (data) => {
-  //           body += data
-  //         })
-  //         return res.on('end', () => {
-  //           body = JSON.parse(body)
-  //           resolve({ body, status })
-  //         })
-  //       })
-  //     } else reject(new Error('invalid url'))
-  //   })
-  // },
-
-
+  }  
 }
 
 function cleanURL(s) {
@@ -81,7 +59,7 @@ function allRequest(url, options, payload) {
         res.on('end', () => {
           // console.dir(resBody)
           resolve({
-            body: JSON.parse(resBody.join()),
+            body: JSON.parse(resBody.join('')),
             status
           })
         })

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "esiio",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Single dependency library for EVE Online's ESI",
   "main": "index.js",
   "scripts": {
@@ -16,7 +16,7 @@
     "eve online",
     "ESI"
   ],
-  "author": "Erin Rivas <contact@atomicbear.com>",
+  "author": "Erin Rivas <me@erinrivas.com>",
   "homepage": "https://github.com/karnthis/make-random#readme",
 	"bugs": "https://github.com/karnthis/make-random/issues",
   "license": "MIT",

diff --git a/readme.md b/readme.md
@@ -24,8 +24,11 @@ const Auth = new Authenticate(
   }
 )
 
-const Char = new Character(auth.share())
+const Char = new Character(Auth.share())
 // use Char in Express route or directly
+Char.corpHistory(92014574)
+.then(resp => console.log(resp.body))
+.catch(err => console.error(err))
 ```
 
 ## Supported Routes