Merge pull request googleapis#151 from JustinBeckwith/updaterequest

enable noImplicitAny

Author: JustinBeckwith

.gitignore

@@ -7,4 +7,5 @@ types/
 docs/
 npm-debug.log
 coverage
-*.js.map
+*.js.map
+yarn-error.log

package.json

@@ -24,7 +24,7 @@
  "jws": "^3.1.4",
  "lodash.isstring": "^4.0.1",
  "lodash.merge": "^4.6.0",
- "request": "^2.74.0"
+ "request": "^2.81.0"
  },
  "devDependencies": {
  "@types/lodash.isstring": "^4.0.2",
@@ -50,10 +50,11 @@
  "source-map-support": "^0.4.14",
  "tslint": "^5.1.0",
  "typedoc": "^0.5.10",
- "typescript": "^2.2.2"
+ "typescript": "^2.3.4"
  },
  "scripts": {
  "check-format": "gulp test.check-format",
+ "format": "gulp format",
  "lint": "tslint --type-check -p tsconfig.json -c tslint.json ts/**/*.ts",
  "mocha": "mocha --reporter spec --timeout 4000 --require source-map-support/register",
  "generate-docs": "typedoc --name 'Google Node.js OAuth 2.0 Client' --out docs --readme README.md ts/lib",

ts/lib/auth/authclient.ts

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+import * as request from 'request';
+
 import {DefaultTransporter, Transporter} from '../transporters';
 
 import Credentials from './credentials';
@@ -26,6 +28,6 @@ abstract class AuthClient {
  * Provides an alternative request
  * implementations with auth credentials.
  */
- public abstract request();
+ public abstract request(): request.Request|void;
 }
 export default AuthClient;

ts/lib/auth/computeclient.ts

@@ -16,8 +16,17 @@
 
 import * as request from 'request';
 
+import {BodyResponseCallback, RequestError} from './../transporters';
 import Auth2Client from './oauth2client';
 
+export interface Token {
+ expires_in: number;
+ expiry_date: number;
+}
+
+export declare type RefreshTokenCallback =
+ (err: Error, token: Token, response: request.RequestResponse) => void;
+
 export default class Compute extends Auth2Client {
  /**
  * Google Compute Engine metadata server token endpoint.
@@ -53,20 +62,22 @@ export default class Compute extends Auth2Client {
  /**
  * Refreshes the access token.
  * @param {object=} ignored_
- * @param {function=} opt_callback Optional callback.
+ * @param {function=} callback Optional callback.
  */
- protected refreshToken(ignored, callback?): request.Request {
+ protected refreshToken(ignored: any, callback?: RefreshTokenCallback):
+ request.Request {
  const uri = this._opts.tokenUrl || Compute._GOOGLE_OAUTH2_TOKEN_URL;
  // request for new token
  return this.transporter.request(
- {method: 'GET', uri: uri, json: true}, (err, tokens, response) => {
- if (!err && tokens && tokens.expires_in) {
- tokens.expiry_date =
- ((new Date()).getTime() + (tokens.expires_in * 1000));
- delete tokens.expires_in;
+ {method: 'GET', uri: uri, json: true}, (err, body, response) => {
+ const token = body as Token;
+ if (!err && token && token.expires_in) {
+ token.expiry_date =
+ ((new Date()).getTime() + (token.expires_in * 1000));
+ delete token.expires_in;
  }
  if (callback) {
- callback(err, tokens, response);
+ callback(err, token, response);
  }
  });
  }
@@ -79,7 +90,9 @@ export default class Compute extends Auth2Client {
  * @param {object} response The HTTP response.
  * @param {Function} callback The callback.
  */
- protected postRequest(err, result, response, callback) {
+ protected postRequest(
+ err: Error, result: any, response: request.RequestResponse,
+ callback: BodyResponseCallback) {
  if (response && response.statusCode) {
  let helpfulMessage = null;
  if (response.statusCode === 403) {
@@ -102,7 +115,7 @@ export default class Compute extends Auth2Client {
  err.message = helpfulMessage;
  } else {
  err = new Error(helpfulMessage);
- err.code = response.statusCode;
+ (err as RequestError).code = response.statusCode;
  }
  }
  }