fix: corrections to handleHttp and handleUnverified (#259)

Author: bflorian

lib/smart-app.js

@@ -402,19 +402,22 @@ class SmartApp {
 	 * @param {*} response
 	 */
 	async handleHttpCallback(request, response) {
-		if (request.body && request.body.lifecycle === 'PING') {
-			return this._handleCallback(request.body, responders.httpResponder(response, this._log))
+		const { body, originalUrl } = request
+
+		if (body && body.lifecycle === 'PING') {
+			return this._handleCallback(body, responders.httpResponder(response, this._log))
 		}
 
 		// Work-around to issue with http-signature
 		// See also: https://github.com/joyent/node-http-signature/issues/87
-		if (request.originalUrl) {
-			request.url = request.originalUrl
+		if (originalUrl) {
+			const queryPos = originalUrl.indexOf('?')
+			request.url = queryPos < 0 ? originalUrl : originalUrl.slice(0, queryPos)
 		}
 
 		const isAuthorized = await this._authorizer.isAuthorized(request)
 		if (isAuthorized) {
-			return this._handleCallback(request.body, responders.httpResponder(response, this._log))
+			return this._handleCallback(body, responders.httpResponder(response, this._log))
 		}
 
 		this._log.error('Unauthorized')
@@ -428,8 +431,8 @@ class SmartApp {
 	 * @param {*} request
 	 * @param {*} response
 	 */
-	handleHttpCallbackUnverified(request, response) {
-		this._handleCallback(request.body, responders.httpResponder(response, this._log))
+	async handleHttpCallbackUnverified(request, response) {
+		return this._handleCallback(request.body, responders.httpResponder(response, this._log))
 	}
 
 	/**