Implement TokenError

Author: nicokaiser

.gitignore

@@ -1 +1,2 @@
 node_modules/
+package-lock.json

lib/errors/tokenerror.js

@@ -0,0 +1,19 @@
+class TokenError extends Error {
+    /**
+     * @param {string} [message]
+     * @param {string} [code]
+     * @param {string} [uri]
+     * @param {number} [status]
+     */
+    constructor(message, code, uri, status) {
+        super(message);
+        Error.captureStackTrace(this, this.constructor);
+        this.name = 'TokenError';
+        this.message = message;
+        this.code = code || 'invalid_request';
+        this.uri = uri;
+        this.status = status || 500;
+    }
+}
+
+module.exports = TokenError;

lib/strategy.js

@@ -8,6 +8,7 @@ const jwt = require('jsonwebtoken');
 const NullStateStore = require('./state/null');
 const SessionStateStore = require('./state/session');
 const AuthorizationError = require('./errors/authorizationerror');
+const TokenError = require('./errors/tokenerror');
 const InternalOAuthError = require('./errors/internaloautherror');
 
 class AppleStrategy extends passport.Strategy {
@@ -87,7 +88,7 @@ class AppleStrategy extends passport.Strategy {
                     const oauth2 = this._getOAuth2Client();
 
                     oauth2.getOAuthAccessToken(code, params, (err, accessToken, refreshToken, params) => {
-                        if (err) return this.error(new InternalOAuthError('Failed to obtain access token', err));
+                        if (err) return this.error(this._createOAuthError('Failed to obtain access token', err));
 
                         const idToken = params['id_token'];
                         if (!idToken) return this.error(new Error('ID Token not present in token response'));
@@ -179,6 +180,21 @@ class AppleStrategy extends passport.Strategy {
         }
     }
 
+    /**
+     * @param {string} body
+     * @returns {Error}
+     */
+    parseErrorResponse(body) {
+        const json = JSON.parse(body);
+        if (json.error) {
+            return new TokenError(json.error_description, json.error, json.error_uri);
+        }
+        return null;
+    }
+
+    /**
+     * @returns {oauth2.OAuth2}
+     */
     _getOAuth2Client() {
         const clientSecret = jwt.sign({}, this._key, {
             algorithm: 'ES256',
@@ -191,6 +207,24 @@ class AppleStrategy extends passport.Strategy {
 
         return new OAuth2(this._clientID, clientSecret, '', this._authorizationURL, this._tokenURL);
     }
+
+    /**
+     * @param {string} message
+     * @param {object|Error} err
+     * @returns {Error}
+     */
+    _createOAuthError(message, err) {
+        let e;
+        if (err.statusCode && err.data) {
+            try {
+                e = this.parseErrorResponse(err.data);
+            } catch (_) {
+                // ignore
+            }
+        }
+        if (!e) e = new InternalOAuthError(message, err);
+        return e;
+    }
 }
 
 module.exports = AppleStrategy;