[MNOE-433] Fix flash helper for angular 1.6

api/lib/mno_enterprise/concerns/controllers/webhook/o_auth_controller.rb

@@ -73,7 +73,6 @@ def callback
     path = session.delete(:redirect_path).presence || mnoe_home_path
 
     if error_key = params.fetch(:oauth, {})[:error]
-
       path = add_param_to_fragment(path.to_s, 'flash', [{msg: error_message(error_key),  type: :error}.to_json])
     end
 

api/spec/controllers/mno_enterprise/org_invites_controller_spec.rb

@@ -25,9 +25,9 @@ module MnoEnterprise
     describe "GET #show" do
       subject { get :show, id: invite.id, token: token}
 
-      let(:success_fragment) { "#?dhbRefId=#{invite.organization.id}&#{URI.encode_www_form([['flash', {msg: "You are now part of #{invite.organization.name}", type: :success}.to_json]])}" }
-      let(:expired_fragment) { "#?#{URI.encode_www_form([['flash', {msg: "It looks like this invite has expired. Please ask your company administrator to resend the invite.", type: :error}.to_json]])}" }
-      let(:invalid_fragment) { "#?#{URI.encode_www_form([['flash', {msg: "Unfortunately, this invite does not seem to be valid.", type: :error}.to_json]])}" }
+      let(:success_fragment) { "#!?dhbRefId=#{invite.organization.id}&#{URI.encode_www_form([['flash', {msg: "You are now part of #{invite.organization.name}", type: :success}.to_json]])}" }
+      let(:expired_fragment) { "#!?#{URI.encode_www_form([['flash', {msg: "It looks like this invite has expired. Please ask your company administrator to resend the invite.", type: :error}.to_json]])}" }
+      let(:invalid_fragment) { "#!?#{URI.encode_www_form([['flash', {msg: "Unfortunately, this invite does not seem to be valid.", type: :error}.to_json]])}" }
 
       context 'when not signed in' do
         it { expect(subject).not_to be_success }

api/spec/controllers/mno_enterprise/provision_controller_spec.rb

@@ -57,7 +57,7 @@ module MnoEnterprise
             describe "unauthorized" do
               let(:authorized) { false }
 
-              let(:error_fragment) { "#?#{URI.encode_www_form([['flash', {msg: "Unfortunately you do not have permission to purchase products for this organization", type: :error}.to_json]])}" }
+              let(:error_fragment) { "#!?#{URI.encode_www_form([['flash', {msg: "Unfortunately you do not have permission to purchase products for this organization", type: :error}.to_json]])}" }
 
               it 'redirect to the dashboard with an error message' do
                 expect(response).to redirect_to(mnoe_home_path + error_fragment)
@@ -89,7 +89,7 @@ module MnoEnterprise
 
             context 'with one organization available' do
               let(:organizations) { [organization] }
-              let(:error_fragment) { "#?#{URI.encode_www_form([['flash', {msg: "Unfortunately you do not have permission to purchase products for this organization", type: :error}.to_json]])}" }
+              let(:error_fragment) { "#!?#{URI.encode_www_form([['flash', {msg: "Unfortunately you do not have permission to purchase products for this organization", type: :error}.to_json]])}" }
 
               it 'redirect to the dashboard with an error message' do
                 expect(response).to redirect_to(mnoe_home_path + error_fragment)

api/spec/controllers/mno_enterprise/webhook/o_auth_controller_spec.rb

@@ -64,7 +64,7 @@ module MnoEnterprise
       context 'when there is on oauth error' do
         subject { get :callback, id: app_instance.uid, oauth: {error: :unauthorized} }
 
-        let(:fragment) { "#?#{URI.encode_www_form([['flash', {msg: 'We could not validate your credentials, please try again', type: :error}.to_json]])}" }
+        let(:fragment) { "#!?#{URI.encode_www_form([['flash', {msg: 'We could not validate your credentials, please try again', type: :error}.to_json]])}" }
 
         it { subject; expect(response).to redirect_to(MnoEnterprise.router.dashboard_path + fragment) }
       end

core/app/controllers/mno_enterprise/application_controller.rb

@@ -126,13 +126,13 @@ def after_sign_out_path_for(resource_or_scope)
     private
 
     # Append params to the fragment part of an existing url String
-    #   add_param("/#/platform/accounts", 'foo', 'bar')
-    #     => "/#/platform/accounts?foo=bar"
-    #   add_param("/#/platform/dashboard/he/43?en=690", 'foo', 'bar')
-    #     => "/#/platform/dashboard/he/43?en=690&foo=bar"
+    #   add_param_to_fragment("/#!/platform/accounts", 'foo', 'bar')
+    #     => "/#!/platform/accounts?foo=bar"
+    #   add_param_to_fragment("/#!/platform/dashboard/he/43?en=690", 'foo', 'bar')
+    #     => "/#!/platform/dashboard/he/43?en=690&foo=bar"
     def add_param_to_fragment(url, param_name, param_value)
       uri = URI(url)
-      fragment = URI(uri.fragment || "")
+      fragment = URI(uri.fragment || "!")
       params = URI.decode_www_form(fragment.query || "") << [param_name, param_value]
       fragment.query = URI.encode_www_form(params)
       uri.fragment = fragment.to_s

core/spec/controllers/mno_enterprise/application_controller_spec.rb

@@ -13,10 +13,10 @@ def add_param_to_fragment(url, param_name, param_value)
     end
 
     describe '#add_param_to_fragment' do
-      it { expect(controller.add_param_to_fragment('/#/platform/accounts', 'foo', 'bar')).to eq('/#/platform/accounts?foo=bar') }
-      it { expect(controller.add_param_to_fragment('/', 'foo', 'bar')).to eq('/#?foo=bar') }
-      it { expect(controller.add_param_to_fragment('/#/platform/dashboard/he/43?en=690', 'foo', 'bar')).to eq('/#/platform/dashboard/he/43?en=690&foo=bar') }
-      it { expect(controller.add_param_to_fragment('/#/platform/dashboard/he/43?en=690', 'foo', [{msg: 'yolo'}])).to eq('/#/platform/dashboard/he/43?en=690&foo=%7B%3Amsg%3D%3E%22yolo%22%7D') }
+      it { expect(controller.add_param_to_fragment('/#!/platform/accounts', 'foo', 'bar')).to eq('/#!/platform/accounts?foo=bar') }
+      it { expect(controller.add_param_to_fragment('/', 'foo', 'bar')).to eq('/#!?foo=bar') }
+      it { expect(controller.add_param_to_fragment('/#!/platform/dashboard/he/43?en=690', 'foo', 'bar')).to eq('/#!/platform/dashboard/he/43?en=690&foo=bar') }
+      it { expect(controller.add_param_to_fragment('/#!/platform/dashboard/he/43?en=690', 'foo', [{msg: 'yolo'}])).to eq('/#!/platform/dashboard/he/43?en=690&foo=%7B%3Amsg%3D%3E%22yolo%22%7D') }
     end
 
     describe '#after_sign_in_path_for' do