Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-18 20:43:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Preparing for major API change, added authorisation param to request

Browse Source
This commit is contained in:
hydrabolt
2015-09-12 16:00:38 +01:00
parent 8b88fd1ea5
commit c4d9405f64
2 changed files with 129 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/Client.js
View File

@@ -148,7 +148,7 @@ var Client = (function () {
self.state = 2; //set state to logged in (not yet ready) self.state = 2; //set state to logged in (not yet ready)
self.token = res.body.token; //set our token self.token = res.body.token; //set our token
getGateway().then(function (url) { self.getGateway().then(function (url) {
self.createws(url); self.createws(url);
callback(null, self.token); callback(null, self.token);
resolve(self.token); resolve(self.token);
@@ -1600,6 +1600,20 @@ var Client = (function () {
})(); })();
} }
} }
}, {
key: "getGateway",
value: function getGateway() {
var self = this;
return new Promise(function (resolve, reject) {
request.get(Endpoints.API + "/gateway").set("authorization", self.token).end(function (err, res) {
if (err) {
reject(err);
} else {
resolve(res.body.url);
}
});
});
}
}, { }, {
key: "uptime", key: "uptime",
get: function get() { get: function get() {
@@ -1668,19 +1682,4 @@ var Client = (function () {
return Client; return Client;
})(); })();
function getGateway() {
var self = this;
return new Promise(function (resolve, reject) {
request.get(Endpoints.API + "/gateway").end(function (err, res) {
if (err) {
reject(err);
} else {
resolve(res.body.url);
}
});
});
}
module.exports = Client; module.exports = Client;

10
src/Client.js
View File

@@ -162,7 +162,7 @@ class Client {
self.state = 2; //set state to logged in (not yet ready) self.state = 2; //set state to logged in (not yet ready)
self.token = res.body.token; //set our token self.token = res.body.token; //set our token
getGateway().then(function (url) { self.getGateway().then(function (url) {
self.createws(url); self.createws(url);
callback(null, self.token); callback(null, self.token);
resolve(self.token); resolve(self.token);
@@ -1360,15 +1360,13 @@ class Client {
} }
} }
} }
}
function getGateway() {
getGateway() {
var self = this; var self = this;
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
request request
.get(`${Endpoints.API}/gateway`) .get(`${Endpoints.API}/gateway`)
.set("authorization", self.token)
.end(function (err, res) { .end(function (err, res) {
if (err) { if (err) {
reject(err); reject(err);
@@ -1377,7 +1375,7 @@ function getGateway() {
} }
}); });
}); });
}
} }
module.exports = Client; module.exports = Client;