decidim-core 0.12.2 → 0.13.0.pre1

data/app/models/decidim/identity.rb

@@ -3,6 +3,8 @@
 module Decidim
   # Store user's social identities
   class Identity < ApplicationRecord
+    include Decidim::DataPortability
+
     belongs_to :user, foreign_key: :decidim_user_id, class_name: "Decidim::User"
     belongs_to :organization, foreign_key: :decidim_organization_id, class_name: "Decidim::Organization"
 
@@ -11,6 +13,14 @@ module Decidim
 
     validate :same_organization
 
+    def self.user_collection(user)
+      where(decidim_user_id: user.id)
+    end
+
+    def self.export_serializer
+      Decidim::DataPortabilitySerializers::DataPortabilityIdentitySerializer
+    end
+
     private
 
     def same_organization

data/app/models/decidim/messaging/conversation.rb

@@ -8,6 +8,8 @@ module Decidim
     # a group or a one-to-one conversation.
     #
     class Conversation < ApplicationRecord
+      include Decidim::DataPortability
+
       has_many :participations, foreign_key: :decidim_conversation_id,
                                 class_name: "Decidim::Messaging::Participation",
                                 dependent: :destroy,
@@ -126,6 +128,14 @@ module Decidim
       def unread_count(user)
         receipts.unread_by(user).count
       end
+
+      def self.user_collection(user)
+        Decidim::Messaging::UserConversations.for(user)
+      end
+
+      def self.export_serializer
+        Decidim::DataPortabilitySerializers::DataPortabilityConversationSerializer
+      end
     end
   end
 end

data/app/models/decidim/notification.rb

@@ -2,11 +2,21 @@
 
 module Decidim
   class Notification < ApplicationRecord
+    include Decidim::DataPortability
+
     belongs_to :resource, foreign_key: "decidim_resource_id", foreign_type: "decidim_resource_type", polymorphic: true
     belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
 
     def event_class_instance
       @event_class_instance ||= event_class.constantize.new(resource: resource, event_name: event_name, user: user, extra: extra)
     end
+
+    def self.user_collection(user)
+      where(decidim_user_id: user.id)
+    end
+
+    def self.export_serializer
+      Decidim::DataPortabilitySerializers::DataPortabilityNotificationSerializer
+    end
   end
 end

data/app/models/decidim/participatory_space_private_user.rb

@@ -3,11 +3,21 @@
 module Decidim
   # This class gives a given User access to a given private ParticipatorySpacePrivateUser
   class ParticipatorySpacePrivateUser < ApplicationRecord
+    include Decidim::DataPortability
+
     belongs_to :user, class_name: "Decidim::User", foreign_key: :decidim_user_id
     belongs_to :privatable_to, polymorphic: true
 
     validate :user_and_participatory_space_same_organization
 
+    def self.user_collection(user)
+      where(decidim_user_id: user.id)
+    end
+
+    def self.export_serializer
+      Decidim::DataPortabilitySerializers::DataPortabilityParticipatorySpacePrivateUserSerializer
+    end
+
     private
 
     # Private: check if the participatory space and the user have the same organization

data/app/models/decidim/report.rb

@@ -3,6 +3,8 @@
 module Decidim
   # A reportable can be reported one time for each user.
   class Report < ApplicationRecord
+    include Decidim::DataPortability
+
     REASONS = %w(spam offensive does_not_belong).freeze
 
     belongs_to :moderation, foreign_key: "decidim_moderation_id", class_name: "Decidim::Moderation"
@@ -13,6 +15,14 @@ module Decidim
     validates :reason, inclusion: { in: REASONS }
     validate :user_and_moderation_same_organization
 
+    def self.user_collection(user)
+      where(decidim_user_id: user.id)
+    end
+
+    def self.export_serializer
+      Decidim::DataPortabilitySerializers::DataPortabilityReportSerializer
+    end
+
     private
 
     # Private: check if the moderation and the user have the same organization

data/app/models/decidim/user.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_dependency "devise/models/decidim_validatable"
+require_dependency "devise/models/decidim_newsletterable"
 require "valid_email2"
 
 module Decidim
@@ -10,12 +11,14 @@ module Decidim
     include Resourceable
     include Decidim::Followable
     include Decidim::Loggable
+    include Decidim::DataPortability
 
     OMNIAUTH_PROVIDERS = [:facebook, :twitter, :google_oauth2, (:developer if Rails.env.development?)].compact
     ROLES = %w(admin user_manager).freeze
 
     devise :invitable, :database_authenticatable, :registerable, :confirmable, :timeoutable,
            :recoverable, :rememberable, :trackable, :decidim_validatable,
+           :decidim_newsletterable,
            :omniauthable, omniauth_providers: OMNIAUTH_PROVIDERS,
                           request_keys: [:env], reset_password_keys: [:decidim_organization_id, :email],
                           confirmation_keys: [:decidim_organization_id, :email]
@@ -30,7 +33,7 @@ module Decidim
     has_many :following_follows, foreign_key: "decidim_user_id", class_name: "Decidim::Follow", dependent: :destroy
 
     validates :name, presence: true, unless: -> { deleted? }
-    validates :nickname, presence: true, unless: -> { deleted? || managed? }, length: { maximum: Decidim::User.nickname_max_length }
+    validates :nickname, presence: true, unless: -> { deleted? || managed? || name.blank? }, length: { maximum: Decidim::User.nickname_max_length }
     validates :locale, inclusion: { in: :available_locales }, allow_blank: true
     validates :tos_agreement, acceptance: true, allow_nil: false, on: :create
     validates :tos_agreement, acceptance: true, if: :user_invited?
@@ -137,6 +140,18 @@ module Decidim
       )
     end
 
+    def self.user_collection(user)
+      where(id: user.id)
+    end
+
+    def self.export_serializer
+      Decidim::DataPortabilitySerializers::DataPortabilityUserSerializer
+    end
+
+    def self.data_portability_images(user)
+      user_collection(user).map(&:avatar)
+    end
+
     def tos_accepted?
       return true if managed
       return false if accepted_tos_version.nil?

data/app/models/decidim/user_group.rb

@@ -5,6 +5,7 @@ module Decidim
   class UserGroup < ApplicationRecord
     include Decidim::Traceable
     include Decidim::Loggable
+    include Decidim::DataPortability
 
     belongs_to :organization, foreign_key: "decidim_organization_id", class_name: "Decidim::Organization"
 
@@ -42,6 +43,14 @@ module Decidim
       verified_at.blank? && rejected_at.blank?
     end
 
+    def self.user_collection(user)
+      user.user_groups
+    end
+
+    def self.export_serializer
+      Decidim::DataPortabilitySerializers::DataPortabilityUserGroupSerializer
+    end
+
     private
 
     # Private: Checks if the state user group is correct.

data/app/services/decidim/action_authorizer.rb

@@ -28,7 +28,7 @@ module Decidim
       raise AuthorizationError, "Missing data" unless component && action
 
       status_code, data = if authorization_handler_name
-                            authorization_handler.authorize(authorization, permission_options)
+                            authorization_handler.authorize(authorization, permission_options, component)
                           else
                             [:ok, {}]
                           end

data/app/uploaders/decidim/avatar_uploader.rb

@@ -7,11 +7,15 @@ module Decidim
 
     process :validate_dimensions
 
-    version :big do
+    version :profile do
+      process resize_to_fill: [536, 640] # double the size, for retina displays
+    end
+
+    version :big, from_version: :profile do
       process resize_to_fit: [80, 80]
     end
 
-    version :thumb do
+    version :thumb, from_version: :big do
       process resize_to_fit: [40, 40]
     end
 

data/app/uploaders/decidim/data_portability_uploader.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This class deals with saving data portability Zip Files to App
+  class DataPortabilityUploader < CarrierWave::Uploader::Base
+    # Override the directory where uploaded files will be stored.
+    # def store_dir
+    #   default_path = "tmp/data-portability/"
+    #   File.join(Rails.root, default_path)
+    # end
+
+    def store_dir
+      default_path = "tmp/data-portability/"
+
+      return File.join(Decidim.base_uploads_path, default_path) if Decidim.base_uploads_path.present?
+      default_path
+    end
+  end
+end

