decidim-bulletin_board 0.9.0 → 0.11.0

data/lib/decidim/bulletin_board/command.rb

@@ -1,21 +1,20 @@
 # frozen_string_literal: true
 
-require "decidim/bulletin_board/graphql/client"
-
 module Decidim
   module BulletinBoard
     # The base class for all commands.
     class Command
       include Wisper::Publisher
 
-      delegate :authority_slug, :private_key, :unique_election_id, :build_message_id, to: :class
+      attr_reader :settings, :graphql
 
-      def sign_message(message_id, message)
-        JWT.encode(complete_message(message_id, message), private_key.keypair, "RS256")
+      def configure(settings, graphql)
+        @settings = settings
+        @graphql = graphql
       end
 
-      def client
-        @client ||= BulletinBoard::Graphql::Client.client
+      def sign_message(message_id, message)
+        JWT.encode(complete_message(message_id, message), settings.authority_private_key.keypair, "RS256")
       end
 
       def complete_message(message_id, message)
@@ -25,26 +24,12 @@ module Decidim
                       })
       end
 
-      class << self
-        def self.call(*args)
-          new(*args).call
-        end
-
-        def private_key
-          @private_key ||= JwkUtils.import_private_key(BulletinBoard.identification_private_key)
-        end
-
-        def authority_slug
-          @authority_slug ||= BulletinBoard.authority_name.parameterize
-        end
-
-        def unique_election_id(election_id)
-          Decidim::BulletinBoard::MessageIdentifier.unique_election_id(authority_slug, election_id)
-        end
+      def build_message_id(unique_election_id, type_subtype, voter_id = nil)
+        MessageIdentifier.format(unique_election_id, type_subtype, voter_id ? :voter : :authority, voter_id || settings.authority_slug)
+      end
 
-        def build_message_id(unique_election_id, type_subtype, voter_id = nil)
-          Decidim::BulletinBoard::MessageIdentifier.format(unique_election_id, type_subtype, voter_id ? :voter : :authority, voter_id || authority_slug)
-        end
+      def unique_election_id(election_id)
+        MessageIdentifier.unique_election_id(settings.authority_slug, election_id)
       end
     end
   end

data/lib/decidim/bulletin_board/graphql/bb_schema.json

@@ -209,6 +209,24 @@
                     "ofType": null
                   },
                   "defaultValue": null
+                },
+                {
+                  "name": "types",
+                  "description": null,
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
                 }
               ],
               "type": {
@@ -260,7 +278,7 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "String",
+                  "name": "JSON",
                   "ofType": null
                 }
               },
