mno-enterprise-api 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0b34731abb419f0c73fd4df71ebb069e531efe0
-  data.tar.gz: 3e20d7533d0c64aef461de97bb9559d31f894929
+  metadata.gz: 35fc216add77173460114179a66177c4691895a6
+  data.tar.gz: 3996b0e5569c9b6cffd7fd8fcf22924fdf34976d
 SHA512:
-  metadata.gz: 22b2d455051e5434e13bdef392524ec18b8d576e55ddc325ebde46df41b55858a103b9a8749853281740570e1da42739505f34ffe7becbb302983cca932618f2
-  data.tar.gz: 42f2b1aab4920f54304191e9fad4f39e98128afd74a99a71dd2a2b50acfa0c500fbd93476488ac5a58d9c26d3343f5921b2f65ada23f8cc2d31993ae7293d41f
+  metadata.gz: 8937e10a9c4baf22b1625d8b9b360a7441a5a42275e92fc2b720abcc06e7d308ceacfe777ec339b933e92f22c864f3e4397680c830f2b3f107af9748676e6c91
+  data.tar.gz: 1c8d427beae96bb414d9750ad19b01b81e4489d82aeca1a384e752b7b4412a680dbb675d0fdee06ceb5e7ed80ca21222e778241844d6a911f5cc265f949f9bd6

data/app/controllers/mno_enterprise/jpi/v1/admin/organizations_controller.rb

@@ -23,7 +23,7 @@ module MnoEnterprise
     # GET /mnoe/jpi/v1/admin/organizations/1
     def show
       @organization = MnoEnterprise::Organization.find(params[:id])
-      @organization_active_apps = @organization.app_instances.select { |app| app.status == "running" }
+      @organization_active_apps = @organization.app_instances.active.to_a
     end
 
     # GET /mnoe/jpi/v1/admin/organizations/in_arrears

data/app/controllers/mno_enterprise/jpi/v1/admin/users_controller.rb

@@ -40,10 +40,14 @@ module MnoEnterprise
 
     # PATCH /mnoe/jpi/v1/admin/users/:id
     def update
-      @user = MnoEnterprise::User.find(params[:id])
-      @user.update(user_params)
+      if current_user.admin_role == "admin"
+        @user = MnoEnterprise::User.find(params[:id])
+        @user.update(user_params)
 
-      render :show
+        render :show
+      else
+        render :index, status: :unauthorized
+      end
     end
 
     # DELETE /mnoe/jpi/v1/admin/users/1

data/spec/controllers/mno_enterprise/jpi/v1/admin/users_controller_spec.rb

@@ -92,16 +92,31 @@ module MnoEnterprise
 
     describe 'PUT #update' do
       subject { put :update, id: user.id, user: {admin_role: 'staff'} }
+      let(:current_user) { build(:user, :admin) }
 
       before do
-        api_stub_for(put: "/users/#{user.id}", response: ->{ user.admin_role = 'staff'; from_api(user) })
+        api_stub_for(get: "/users/#{current_user.id}", response: from_api(current_user))
+        sign_in current_user
+
+        user.admin_role = nil
+        api_stub_for(put: "/users/#{user.id}", response: -> { user.admin_role = 'staff'; from_api(user) })
         subject
       end
 
-      it { expect(response).to be_success }
+      context 'when admin' do
+        it { expect(response).to be_success }
+
+        # Test that the user is updated by testing the api endpoint was called
+        it { expect(user.admin_role).to eq('staff') }
+      end
 
-      # Test that the user is updated by testing the api endpoint was called
-      it { expect(user.admin_role).to eq('staff') }
+      context 'when staff' do
+        let(:current_user) { build(:user, :staff) }
+
+        it { expect(response).to have_http_status(:unauthorized) }
+
+        it { expect(user.admin_role).to be_nil }
+      end
     end
 
     describe 'DELETE #destroy' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mno-enterprise-api
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Arnaud Lachaume
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-08-30 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.1.0
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement