nativescript-oauth2 - npm Package Compare versions

Comparing version 2.2.2 to 2.3.0

delegate/delegate.android.js

@@ -14,2 +14,7 @@ "use strict";
     }
+    else {
+        if (TnsOAuthClientAppDelegate._client) {
+            TnsOAuthClientAppDelegate._client.resumeWithUrl(null);
+        }
+    }
 });
@@ -16,0 +21,0 @@ var TnsOAuthClientAppDelegate = (function () {

package.json

 {
   "name": "nativescript-oauth2",
-  "version": "2.2.2",
+  "version": "2.3.0",
   "description": "OAuth 2 generic authorization plugin for NativeScript that doesn't install third party native libraries",
@@ -5,0 +5,0 @@ "main": "oauth",

tns-oauth-login-sub-controller.js

@@ -61,18 +61,12 @@ "use strict";
             responseCompletion = function (data, response, responseError) {
-                if (!responseError) {
-                    if (response.statusCode === 200) {
-                        var tokenResult = _this.client.provider.parseTokenResult(data);
-                        if (tokenResult && !responseError) {
-                            _this.client.tokenResult = tokenResult;
-                            completion(tokenResult, responseError);
-                        }
-                    }
-                    else if (response.statusCode === 400) {
-                        console.error("400 ERRROR Occurred");
-                        completion(null, responseError);
-                    }
-                    else if (response.statusCode > 400) {
-                        completion(null, responseError);
-                    }
+                if ((response.statusCode === 200 || (data && data.accessToken)) && !responseError) {
+                    var tokenResult = _this.client.provider.parseTokenResult(data);
+                    _this.client.tokenResult = tokenResult;
+                    completion(tokenResult, null);
                 }
+                else {
+                    var msg_1 = (response ? response.statusCode : '') + " ERRROR Occurred";
+                    console.error(msg_1);
+                    completion(null, responseError ? responseError : new Error(msg_1));
+                }
             };
@@ -84,6 +78,8 @@ }
     TnsOAuthLoginSubController.prototype.completeLoginWithTokenResponseError = function (tokenResult, responseError) {
-        var loginCompletion = this.authState
-            .loginCompletion;
-        this.authState = null;
-        loginCompletion(tokenResult, responseError);
+        if (this.authState) {
+            var loginCompletion = this.authState
+                .loginCompletion;
+            this.authState = null;
+            loginCompletion(tokenResult, responseError);
+        }
     };
@@ -90,0 +86,0 @@ return TnsOAuthLoginSubController;

tns-oauth-native-view-controller.android.js

@@ -38,6 +38,12 @@ "use strict";
         var _this = this;
-        return this.loginController.resumeWithUrl(url, function (tokenResult, error) {
-            _this.loginController.completeLoginWithTokenResponseError(tokenResult, error);
-            _this.loginController.frame.goBack();
-        });
+        if (!!url) {
+            return this.loginController.resumeWithUrl(url, function (tokenResult, error) {
+                _this.loginController.completeLoginWithTokenResponseError(tokenResult, error);
+            });
+        }
+        else {
+            var er = "The login operation was canceled.";
+            this.loginController.completeLoginWithTokenResponseError(null, er);
+            return true;
+        }
     };
@@ -44,0 +50,0 @@ return TnsOAuthLoginNativeViewController;

No alert changes

Improved metrics

Total package byte prevSize

82681

increased by0.21%

Lines of code

1366

increased by0.52%

No dependency changes