Merge pull request #10 from Blackbaud-DarrylEychner/master

Federated authentication
blackbaud · Apr 15, 2020 · c1eda62 · c1eda62
2 parents db81924 + 7e05d7d
commit c1eda62
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 33 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "bbui-angular",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "homepage": "https://github.com/blackbaud/bbui-angular",
   "authors": [
     "Paul Crowder <paul.crowder@blackbaud.com>",

diff --git a/dist/js/bbui.js b/dist/js/bbui.js
diff --git a/dist/js/bbui.js.map b/dist/js/bbui.js.map
diff --git a/dist/js/bbui.min.js b/dist/js/bbui.min.js
diff --git a/dist/js/bbui.min.js.map b/dist/js/bbui.min.js.map
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bbui-angular",
   "description": "A portion of the Infinity BBUI API ported to Angular services.",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "repository": {
     "type": "git",
     "url": "https://github.com/blackbaud/bbui-angular"

diff --git a/src/utils/browser.js b/src/utils/browser.js
@@ -19,7 +19,7 @@
                 result = {};
 
             if (pairs) {
-                pairs.forEach(function(pair) {
+                pairs.forEach(function (pair) {
                     pair = pair.split('=');
                     result[pair[0]] = decodeURIComponent(pair[1] || '');
                 });

diff --git a/src/utils/infinity.js b/src/utils/infinity.js
@@ -63,17 +63,21 @@
         function getWebShellLoginUrl(databaseName, status) {
 
             var url,
-                redirectUrl;
+                redirectUrl = mockableUtilities.getWindowLocation().href,
+                index = redirectUrl.indexOf("wsfederationlogin"),
+                actualUrl = redirectUrl.split('&')[0];
 
             if (!initialized) {
                 console.error('getWebShellLoginUrl called before initialized');
             }
 
-            redirectUrl = mockableUtilities.getWindowLocation().href;
-
             url = "/" + getVirtualDirectory() + "/webui/WebShellLogin.aspx?databaseName=" + euc(databaseName);
 
-            url += "&url=" + euc(redirectUrl);
+            if (index !== -1) {
+                url += "&action=wsfederationlogin";
+            }
+
+            url += "&url=" + euc(actualUrl);
 
             if (status) {
                 url += "&status=" + euc(status);