Fix Promise.defer warning in ScalarAuthClient.js

Signed-off-by: Aaron Raimist <aaron@raim.ist>
matrix-org · Oct 2, 2018 · 162ab74 · 162ab74
1 parent 862d67c
commit 162ab74
Showing 1 changed file with 57 additions and 60 deletions.
diff --git a/src/ScalarAuthClient.js b/src/ScalarAuthClient.js
@@ -63,25 +63,24 @@ class ScalarAuthClient {
  validateToken(token) {
  let url = SdkConfig.get().integrations_rest_url + "/account";
 
- const defer = Promise.defer();
- request({
- method: "GET",
- uri: url,
- qs: {scalar_token: token},
- json: true,
- }, (err, response, body) => {
- if (err) {
- defer.reject(err);
- } else if (response.statusCode / 100 !== 2) {
- defer.reject({statusCode: response.statusCode});
- } else if (!body || !body.user_id) {
- defer.reject(new Error("Missing user_id in response"));
- } else {
- defer.resolve(body.user_id);
- }
- });
-
- return defer.promise;
+ return new Promise(function(resolve, reject) {
+ request({
+ method: "GET",
+ uri: url,
+ qs: {scalar_token: token},
+ json: true,
+ }, (err, response, body) => {
+ if (err) {
+ reject(err);
+ } else if (response.statusCode / 100 !== 2) {
+ reject({statusCode: response.statusCode});
+ } else if (!body || !body.user_id) {
+ reject(new Error("Missing user_id in response"));
+ } else {
+ resolve(body.user_id);
+ }
+ });
+ })
  }
 
  registerForToken() {
@@ -96,56 +95,54 @@ class ScalarAuthClient {
  }
 
  exchangeForScalarToken(openid_token_object) {
- const defer = Promise.defer();
-
  const scalar_rest_url = SdkConfig.get().integrations_rest_url;
- request({
- method: 'POST',
- uri: scalar_rest_url+'/register',
- body: openid_token_object,
- json: true,
- }, (err, response, body) => {
- if (err) {
- defer.reject(err);
- } else if (response.statusCode / 100 !== 2) {
- defer.reject({statusCode: response.statusCode});
- } else if (!body || !body.scalar_token) {
- defer.reject(new Error("Missing scalar_token in response"));
- } else {
- defer.resolve(body.scalar_token);
- }
- });
 
- return defer.promise;
+ return new Promise(function(resolve, reject) {
+ request({
+ method: 'POST',
+ uri: scalar_rest_url+'/register',
+ body: openid_token_object,
+ json: true,
+ }, (err, response, body) => {
+ if (err) {
+ reject(err);
+ } else if (response.statusCode / 100 !== 2) {
+ reject({statusCode: response.statusCode});
+ } else if (!body || !body.scalar_token) {
+ reject(new Error("Missing scalar_token in response"));
+ } else {
+ resolve(body.scalar_token);
+ }
+ });
+ })
  }
 
  getScalarPageTitle(url) {
- const defer = Promise.defer();
-
  let scalarPageLookupUrl = SdkConfig.get().integrations_rest_url + '/widgets/title_lookup';
  scalarPageLookupUrl = this.getStarterLink(scalarPageLookupUrl);
  scalarPageLookupUrl += '&curl=' + encodeURIComponent(url);
- request({
- method: 'GET',
- uri: scalarPageLookupUrl,
- json: true,
- }, (err, response, body) => {
- if (err) {
- defer.reject(err);
- } else if (response.statusCode / 100 !== 2) {
- defer.reject({statusCode: response.statusCode});
- } else if (!body) {
- defer.reject(new Error("Missing page title in response"));
- } else {
- let title = "";
- if (body.page_title_cache_item && body.page_title_cache_item.cached_title) {
- title = body.page_title_cache_item.cached_title;
- }
- defer.resolve(title);
- }
- });
 
- return defer.promise;
+ return new Promise(function(resolve, reject) {
+ request({
+ method: 'GET',
+ uri: scalarPageLookupUrl,
+ json: true,
+ }, (err, response, body) => {
+ if (err) {
+ defer.reject(err);
+ } else if (response.statusCode / 100 !== 2) {
+ defer.reject({statusCode: response.statusCode});
+ } else if (!body) {
+ defer.reject(new Error("Missing page title in response"));
+ } else {
+ let title = "";
+ if (body.page_title_cache_item && body.page_title_cache_item.cached_title) {
+ title = body.page_title_cache_item.cached_title;
+ }
+ defer.resolve(title);
+ }
+ });
+ })
  }
 
  /**