decidim-api 0.32.0.rc1 → 0.32.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cf5f240a41ece3f4f07770268009fff3d9ef83929683aa1c400c5e802b6927f
-  data.tar.gz: 5c649a7a7b1459032d3cad870a81f4acc52ced4561a19ad0d14ecc3d189db35f
+  metadata.gz: 23003b024e8967089ac13a4ba13075c57db1e97d09c3773b48888823a1c6a702
+  data.tar.gz: 5eba663637e8f9eb32e8d794d32a783e5febfcb2eca8f260eb8147876e964d0a
 SHA512:
-  metadata.gz: cbb24c7c4847278bc80a8f87834af2ef42c5020d256adaadaeeb6f93e20e4e6a038dff6d67e895f941f768ad7bc3ff694c5eb4ba80a8b4dfe96a76556f7fc4f8
-  data.tar.gz: 71f79073c2cbfae501bb7a7ecd6a082874f93c63461cfabcb19be0583b7187576e768c82226ef5b0207838cc6f5f5445f33fe55e327e3111d161295da1742f47
+  metadata.gz: b559b193744d9dfaca9d67851d5b55718951b9067d5dba4e5e9b1646b64c068ea657fb6d80dfec23ff7da7d6e6160263680d0aec4ae86d0c15f9f25454f37b56
+  data.tar.gz: 689b793f28dfc1ba3294add033e06ac87cfbdc8ddc0cf95c4a7823e007de8de0127fff31a958acd76ef1b391099614677cdb0e97e9d1fe5e009387077c986a75

data/app/controllers/decidim/api/queries_controller.rb

@@ -36,7 +36,7 @@ module Decidim
       end
 
       def api_user
-        @api_user = current_api_user || current_user
+        @api_user ||= organization_user(current_api_user || current_user)
       end
 
       # Determines the scopes for the user for API requests.
@@ -84,6 +84,13 @@ module Decidim
           raise ArgumentError, "Unexpected parameter: #{variables_param}"
         end
       end
+
+      def organization_user(user)
+        return if user.blank? || current_organization.blank?
+        return unless user.decidim_organization_id == current_organization.id
+
+        user
+      end
     end
   end
 end

data/config/locales/sk.yml

@@ -1 +1,15 @@
+---
 sk:
+  decidim:
+    api:
+      errors:
+        introspection_disabled: Introspekcia je pre túto požiadavku zakázaná
+        invalid_locale: Poskytnutý neplatný jazyk
+        locale_argument_error: Pri internom spracovaní údajov i18n sa vyskytla chyba
+        not_found: "%{type} sa nenašiel"
+        permission_not_set: Pre tento %{type} nebolo nastavené oprávnenie
+        recursion_limit_exceeded_error: V dopyte bolo zistených príliš veľa rekurzií
+        too_many_aliases_error: Použilo sa príliš veľa aliasov. Použili ste %{size} aliasov, ale povolených je %{limit}.
+        unauthorized_field: Nemôžete zobraziť ani upraviť pole %{field} v %{type}, pretože nemáte oprávnenie
+        unauthorized_mutation: Nemáte oprávnenie vykonať túto mutáciu
+        unauthorized_object: Nemôžete zobraziť ani upraviť tento %{type}, pretože nemáte oprávnenia

data/decidim-api.gemspec

@@ -3,7 +3,7 @@
 $LOAD_PATH.push File.expand_path("lib", __dir__)
 
 Gem::Specification.new do |s|
-  version = "0.32.0.rc1"
+  version = "0.32.0.rc2"
   s.version = version
   s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva"]
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]

data/lib/decidim/api/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-api version.
   module Api
     def self.version
-      "0.32.0.rc1"
+      "0.32.0.rc2"
     end
   end
 end

data/lib/devise/models/api_authenticatable.rb

@@ -22,7 +22,13 @@ module Devise
         end
 
         def find_for_api_authentication(conditions)
-          find_for_authentication(conditions)
+          organization = conditions.dig(:env, "decidim.current_organization")
+          return unless organization
+
+          find_for_authentication(
+            api_key: conditions[:api_key],
+            decidim_organization_id: organization.id
+          )
         end
       end
     end

data/lib/devise/strategies/api_authenticatable.rb

@@ -9,7 +9,7 @@ module Devise
         key = authentication_hash[:key]
         secret = authentication_hash[:secret]
 
-        resource = mapping.to.find_for_api_authentication(api_key: key)
+        resource = mapping.to.find_for_api_authentication(api_key: key, env:)
         validation_status = validate(resource) { resource.valid_api_secret?(secret) }
 
         success!(resource) if validation_status

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-api
 version: !ruby/object:Gem::Version
-  version: 0.32.0.rc1
+  version: 0.32.0.rc2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc1
+        version: 0.32.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc1
+        version: 0.32.0.rc2
 - !ruby/object:Gem::Dependency
   name: devise-jwt
   requirement: !ruby/object:Gem::Requirement
@@ -111,56 +111,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc1
+        version: 0.32.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc1
+        version: 0.32.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc1
+        version: 0.32.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc1
+        version: 0.32.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc1
+        version: 0.32.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc1
+        version: 0.32.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc1
+        version: 0.32.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc1
+        version: 0.32.0.rc2
 description: API engine for decidim
 email:
 - josepjaume@gmail.com