mno-enterprise-api 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f9a59af5d82066b5218e41fded2d2d15415c3f2
-  data.tar.gz: fd7515bcc91ce757de834cc3456c86a52f4a81aa
+  metadata.gz: 2d433295f9c87eef1d54931eb24268c0d884dd7a
+  data.tar.gz: 4153fae7373b8991c6cd74d2e77a8666c06c5de3
 SHA512:
-  metadata.gz: 0426722e7384f3fd85058066d2ac2ab2eaafe86127d8f76844f4c1c2a152e776927f91667857929eea4399a7c22ea89bab48d2c1ab40d50159ed0f50b7563289
-  data.tar.gz: b834cc97dc3bd7253171f58dc36cf7d62b34584aa071388ce415b8f46da3085a4c2a5d72b0812e3b061ffc73d5aa730e3b06adfa9b150e7471c92721f611daee
+  metadata.gz: 8063295c92c5ec525ba18177120644ec0daf04609716a697c8dc63c9540018801adb9f18f3c171f357c503d866d4a9cedd297b77b5a63873535d1ff2f2696cd2
+  data.tar.gz: 98a9789331a4d92dffcbad5737f1a24e67413d3873093ac8ed4578902ddcab8f5753cf8e029179384c21699e8a524ac1ce30b53362cfff5021bcee0baac95db0

data/app/views/mno_enterprise/webhook/o_auth/providers/myob.html.haml

@@ -21,7 +21,7 @@
 
               .form-group
                 %p= t('.my_version_is')
-                = select_tag :version, options_for_select([["Account Right (Desktop)","account_right"],["Essentials (Cloud)","essentials"]], "essentials")
+                = select_tag :version, options_for_select([["Account Right Live","account_right"],["Essentials","essentials"]], "essentials")            
 
               %hr
 

data/lib/mno_enterprise/concerns/controllers/org_invites_controller.rb

@@ -23,7 +23,6 @@ module MnoEnterprise::Concerns::Controllers::OrgInvitesController
   # Instance methods
   #==================================================================
   # GET /org_invites/1?token=HJuiofjpa45A73255a74F534FDfds
-  # TODO: improve integration with new frontends
   def show
     @current_user = current_user
     @org_invite = MnoEnterprise::OrgInvite.active.where(id: params[:id], token: params[:token]).first
@@ -39,6 +38,11 @@ module MnoEnterprise::Concerns::Controllers::OrgInvitesController
       message = { alert: "Unfortunately, this invite does not seem to be valid." }
     end
 
+    # Add flash msg in url fragment for the new frontend
+    type, msg = message.first
+    type = (type == :alert ? :error : :success)
+    redirect_path = add_param_to_fragment(redirect_path.to_s, 'flash', [{msg: msg,  type: type}.to_json])
+
     redirect_to redirect_path, message
   end
 end

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

@@ -30,7 +30,7 @@ module MnoEnterprise::Concerns::Controllers::Webhook::OAuthController
       # Return a hash of extra parameters that were passed along with
       # the request
       def extra_params
-        params.reject { |k,v|  [:controller,:action,:id, :perform].include?(k.to_sym) }
+        params.except(:controller,:action,:id, :perform)
       end
 
       # Current user web token
@@ -38,20 +38,6 @@ module MnoEnterprise::Concerns::Controllers::Webhook::OAuthController
         MnoEnterprise.jwt(user_id: current_user.uid)
       end
 
-      # 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"
-      def add_param_to_fragment(url, param_name, param_value)
-        uri = URI(url)
-        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
-        uri.to_s
-      end
-
       def error_message(error_key)
         case error_key.to_sym
           when :bad_relinking

data/spec/controllers/mno_enterprise/org_invites_controller_spec.rb

@@ -1,29 +1,56 @@
 require 'rails_helper'
 
+def mnoe_home_path
+  controller.send(:mnoe_home_path)
+end
+
 module MnoEnterprise
   describe OrgInvitesController, type: :controller do
     render_views
     routes { MnoEnterprise::Engine.routes }
   
     let(:user) { build(:user) }
-    #before { api_stub_for(get: "/users/#{user.id}", response: from_api(user)) }
-    #before { api_stub_for(put: "/users/#{user.id}", response: from_api(user)) }
-  
+    let(:invite) { build(:org_invite, user: user) }
+    let(:token) { invite.token }
+
+    before do
+      api_stub_for(get: "/users/#{user.id}", response: from_api(user))
+
+      # Invite stubs
+      api_stub_for(get: "/org_invites?filter[id]=#{invite.id}&filter[status]=pending&filter[token]=#{token}", response: from_api([invite]))
+      api_stub_for(get: "/org_invites?filter[id]=#{invite.id}&filter[status]=pending&filter[token]", response: from_api([]))
+      api_stub_for(put: "/org_invites/#{invite.id}", response: from_api(invite.tap { |x| x.status = 'accepted' }))
+    end
+
     describe "GET #show" do
-      before { sign_in user }
-      subject { get :show }
-      
-      # it_behaves_like "a navigatable protected user action"
-      #
-      # it "assigns the right meta information" do
-      #   get :myspace
-      #   meta = {}
-      #   meta[:title] = "Dashboard"
-      #   meta[:description] = "Dashboard"
-      #   assigns(:meta).should == meta
-      # end
+      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]])}" }
+
+      context 'when not signed in' do
+        it { expect(subject).not_to be_success }
+        it { expect(subject).to redirect_to(new_user_session_path) }
+      end
+
+      context 'when signed in' do
+        before { sign_in user }
+        before { subject }
+
+        it { expect(response).to redirect_to(mnoe_home_path + success_fragment) }
+        it { expect(assigns(:org_invite)).to eq(invite) }
+
+        context 'with expired invited' do
+          let(:invite) { build(:org_invite, :expired, user: user) }
+          it { expect(response).to redirect_to(mnoe_home_path + expired_fragment) }
+        end
+
+        context 'without token' do
+          let(:token) { nil }
+          it { expect(response).to redirect_to(mnoe_home_path + invalid_fragment) }
+        end
+      end
     end
-  
   end
-  
-end
+end

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

@@ -89,16 +89,5 @@ module MnoEnterprise
 
       it { subject; expect(response).to redirect_to(redirect_url) }
     end
-
-    describe '#add_param_to_fragment' do
-      let(:controller) { described_class.new }
-
-      it { expect(subject.send(:add_param_to_fragment, '/#/platform/accounts', 'foo', 'bar')).to eq('/#/platform/accounts?foo=bar') }
-      it { expect(subject.send(:add_param_to_fragment, '/', 'foo', 'bar')).to eq('/#?foo=bar') }
-      it { expect(subject.send(:add_param_to_fragment, '/#/platform/dashboard/he/43?en=690', 'foo', 'bar')).to eq('/#/platform/dashboard/he/43?en=690&foo=bar') }
-      it { expect(subject.send(: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
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mno-enterprise-api
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Arnaud Lachaume
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-22 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mno-enterprise-core
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
@@ -318,7 +318,7 @@ files:
 - spec/spec_helper.rb
 homepage: https://maestrano.com
 licenses:
-- Maestrano Enterprise License V1
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []