oidc-client - npm Package Compare versions

Comparing version 1.4.0-beta.1 to 1.4.0-beta.2

package.json

 {
   "name": "oidc-client",
-  "version": "1.4.0-beta.1",
+  "version": "1.4.0-beta.2",
   "description": "OpenID Connect (OIDC) & OAuth2 client library",
@@ -5,0 +5,0 @@ "main": "lib/oidc-client.min.js",

src/UserManager.js

@@ -86,2 +86,24 @@ // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 
+    signinRedirect(args) {
+        Log.debug("UserManager.signinRedirect");
+        return this._signinStart(args, this._redirectNavigator).then(()=>{
+            Log.info("signinRedirect successful");
+        });
+    }
+    signinRedirectCallback(url) {
+        Log.debug("UserManager.signinRedirectCallback");
+        return this._signinEnd(url || this._redirectNavigator.url).then(user => {
+            if (user) {
+                if (user.profile && user.profile.sub) {
+                    Log.info("signinRedirectCallback successful, signed in sub: ", user.profile.sub);
+                }
+                else {
+                    Log.info("signinRedirectCallback successful");
+                }
+            }
+
+            return user;
+        });
+    }
+    
     signinPopup(args = {}) {
@@ -131,2 +153,3 @@ Log.debug("UserManager.signinPopup");
     }
+
     signinSilent(args = {}) {
@@ -230,34 +253,46 @@ Log.debug("UserManager.signinSilent");
     }
-    _signinCallback(url, navigator) {
-        Log.debug("_signinCallback");
-        return navigator.callback(url);
-    }
-    _signout(args, navigator, navigatorParams = {}) {
-        Log.debug("_signout");
-        return this._signoutStart(args, navigator, navigatorParams).then(navResponse => {
-            return this._signoutEnd(navResponse.url);
+    _signinStart(args, navigator, navigatorParams = {}) {
+        Log.debug("_signinStart");
+
+        return navigator.prepare(navigatorParams).then(handle => {
+            Log.debug("got navigator window handle");
+
+            return this.createSigninRequest(args).then(signinRequest => {
+                Log.debug("got signin request");
+
+                navigatorParams.url = signinRequest.url;
+                navigatorParams.id = signinRequest.state.id;
+                
+                return handle.navigate(navigatorParams);
+            }).catch(err => {
+                if (handle.close) {
+                    Log.debug("Error after preparing navigator, closing navigator window");
+                    handle.close();
+                }
+                throw err;
+            });
         });
     }
+    _signinEnd(url) {
+        Log.debug("_signinEnd");
 
-    signinRedirect(args) {
-        Log.debug("UserManager.signinRedirect");
-        return this._signinStart(args, this._redirectNavigator).then(()=>{
-            Log.info("signinRedirect successful");
+        return this.processSigninResponse(url).then(signinResponse => {
+            Log.debug("got signin response");
+
+            let user = new User(signinResponse);
+
+            return this.storeUser(user).then(() => {
+                Log.debug("user stored");
+
+                this._events.load(user);
+
+                return user;
+            });
         });
     }
-    signinRedirectCallback(url) {
-        Log.debug("UserManager.signinRedirectCallback");
-        return this._signinEnd(url || this._redirectNavigator.url).then(user => {
-            if (user) {
-                if (user.profile && user.profile.sub) {
-                    Log.info("signinRedirectCallback successful, signed in sub: ", user.profile.sub);
-                }
-                else {
-                    Log.info("signinRedirectCallback successful");
-                }
-            }
+    _signinCallback(url, navigator) {
+        Log.debug("_signinCallback");
+        return navigator.callback(url);
+    }
 
-            return user;
-        });
-    }
     signoutRedirect(args = {}) {
@@ -268,8 +303,2 @@ Log.debug("UserManager.signoutRedirect");
             args.post_logout_redirect_uri = postLogoutRedirectUri;
-            // we're putting a dummy entry in here because we 
-            // need a unique id from the state for notification
-            // to the parent window, which is necessary if we
-            // plan to return back to the client after signout
-            // and so we can close the popup after signout
-            args.state = args.state || {};
         }
@@ -287,2 +316,3 @@ return this._signoutStart(args, this._redirectNavigator).then(()=>{
     }
+
     signoutPopup(args = {}) {
@@ -323,43 +353,8 @@ Log.debug("UserManager.signinPopup");
 
-    _signinStart(args, navigator, navigatorParams = {}) {
-        Log.debug("_signinStart");
-
-        return navigator.prepare(navigatorParams).then(handle => {
-            Log.debug("got navigator window handle");
-
-            return this.createSigninRequest(args).then(signinRequest => {
-                Log.debug("got signin request");
-
-                navigatorParams.url = signinRequest.url;
-                navigatorParams.id = signinRequest.state.id;
-                
-                return handle.navigate(navigatorParams);
-            }).catch(err => {
-                if (handle.close) {
-                    Log.debug("Error after preparing navigator, closing navigator window");
-                    handle.close();
-                }
-                throw err;
-            });
+    _signout(args, navigator, navigatorParams = {}) {
+        Log.debug("_signout");
+        return this._signoutStart(args, navigator, navigatorParams).then(navResponse => {
+            return this._signoutEnd(navResponse.url);
         });
     }
-
-    _signinEnd(url) {
-        Log.debug("_signinEnd");
-
-        return this.processSigninResponse(url).then(signinResponse => {
-            Log.debug("got signin response");
-
-            let user = new User(signinResponse);
-
-            return this.storeUser(user).then(() => {
-                Log.debug("user stored");
-
-                this._events.load(user);
-
-                return user;
-            });
-        });
-    }
-
     _signoutStart(args = {}, navigator, navigatorParams = {}) {
@@ -366,0 +361,0 @@ Log.debug("_signoutStart");

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

4446210

decreased by-0.05%

Lines of code

27815

decreased by-0.06%

No dependency changes