decidim-bulletin_board 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 834f029e86c9fad845c573cc2c72e6294767de95193f985e7d6d79997e616b30
-  data.tar.gz: 44c6711314e297ca4b876b6ef535f0443acfe66e1c5dfda93bc7307a1529dc69
+  metadata.gz: 6a143d34d670d822c82a6f08abaa0f90faf4e9312875cba0a9117faa09679e5f
+  data.tar.gz: 27b4d187001dd0aa3ed497bb6c4d21138b794075e91faace0eae5fa8c2738d50
 SHA512:
-  metadata.gz: 2ac8ef1bee39287b22c036c4f2abfd69c7e7922884295b44a87696be2be68e56e9392646774bcfe8f6ccf5b3c7fdcf0164a2f95499bdb7165598316b6b46d4cf
-  data.tar.gz: ff16f63812d6cb53fbb2126ce2bbd9debf5aec15f8f5728d0ed74a7f715d1f657401a21011b198646c4e02e7988af22e56f61b3cc50d69fc6aa810661a145036
+  metadata.gz: aebd18c91bc774fc539fc87940fb5da309217e3850770e3b0e4f751d35222295e43eca3f1f0d8702730ffed582f2676f192e4142d2f092b9185f162ff12b9644
+  data.tar.gz: a458ac71cc856888dff79c2c5e2504e14cd2ef9191a74025fca344e9598ee691740cb29481932ddb9bc71467e6504a1457349ca4c47bc11f5f96d41027b10c33

data/Gemfile.lock

@@ -100,6 +100,7 @@ GEM
 
 PLATFORMS
   ruby
+  x86_64-linux
 
 DEPENDENCIES
   decidim-bulletin_board!
@@ -112,4 +113,4 @@ DEPENDENCIES
   wisper-rspec (~> 1.1.0)
 
 BUNDLED WITH
-   2.1.4
+   2.2.0

data/decidim-bulletin_board.gemspec

@@ -23,11 +23,11 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "activemodel", "~> 5.0", ">= 5.0.0.1"
-  s.add_dependency "activesupport", "~> 5.0", ">= 5.0.0.1"
+  s.add_dependency "activemodel", ">= 5.0.0"
+  s.add_dependency "activesupport", ">= 5.0.0"
   s.add_dependency "byebug", "~> 11.0"
   s.add_dependency "graphlient", "~> 0.4.0"
-  s.add_dependency "jwt"
+  s.add_dependency "jwt", "~> 2.2.2"
   s.add_dependency "wisper", "~> 2.0.0"
 
   s.add_development_dependency "rake", "~> 13.0"

data/lib/decidim/bulletin_board.rb

@@ -5,11 +5,11 @@ require "graphlient"
 require "wisper"
 require "active_model"
 require "decidim/bulletin_board/jwk_utils"
+require "decidim/bulletin_board/message_identifier"
 require "decidim/bulletin_board/client"
 require "decidim/bulletin_board/graphql/client"
-require "decidim/bulletin_board/create_election"
 require "decidim/bulletin_board/voter"
-require "decidim/bulletin_board/authority/get_election_status"
+require "decidim/bulletin_board/authority"
 require "active_support/configurable"
 require "jwt"
 

data/lib/decidim/bulletin_board/authority.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require "decidim/bulletin_board/authority/create_election"
+require "decidim/bulletin_board/authority/get_election_status"

data/lib/decidim/bulletin_board/authority/create_election.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Decidim
+  module BulletinBoard
+    module Authority
+      # This class handles the creation of an election.
+      class CreateElection
+        def initialize(election_data, message_id)
+          @client = BulletinBoard::Graphql::Client.client
+          @election_data = election_data
+          @message_id = message_id
+          @private_key = private_key
+        end
+
+        def self.call(election_data, message_id)
+          new(election_data, message_id).call
+        end
+
+        def call
+          args = {
+            message_id: message_id,
+            signed_data: encode_data(election_data)
+          }
+
+          response = client.query do
+            mutation do
+              createElection(messageId: args[:message_id], signedData: args[:signed_data]) do
+                election do
+                  status
+                end
+                error
+              end
+            end
+          end
+
+          response.data.create_election
+        end
+
+        private
+
+        attr_reader :client, :election_data, :message_id
+
+        def private_key
+          @private_key ||= JwkUtils.import_private_key(BulletinBoard.identification_private_key)
+        end
+
+        def encode_data(election_data)
+          JWT.encode(election_data, private_key.keypair, "RS256")
+        end
+      end
+    end
+  end
+end

data/lib/decidim/bulletin_board/client.rb

@@ -40,7 +40,7 @@ module Decidim
 
       def setup_election(election_data)
         message_id = "#{election_data[:election_id]}.create_election+a.#{authority_slug}"