data/app/views/decidim/data_portability/export.html.erb

@@ -0,0 +1 @@
+<%= t(".ready") %>

data/app/views/decidim/data_portability/show.html.erb

@@ -0,0 +1,5 @@
+<div class="row data-portability">
+  <strong><%= t(".download_data") %></strong>
+  <p><%= t(".download_data_description", user_email: current_user.email).html_safe %></p>
+  <%= button_to t(".request_data"), export_data_portability_path, class: "button secondary", data: { disable: true } %>
+</div>

data/app/views/decidim/devise/invitations/edit.html.erb

@@ -56,7 +56,7 @@
             <legend><%= t("newsletter_title", scope: "decidim.devise.registrations.new") %></legend>
             <fieldset>
               <div class="field">
-                <%= f.check_box :newsletter_notifications, label: t("newsletter", scope: "decidim.devise.registrations.new") %>
+                <%= check_box_tag :"#{resource_name}[newsletter_notifications]", label: t("newsletter", scope: "decidim.devise.registrations.new") %>
               </div>
             </fieldset>
           </div>

data/app/views/decidim/devise/shared/_newsletter_modal.html.erb

@@ -1,25 +1,25 @@
 <div class="reveal" id="sign-up-newsletter-modal" data-reveal>
   <div class="reveal__header">
     <h3 class="reveal__title"><%= t(".title") %></h3>
-    <button class="close-button" data-close aria-label="Close modal"
+    <button class="close-button" data-close aria-label="<%= t(".buttons.close_modal") %>"
       type="button">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>
 
   <div class="row">
-    <div class="columns medium-10 medium-centered">
-      <p><%= t(".notice") %></p>
-    </div>
-    <div class="columns medium-10 medium-centered">
-      <div class="row">
-        <div class="columns medium-6">
-          <button type="buton" class="check-newsletter clear button secondary expanded" data-check=false><%= t(".buttons.uncheck") %></button>
-        </div>
-        <div class="columns medium-6">
-          <button type="buton" class="check-newsletter button expanded" data-check=true><%= t(".buttons.check") %></button>
-        </div>
-      </div>
+    <%= t(".notice").html_safe %>
+  </div>
+
+  <div class="row">
+    <div class="column flex-center">
+      <button type="buton" class="check-newsletter clear button secondary expanded" data-check=false>
+        <%= t(".buttons.uncheck") %>
+      </button>
+
+      <button type="buton" class="check-newsletter button expanded" data-check=true>
+        <%= t(".buttons.check") %>
+      </button>
     </div>
   </div>
 </div>

data/app/views/decidim/export_mailer/data_portability_export.html.erb

@@ -0,0 +1,2 @@
+<%= t(".click_button", date: l(Decidim.data_portability_expiry_time.from_now, format: :decidim_short) ).html_safe %><br />
+<%= link_to t(".download"), download_file_data_portability_url(host: @organization.host, token: @token), class: "button expanded hollow button--sc" %>

data/app/views/decidim/invitations/index.html.erb

@@ -0,0 +1,48 @@
+<main class="wrapper">
+  <div class="row collapse">
+    <div class="columns medium-9 medium-centered">
+      <div class="card">
+        <div class="card__content">
+          <h3><%== t(".invitations_title", organization_name: content_tag(:strong, current_organization.name)) %></h3>
+          <p><%= t(".invitations_subtitle") %></p>
+          <%= decidim_form_for @form, url: account_invitations_path do |form| %>
+            <div class="row collapse mt-sm mb-s">
+              <% 3.times do |index| %>
+              <div class="row">
+                <div class="columns medium-6">
+                  <label>
+                    <%= t(".friend_email", index: 2 * index + 1) %>
+                    <%= form.text_field "email_#{2 * index + 1}", placeholder: "email@example.org", required: false, label: false %>
+                  </label>
+                </div>
+                <div class="columns medium-6">
+                  <label>
+                    <%= t(".friend_email", index: 2 * index + 2) %>
+                    <%= form.text_field "email_#{2 * index + 2}", placeholder: "email@example.org", required: false, label: false %>
+                  </label>
+                </div>
+              </div>
+              <% end %>
+            </div>
+            <div class="row collapse mb-sm">
+              <div class="text-medium">
+                <%= cell(
+                  "decidim/toggle",
+                  nil,
+                  label: cell("decidim/invitations_toggle").label,
+                  content: cell("decidim/invitations_toggle", nil, form: form).content
+                ) %>
+              </div>
+            </div>
+            <%= form.submit t(".invite"), class: "button expanded" %>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="row collapse">
+    <div class="columns text-center">
+      <%= link_to t(".visit_your_profile"), decidim.profile_path(current_user.nickname), class: "button secondary light" %>
+    </div>
+  </div>
+</main>

