Adds support for confirmationRedirectUri param to pass to IdeoSSO

Author: kaptron

__mocks__/ideo-sso.js

@@ -1,4 +1,6 @@
 export default {
   baseApiUrl: '',
   profileUrl: '',
+  init: jest.fn(),
+  initFromEnv: jest.fn(),
 }

app/controllers/home_controller.rb

@@ -61,6 +61,7 @@ def capture_email_and_token
   def store_redirect_param
     return if params[:redirect].blank?
 
+    @redirect = params[:redirect]
     redirect_uri = clean_redirect
     store_location_for :user, redirect_uri
     load_redirect_organization_from_url(redirect_uri)

app/javascript/packs/ideo-sso.js

@@ -5,15 +5,28 @@ function init() {
   if (!window.IDEO_SSO_PARAMS) {
     return
   }
-  const { action, email, token, logoutRequired } = window.IDEO_SSO_PARAMS
+  const {
+    action,
+    email,
+    token,
+    logoutRequired,
+    redirect,
+    loginUrl,
+  } = window.IDEO_SSO_PARAMS
+
+  let confirmationRedirectUri = loginUrl
+  if (redirect) {
+    // append the redirect to the original oauth redirect path
+    confirmationRedirectUri += `?redirect=${redirect}`
+  }
 
   if (action === 'signIn') {
-    IdeoSSO.signIn({ email })
+    IdeoSSO.signIn({ email, confirmationRedirectUri })
     return
   }
   if (action === 'signUp') {
     const signUp = () => {
-      IdeoSSO.signUp({ email, token })
+      IdeoSSO.signUp({ email, token, confirmationRedirectUri })
     }
 
     if (logoutRequired) {

app/views/home/login.html.erb

@@ -2,6 +2,8 @@
   window.IDEO_SSO_PARAMS = {
     action: 'signIn',
     email: '<%= @email %>',
+    redirect: '<%= @redirect %>',
+    loginUrl: '<%= login_url %>',
   }
 </script>
 

app/views/home/sign_up.html.erb

@@ -4,6 +4,7 @@
     email: '<%= @email %>',
     token: '<%= @token %>',
     logoutRequired: <%= @user_was_signed_in %>,
+    loginUrl: '<%= login_url %>',
   }
 </script>
 

package.json

@@ -122,7 +122,7 @@
     "hypher": "^0.2.5",
     "i18n-iso-countries": "3.7.3",
     "identity-obj-proxy": "^3.0.0",
-    "ideo-sso-js-sdk": "ideo/sso-js-sdk#v2.1.0",
+    "ideo-sso-js-sdk": "ideo/sso-js-sdk#v2.1.1",
     "if-emoji": "^0.1.0",
     "jest-styled-components": "7.0.0-2",
     "js-cookie": "^2.2.1",

yarn.lock

@@ -7578,9 +7578,9 @@ identity-obj-proxy@^3.0.0:
   dependencies:
     harmony-reflect "^1.4.6"
 
-ideo-sso-js-sdk@ideo/sso-js-sdk#v2.1.0:
-  version "2.1.0"
-  resolved "https://codeload.github.com/ideo/sso-js-sdk/tar.gz/fd66521d0ebb391f69c0dd5e2519e0e57b20d106"
+ideo-sso-js-sdk@ideo/sso-js-sdk#v2.1.1:
+  version "2.1.1"
+  resolved "https://codeload.github.com/ideo/sso-js-sdk/tar.gz/d73606ae8b59f8e99fb457f5e3c42e7a4dfd303d"
   dependencies:
     babel-polyfill "^6.26.0"
     js-cookie "^2.2.0"