@@ -417,6 +435,24 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "decodedData",
+              "description": null,
+              "args": [
+
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "JSON",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "election",
               "description": null,

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module BulletinBoard
+    module Graphql
+      class Factory
+        # The Bulletin Board GraphQL client factory
+        def self.client_for(settings)
+          Graphlient::Client.new(settings.bulletin_board_server,
+                                 schema_path: File.join(__dir__, "bb_schema.json"),
+                                 headers: {
+                                   "Authorization" => settings.authority_api_key
+                                 })
+        end
+      end
+    end
+  end
+end

data/lib/decidim/bulletin_board/message_identifier.rb

@@ -41,15 +41,19 @@ module Decidim
       end
 
       def election_id
-        @election_id = elements[0..1].join(".")
+        @election_id ||= elements[0..1].join(".")
       end
 
       def type
-        @type = elements[2]
+        @type ||= elements[2]
       end
 
       def subtype
-        @subtype = elements[3]
+        @subtype ||= elements[3]
+      end
+
+      def type_subtype
+        @type_subtype ||= [type, subtype].compact.join(".")
       end
 
       def to_s

data/lib/decidim/bulletin_board/settings.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Decidim
+  module BulletinBoard
+    # The Bulletin Board settings class
+    class Settings
+      def initialize(config)
+        @bulletin_board_server = config.bulletin_board_server.presence
+        @bulletin_board_public_key = config.bulletin_board_public_key.presence
+
+        @authority_api_key = config.authority_api_key.presence
+        @authority_name = config.authority_name.presence
+        @authority_private_key = JwkUtils.import_private_key(config.authority_private_key) if config.authority_private_key.present?
+
+        @scheme_name = config.scheme_name.presence
+        @number_of_trustees = config.number_of_trustees.presence
+        @quorum = config.quorum.presence || number_of_trustees
+      end
+
+      def configured?
+        bulletin_board_server && bulletin_board_public_key && authority_api_key && authority_name && authority_private_key && scheme_name && number_of_trustees
+      end
+
+      attr_reader :bulletin_board_server, :bulletin_board_public_key,
+                  :authority_private_key, :authority_api_key, :authority_name,
+                  :scheme_name, :number_of_trustees, :quorum
+
+      def bulletin_board_public_key_rsa
+        @bulletin_board_public_key_rsa ||= JWT::JWK::RSA.import(bulletin_board_public_key).public_key
+      end
+
+      def authority_slug
+        @authority_slug ||= authority_name.parameterize
+      end
+
+      def authority_public_key
+        @authority_public_key ||= authority_private_key&.export
+      end
+    end
+  end
+end

data/lib/decidim/bulletin_board/version.rb

@@ -2,6 +2,6 @@
 
 module Decidim
   module BulletinBoard
-    VERSION = "0.9.0"
+    VERSION = "0.11.0"
   end
 end

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

@@ -33,7 +33,7 @@ module Decidim
           }
 
           begin
-            response = client.query do
+            response = graphql.query do
               mutation do
                 vote(messageId: args[:message_id], signedData: args[:signed_data]) do
                   pendingMessage do

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

@@ -22,7 +22,7 @@ module Decidim
           message_id = @message_id
 
           begin
-            response = client.query do
+            response = graphql.query do
               query do
                 pendingMessage(messageId: message_id) do
                   status

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: decidim-bulletin_board
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.11.0
 platform: ruby
 authors:
 - David Morcillo
 - Svenja Schäfer
 - Leonardo Diez
 - Agustí B.R.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-01 00:00:00.000000000 Z
+date: 2021-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -160,15 +160,16 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
-- app/assets/config/decidim_bulletin_board_manifest.js
+- app/assets/config/manifest.js
 - app/assets/javascripts/decidim/bulletin_board/decidim-bulletin_board.js
 - bin/console
+- bin/release
 - 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/end_vote.rb
+- lib/decidim/bulletin_board/authority/get_election_results.rb
 - lib/decidim/bulletin_board/authority/get_election_status.rb
 - lib/decidim/bulletin_board/authority/publish_results.rb
 - lib/decidim/bulletin_board/authority/start_key_ceremony.rb
@@ -178,18 +179,18 @@ files:
 - 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/graphql/factory.rb
 - lib/decidim/bulletin_board/jwk_utils.rb
 - lib/decidim/bulletin_board/message_identifier.rb
+- lib/decidim/bulletin_board/settings.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/get_pending_message_status.rb
 homepage: https://github.com
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -205,7 +206,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/authority.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-require "decidim/bulletin_board/authority/create_election"
-require "decidim/bulletin_board/authority/end_vote"
-require "decidim/bulletin_board/authority/get_election_status"
-require "decidim/bulletin_board/authority/start_key_ceremony"
-require "decidim/bulletin_board/authority/start_tally"
-require "decidim/bulletin_board/authority/start_vote"
-require "decidim/bulletin_board/authority/publish_results"

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

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module BulletinBoard
-    module Graphql
-      # The Bulletin Board GraphQL Client
-      class Client
-        def self.client
-          @client ||= Graphlient::Client.new(BulletinBoard.server,
-                                             schema_path: File.join(__dir__, "bb_schema.json"),
-                                             headers: {
-                                               "Authorization" => BulletinBoard.api_key
-                                             })
-        end
-      end
-    end
-  end
-end

data/lib/decidim/bulletin_board/voter.rb

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