Auto-merge for PR balena-io#566 via VersionBot

462 narrow catch clauses

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v10.0.7 - 2018-08-20
+
+* Change name and logic of normalizeAuthError method #566 [amdomanska]
+* Report authentication errors more accurately #566 [Tim Perry]
+
 ## v10.0.6 - 2018-08-17
 
 * Add support for 'all' in logs requests #556 [Tim Perry]

lib/auth.coffee

@@ -23,6 +23,14 @@ getAuth = (deps, opts) ->
 	twoFactor = require('./2fa')(deps, opts)
 	exports = {}
 
+	normalizeAuthError = (err) ->
+		if err.statusCode == 401
+			return new errors.ResinNotLoggedIn()
+		else if err.code == 'ResinMalformedToken'
+			return new errors.ResinNotLoggedIn()
+		else
+			return err
+
 	###*
 	# @namespace resin.auth.twoFactor
 	# @memberof resin.auth
@@ -41,8 +49,8 @@ getAuth = (deps, opts) ->
 			.get('body')
 			.tap (body) ->
 				userDetailsCache = body
-			.catch ->
-				throw new errors.ResinNotLoggedIn()
+			.catch (err) ->
+				throw normalizeAuthError(err)
 
 	###*
 	# @summary Return current logged in username
@@ -240,10 +248,9 @@ getAuth = (deps, opts) ->
 	exports.getToken = (callback) ->
 		auth.getKey()
 		.then (savedToken) ->
-			throw new errors.ResinNotLoggedIn() if not savedToken?
 			return savedToken
-		.catch ->
-			throw new errors.ResinNotLoggedIn()
+		.catch (err) ->
+			throw normalizeAuthError(err)
 		.asCallback(callback)
 
 	###*

package.json

@@ -1,6 +1,6 @@
 {
   "name": "resin-sdk",
-  "version": "10.0.6",
+  "version": "10.0.7",
   "description": "The Resin.io JavaScript SDK",
   "main": "build/resin.js",
   "types": "typings/resin-sdk.d.ts",

tests/integration/auth.spec.coffee

@@ -42,6 +42,13 @@ describe 'SDK authentication', ->
 
 				m.chai.expect(promise).to.be.rejectedWith('Unauthorized')
 
+		describe 'resin.auth.getToken()', ->
+
+			it 'should be rejected', ->
+				promise = resin.auth.getToken()
+				m.chai.expect(promise).to.be.rejected
+					.and.eventually.have.property('code', 'ResinNotLoggedIn')
+
 		describe 'resin.auth.loginWithToken()', ->
 
 			it 'should be able to login with a session token', ->
@@ -122,6 +129,7 @@ describe 'SDK authentication', ->
 
 				m.chai.expect(promise).to.be.rejectedWith('This email is already taken')
 
+
 	describe 'when logged in with credentials', ->
 
 		givenLoggedInUser()