-        Decidim::BulletinBoard::CreateElection.call(election_data, message_id)
+        Decidim::BulletinBoard::Authority::CreateElection.call(election_data, message_id)
       end
 
       def cast_vote(election_data, voter_data, encrypted_vote)

data/lib/decidim/bulletin_board/message_identifier.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+module Decidim
+  module BulletinBoard
+    class MessageIdentifier
+      AUTHOR_TYPE = {
+        a: :authority,
+        b: :bulletin_board,
+        t: :trustee,
+        v: :voter
+      }.freeze
+
+      INVERTED_AUTHOR_TYPE = AUTHOR_TYPE.invert.freeze
+
+      def initialize(message_id)
+        @message_id = message_id
+      end
+
+      def from_authority?
+        author_type == :authority
+      end
+
+      def from_trustee?
+        author_type == :trustee
+      end
+
+      def from_voter?
+        author_type == :voter
+      end
+
+      def author_type
+        @author_type ||= AUTHOR_TYPE[author.first.to_sym]
+      end
+
+      def author_id
+        @author_id ||= author.last
+      end
+
+      def authority_id
+        @authority_id ||= elements[0]
+      end
+
+      def election_id
+        @election_id = elements[0..1].join(".")
+      end
+
+      def type
+        @type = elements[2]
+      end
+
+      def subtype
+        @subtype = elements[3]
+      end
+
+      def to_s
+        @message_id
+      end
+
+      class << self
+        def format(unique_election_id, type_subtype, author_type, author_id)
+          "#{unique_election_id}.#{type_subtype}+#{INVERTED_AUTHOR_TYPE[author_type]}.#{author_id}"
+        end
+
+        def unique_election_id(authority_slug, election_id)
+          "#{authority_slug}.#{election_id}"
+        end
+      end
+
+      private
+
+      attr_accessor :message_id
+
+      def elements
+        @elements ||= parts.first.split(".", 4)
+      end
+
+      def author
+        @author ||= parts.last.split(".", 2)
+      end
+
+      def parts
+        @parts ||= message_id.split("+")
+      end
+    end
+  end
+end

data/lib/decidim/bulletin_board/version.rb

@@ -2,6 +2,6 @@
 
 module Decidim
   module BulletinBoard
-    VERSION = "0.3.1"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,56 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: decidim-bulletin_board
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - David Morcillo
 - Svenja Schäfer
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-10 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.1
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.1
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.1
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.1
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -83,16 +71,16 @@ dependencies:
   name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: wisper
   requirement: !ruby/object:Gem::Requirement
@@ -186,11 +174,13 @@ files:
 - bin/setup
 - decidim-bulletin_board.gemspec
 - lib/decidim/bulletin_board.rb
+- lib/decidim/bulletin_board/authority.rb
+- lib/decidim/bulletin_board/authority/create_election.rb
 - lib/decidim/bulletin_board/authority/get_election_status.rb
 - lib/decidim/bulletin_board/client.rb
-- lib/decidim/bulletin_board/create_election.rb
 - lib/decidim/bulletin_board/graphql/client.rb
 - lib/decidim/bulletin_board/jwk_utils.rb
+- lib/decidim/bulletin_board/message_identifier.rb
 - lib/decidim/bulletin_board/version.rb
 - lib/decidim/bulletin_board/voter.rb
 - lib/decidim/bulletin_board/voter/cast_vote.rb
@@ -199,7 +189,7 @@ homepage: https://github.com
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -215,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key:
+signing_key: 
 specification_version: 4
 summary: ''
 test_files: []

data/lib/decidim/bulletin_board/create_election.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module BulletinBoard
-    # This class handles the creation of an election.
-    class CreateElection
-      def initialize(election_data, message_id)
-        @client = BulletinBoard::Graphql::Client.client
-        @election_data = election_data
-        @message_id = message_id
-        @private_key = private_key
-      end
-
-      def self.call(election_data, message_id)
-        new(election_data, message_id).call
-      end
-
-      def call
-        args = {
-          message_id: message_id,
-          signed_data: encode_data(election_data)
-        }
-
-        response = client.query do
-          mutation do
-            createElection(messageId: args[:message_id], signedData: args[:signed_data]) do
-              election do
-                status
-              end
-              error
-            end
-          end
-        end
-
-        response.data.create_election
-      end
-
-      private
-
-      attr_reader :client, :election_data, :message_id
-
-      def private_key
-        @private_key ||= JwkUtils.import_private_key(BulletinBoard.identification_private_key)
-      end
-
-      def encode_data(election_data)
-        JWT.encode(election_data, private_key.keypair, "RS256")
-      end
-    end
-  end
-end