+
<%= form_tag users_api_secret_path(api_secret.id), method: :delete do %>
<%= button_tag "Revoke", class: "big-action danger-button" %>
<% end %>
diff --git a/config/initializers/reserved_words.rb b/config/initializers/reserved_words.rb
index 8e8783d95..7cc977a63 100644
--- a/config/initializers/reserved_words.rb
+++ b/config/initializers/reserved_words.rb
@@ -32,6 +32,7 @@ class ReservedWords
rly
connect
chat_channels
+ challenge
email_subscriptions
social_previews
code-of-conduct
diff --git a/config/routes.rb b/config/routes.rb
index fc1b8ca68..a93bcaa7c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -51,6 +51,8 @@ Rails.application.routes.draw do
post "full_delete"
patch "user_status"
post "merge"
+ delete "remove_identity"
+ post "recover_identity"
end
end
resources :welcome, only: %i[index create]
diff --git a/db/migrate/20190703003817_create_backup_data_table.rb b/db/migrate/20190703003817_create_backup_data_table.rb
new file mode 100644
index 000000000..b806cda5e
--- /dev/null
+++ b/db/migrate/20190703003817_create_backup_data_table.rb
@@ -0,0 +1,12 @@
+class CreateBackupDataTable < ActiveRecord::Migration[5.2]
+ def change
+ create_table :backup_data do |t|
+ t.bigint :instance_id, null: false
+ t.string :instance_type, null: false
+ t.bigint :instance_user_id
+ t.jsonb :json_data, null: false
+
+ t.timestamps null: false
+ end
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index adf402aa2..95da46377 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -12,7 +12,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2019_06_28_123548) do
+ActiveRecord::Schema.define(version: 2019_07_03_003817) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -144,6 +144,15 @@ ActiveRecord::Schema.define(version: 2019_06_28_123548) do
t.index ["user_id"], name: "index_articles_on_user_id"
end
+ create_table "backup_data", force: :cascade do |t|
+ t.datetime "created_at", null: false
+ t.bigint "instance_id", null: false
+ t.string "instance_type", null: false
+ t.bigint "instance_user_id"
+ t.jsonb "json_data", null: false
+ t.datetime "updated_at", null: false
+ end
+
create_table "badge_achievements", force: :cascade do |t|
t.bigint "badge_id", null: false
t.datetime "created_at", null: false
diff --git a/spec/factories/identities.rb b/spec/factories/identities.rb
index 5dc5f2e4d..b6e7cd57b 100644
--- a/spec/factories/identities.rb
+++ b/spec/factories/identities.rb
@@ -6,5 +6,12 @@ FactoryBot.define do
provider { "github" }
token { rand(100_000) }
secret { rand(100_000) }
+ auth_data_dump do
+ {
+ "info" => {
+ "nickname" => "something"
+ }
+ }
+ end
end
end
diff --git a/spec/models/backup_data_spec.rb b/spec/models/backup_data_spec.rb
new file mode 100644
index 000000000..1c4cb4088
--- /dev/null
+++ b/spec/models/backup_data_spec.rb
@@ -0,0 +1,11 @@
+require "rails_helper"
+
+RSpec.describe BackupData, type: :model do
+ describe "validations" do
+ it { is_expected.to validate_presence_of(:instance_type) }
+ it { is_expected.to validate_presence_of(:instance_id) }
+ it { is_expected.to validate_presence_of(:json_data) }
+ it { is_expected.to belong_to(:instance) }
+ it { is_expected.to belong_to(:instance_user).class_name("User") }
+ end
+end
diff --git a/spec/requests/internal_users_spec.rb b/spec/requests/internal_users_spec.rb
index 820c54bfa..9f54c08cf 100644
--- a/spec/requests/internal_users_spec.rb
+++ b/spec/requests/internal_users_spec.rb
@@ -45,4 +45,36 @@ RSpec.describe "internal/users", type: :request do
expect(user.reload.username).to include("spam")
end
end
+
+ describe "DELETE internal/users/:id/remove_identity" do
+ it "removes the given identity" do
+ identity = user.identities.first
+ delete "/internal/users/#{user.id}/remove_identity", params: { user: { identity_id: identity.id } }
+ expect { identity.reload }.to raise_error ActiveRecord::RecordNotFound
+ end
+
+ it "updates their social account's username to nil" do
+ identity = user.identities.first
+ delete "/internal/users/#{user.id}/remove_identity", params: { user: { identity_id: identity.id } }
+ expect(user.reload.github_username).to eq nil
+ end
+ end
+
+ describe "POST internal/users/:id/recover_identity" do
+ it "recovers a deleted identity" do
+ identity = user.identities.first
+ backup = BackupData.backup!(identity)
+ identity.delete
+ post "/internal/users/#{user.id}/recover_identity", params: { user: { backup_data_id: backup.id } }
+ expect(identity).to eq Identity.first
+ end
+
+ it "deletes the backup data" do
+ identity = user.identities.first
+ backup = BackupData.backup!(identity)
+ identity.delete
+ post "/internal/users/#{user.id}/recover_identity", params: { user: { backup_data_id: backup.id } }
+ expect { backup.reload }.to raise_error ActiveRecord::RecordNotFound
+ end
+ end
end