decidim-bulletin_board 0.4.0 → 0.6.0

data/lib/decidim/bulletin_board/graphql/client.rb

@@ -7,6 +7,7 @@ module Decidim
       class Client
         def self.client
           @client ||= Graphlient::Client.new(BulletinBoard.server,
+                                             schema_path: File.join(__dir__, "bb_schema.json"),
                                              headers: {
                                                "Authorization" => BulletinBoard.api_key
                                              })

data/lib/decidim/bulletin_board/version.rb

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

data/lib/decidim/bulletin_board/voter.rb

@@ -1,4 +1,3 @@
 # frozen_string_literal: true
 
 require "decidim/bulletin_board/voter/cast_vote"
-require "decidim/bulletin_board/voter/vote_form"

data/lib/decidim/bulletin_board/voter/cast_vote.rb

@@ -4,13 +4,14 @@ module Decidim
   module BulletinBoard
     module Voter
       # This command uses the GraphQL client to cast the vote.
-      class CastVote
-        include Wisper::Publisher
+      class CastVote < Decidim::BulletinBoard::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
-        def initialize(form)
-          @form = form
+        def initialize(election_id, voter_id, encrypted_vote)
+          @election_id = election_id
+          @voter_id = voter_id
+          @encrypted_vote = encrypted_vote
         end
 
         # Executes the command. Broadcasts these events:
@@ -20,17 +21,13 @@ module Decidim
         #
         # Returns nothing.
         def call
-          return broadcast(:error, form.errors.full_messages.join(". ")) unless form.valid?
-
-          args = {
-            message_id: form.message_id,
-            signed_data: form.signed_data
-          }
+          message_id = message_id(unique_election_id(election_id), "vote.cast", voter_id)
+          signed_data = sign_message(message_id, { content: encrypted_vote })
 
           begin
             response = client.query do
               mutation do
-                vote(messageId: args[:message_id], signedData: args[:signed_data]) do
+                vote(messageId: message_id, signedData: signed_data) do
                   pendingMessage do
                     status
                   end
@@ -49,11 +46,7 @@ module Decidim
 
         private
 
-        attr_reader :form
-
-        def client
-          @client ||= BulletinBoard::Graphql::Client.client
-        end
+        attr_reader :election_id, :voter_id, :encrypted_vote
       end
     end
   end

metadata

@@ -1,32 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: decidim-bulletin_board
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - David Morcillo
 - Svenja Schäfer
-autorequire: 
+- Leonardo Diez
+- Agustí B.R.
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-18 00:00:00.000000000 Z
+date: 2021-01-12 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.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.0
-- !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -155,6 +143,8 @@ description: ''
 email:
 - david@codegram.com
 - svenja@codegram.com
+- leo@codegram.com
+- agusti@codegram.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -170,26 +160,32 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
+- app/assets/config/decidim_bulletin_board_manifest.js
+- app/assets/javascripts/decidim/bulletin_board/decidim-bulletin_board.js
 - bin/console
 - bin/setup
 - decidim-bulletin_board.gemspec
 - lib/decidim/bulletin_board.rb
 - lib/decidim/bulletin_board/authority.rb
+- lib/decidim/bulletin_board/authority/close_ballot_box.rb
 - lib/decidim/bulletin_board/authority/create_election.rb
 - lib/decidim/bulletin_board/authority/get_election_status.rb
+- lib/decidim/bulletin_board/authority/open_ballot_box.rb
 - lib/decidim/bulletin_board/client.rb
+- lib/decidim/bulletin_board/command.rb
+- lib/decidim/bulletin_board/engine.rb
+- lib/decidim/bulletin_board/graphql/bb_schema.json
 - 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
-- lib/decidim/bulletin_board/voter/vote_form.rb
 homepage: https://github.com
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -205,7 +201,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/voter/vote_form.rb

@@ -1,71 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module BulletinBoard
-    module Voter
-      # A form object to handle some data transformation and validation to cast a vote.
-      class VoteForm
-        include ActiveModel::Validations
-
-        validates :election_data, :voter_data, :encrypted_vote, presence: true
-        validate :election_id_present
-        validate :voter_id_present
-
-        # Public: initialize the form
-        #
-        # bulletin_board_data - An instance of the bulletin board client
-        # election_data - A Hash including the necessary data from the election.
-        # voter_data - A Hash including the necessary data from the voter.
-        # encrypted_vote - A Hash including the encrypted vote to cast
-        def initialize(bulletin_board_client, election_data, voter_data, encrypted_vote)
-          @bulletin_board_client = bulletin_board_client
-          @election_data = election_data
-          @voter_data = voter_data
-          @encrypted_vote = encrypted_vote
-        end
-
-        # Public: returns a message identifier for the cast vote operation.
-        def message_id
-          @message_id ||= "#{election_id}.vote.cast+v.#{voter_id}"
-        end
-
-        # Public: uses the bulletin board client to sign the encrypted vote merged with the metadata
-        def signed_data
-          @signed_data ||= bulletin_board_client.sign_data(message)
-        end
-
-        private
-
-        attr_reader :bulletin_board_client, :election_data, :voter_data, :encrypted_vote
-
-        def election_id_present
-          errors.add(:election_data, "doesn't include the election id") unless election_id.present?
-        end
-
-        def election_id
-          return if election_data.blank?
-
-          election_data[:election_id]
-        end
-
-        def voter_id_present
-          errors.add(:voter_data, "doesn't include the voter id") unless voter_id.present?
-        end
-
-        def voter_id
-          return if voter_data.blank?
-
-          voter_data[:voter_id]
-        end
-
-        def message
-          {
-            iat: Time.now.to_i,
-            message_id: message_id,
-            content: encrypted_vote
-          }
-        end
-      end
-    end
-  end
-end