Merge pull request #35 from MozillaSocial/auto-redirect-script-patch

Patch: load auto-redirect script as a module instead

app/javascript/packs/auto_redirect_sign-in.js

@@ -0,0 +1,18 @@
+import { sso_redirect } from '../mastodon/initial_state';
+import ready from '../mastodon/ready';
+
+ready(() => {
+  let form = document.createElement('form');
+  form.action = sso_redirect;
+  form.method = 'post';
+  if (localStorage.getItem('mozsoc.auth_intent') === 'signup') {
+    let input = document.createElement('input');
+    input.type = 'hidden';
+    input.name = 'intent';
+    input.value = 'signup';
+    form.append(input);
+  }
+  localStorage.removeItem('mozsoc.auth_intent');
+  document.body.append(form);
+  form.submit();
+});

app/views/auth/sessions/new.html.haml

@@ -1,8 +1,11 @@
 - content_for :page_title do
   = t('auth.login')
 
-- unless sso_redirect
-  - content_for :header_tags do
+- content_for :header_tags do
+  - if sso_redirect
+    = render_initial_state
+    = javascript_pack_tag 'auto_redirect_sign-in', crossorigin: 'anonymous'
+  - else
     = render partial: 'shared/og'
 
 - unless omniauth_only?
@@ -31,23 +34,5 @@
         - resource_class.omniauth_providers.each do |provider|
           = provider_sign_in_link(provider)
 
-- if sso_redirect
-  :javascript
-    (function() {
-      let form = document.createElement('form');
-      form.action = '#{ sso_redirect }';
-      form.method = 'post';
-      if (localStorage.getItem("mozsoc.auth_intent") == 'signup') {
-        let input = document.createElement('input');
-        input.type = 'hidden';
-        input.name = 'intent';
-        input.value = 'signup';
-        form.append(input);
-      }
-      localStorage.removeItem('mozsoc.auth_intent');
-      document.body.append(form);
-      form.submit();
-    })();
-
 - unless sso_redirect
   .form-footer= render 'auth/shared/links'