data/app/views/decidim/newsletters_opt_in_mailer/notify.html.erb

@@ -0,0 +1,23 @@
+<p><%= t ".hello" %></p>
+
+<p><%= t ".body_1", organization_name: h(@organization.name) %></p>
+
+<p><%= t ".body_2" %></p>
+
+<table class="button radius" style="margin: 16px auto;">
+  <tr>
+    <td>
+      <table>
+        <tr>
+          <td>
+            <%= link_to t(".button"), decidim.newsletters_opt_in_url(token: @token, host: @organization.host), method: "PUT", class: "button",  target: "_blank" %>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+<p><%= t ".body_3" %></p>
+
+<p><%= t(".greetings", organization_name: h(@organization.name), organization_url: decidim.root_url(host: @organization.host)).html_safe %></p>

data/app/views/decidim/profiles/_user.html.erb

@@ -1,6 +1,6 @@
 <% present(user) do |profile_user| %>
   <div class="card">
-    <%= image_tag profile_user.avatar_url(:big), class: "card__image card__image--larger" %>
+    <%= image_tag profile_user.avatar_url(:profile), class: "card__image card__image--larger" %>
     <div class="card__content">
       <h5>
         <div><strong><%= profile_user.name %></strong></div>

data/app/views/devise/mailer/invite_friend.html.erb

@@ -0,0 +1,27 @@
+<p><%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %></p>
+
+<p>
+  <%= t("devise.mailer.invitation_instructions.invited_you_as_friend", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
+</p>
+
+<% if @opts[:custom_text].present? %>
+<p><%= t("devise.mailer.invite_friend.friend_custom_text") %></p>
+
+<p>
+  <em>
+    <%= @opts[:custom_text] %>
+  </em>
+</p>
+<% end %>
+
+<p>
+  <%= t("devise.mailer.invite_friend.accept_invitation") %>
+</p>
+
+<p><%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, invitation_token: @token, invite_redirect: decidim_admin.root_path, host: @resource.organization.host) %></p>
+
+<% if @resource.invitation_due_at %>
+  <p><%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :long)) %></p>
+<% end %>
+
+<p><%= t("devise.mailer.invitation_instructions.ignore").html_safe %></p>

data/app/views/devise/mailer/invite_friend.text.erb

@@ -0,0 +1,19 @@
+<%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %>
+
+<%= t("devise.mailer.invitation_instructions.invited_you_as_friend", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
+
+<% if @opts[:custom_text].present? %>
+<%= t("devise.mailer.invite_friend.friend_custom_text") %>
+
+<%= @opts[:custom_text] %>
+<% end %>
+
+<%= t("devise.mailer.invite_friend.accept_invitation") %>
+
+<%= accept_invitation_url(@resource, invitation_token: @token, invite_redirect: decidim_admin.root_path, host: @resource.organization.host) %>
+
+<% if @resource.invitation_due_at %>
+<%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :long)) %>
+<% end %>
+
+<%= t("devise.mailer.invitation_instructions.ignore").html_safe %>

data/app/views/layouts/decidim/_user_menu.html.erb

@@ -4,6 +4,7 @@
 <% end %>
 <li><%= link_to t(".notifications"), decidim.profile_notifications_path(current_user.nickname) %></li>
 <li><%= link_to t(".conversations"), decidim.conversations_path %></li>
+<li><%= link_to t(".invite_friends"), decidim.account_invitations_path %></li>
 <% if allowed_to? :read, :admin_dashboard %>
   <li><%= link_to t(".admin_dashboard"), decidim_admin.root_path %></li>
 <% end %>