diff --git a/app/web/views/remote.erb b/app/web/views/remote.erb
new file mode 100644
index 0000000..e0dd4b9
--- /dev/null
+++ b/app/web/views/remote.erb
@@ -0,0 +1,20 @@
+
diff --git a/app/web/views/remote_confirmation.erb b/app/web/views/remote_confirmation.erb
new file mode 100644
index 0000000..857175d
--- /dev/null
+++ b/app/web/views/remote_confirmation.erb
@@ -0,0 +1,7 @@
+
<%= message %>
+
diff --git a/config.ru b/config.ru
index f902766..b21093c 100644
--- a/config.ru
+++ b/config.ru
@@ -12,6 +12,9 @@ use Web::HomeController
use Web::ProfilesController
use Web::TagsController
+use Web::RemoteController
+use Web::RemoteConfirmationsController
+
use Web::LoginController
# TODO: change from RPC alike "register" to "registration"
use Web::RegistrationsController
diff --git a/config/environment.rb b/config/environment.rb
index f275050..e823a98 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -20,7 +20,7 @@ class Roost
##
# Holds the configuration for Roost. Mainly event-sourcery config.
class Config
- attr_accessor :database_url, :secret_base, :web_url
+ attr_accessor :database_url, :secret_base, :web_url, :domain
end
def self.config
@@ -104,6 +104,7 @@ def self.base_path
Roost.configure do |config|
config.web_url = 'https://example.com'
+ config.domain = 'example.com'
config.secret_base = ENV['SECRET_BASE']
config.database_url = ENV['DATABASE_URL']
diff --git a/lib/handle.rb b/lib/handle.rb
index 357c0a2..b42d186 100644
--- a/lib/handle.rb
+++ b/lib/handle.rb
@@ -5,27 +5,32 @@
# Parses and formats consistently @harry@example.org alike handles over domains
# and into usenames and domains
class Handle
- attr_reader :username, :uri
+ attr_reader :username, :domain
- def initialize(username, uri = Roost.config.web_url)
- @uri = uri
+ def initialize(username,
+ handle_domain = Roost.config.domain,
+ local_domain = handle_domain)
+ @domain = handle_domain
+ @local_domain = local_domain
@username = username
end
def self.parse(handle)
uri = URI.parse("http://#{handle.gsub(/^@/, '')}")
- new(uri.user, URI::HTTP.build(host: uri.host).to_s)
- end
-
- def domain
- URI.parse(uri).host
+ new(uri.user, uri.host)
end
def to_s
+ return '' if username.to_s.empty?
+
"@#{username}@#{domain}"
end
+ def local?
+ domain == @local_domain
+ end
+
def ==(other)
- username == other.username && uri == other.uri
+ username == other.username && domain == other.domain
end
end
diff --git a/lib/uuid_gen.rb b/lib/uuid_gen.rb
new file mode 100644
index 0000000..0dbd068
--- /dev/null
+++ b/lib/uuid_gen.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+##
+# Generates a UUID for a Namespace and an readable identifier
+class UUIDGen
+ include UUIDTools
+
+ # TODO: replace with HANDLE namespace
+ NS_USERNAME = UUID.parse('fb0f6f73-a16d-4032-b508-16519fb4a73a').freeze
+ NS_EMAIL = UUID.parse('2282b78c-85d6-419f-b240-0263d67ee6e6').freeze
+ NS_HANDLE = UUID.parse('7712db07-df77-419a-8c93-2071e8fd2c50').freeze
+
+ def self.uuid(namespace, identifier)
+ UUID.sha1_create(namespace, identifier)
+ end
+end
diff --git a/test/aggregates/member_test.rb b/test/aggregates/member_test.rb
index 715ef9c..1fdafb8 100644
--- a/test/aggregates/member_test.rb
+++ b/test/aggregates/member_test.rb
@@ -21,10 +21,7 @@ class MemberTest < Minitest::Spec
it_sets_attribute(:add_member, 'email')
it_sets_attribute(:add_member, 'name')
- it 'add_member sets handle from username' do
- subject.add_member('username' => 'harry')
- assert_equal(subject.handle, Handle.new('harry'))
- end
+ it_sets_attribute(:add_member, 'handle')
it '#add_tag adds a tag' do
author_id = fake_uuid(Aggregates::Member, 2)
@@ -50,6 +47,7 @@ class MemberTest < Minitest::Spec
)
end
+ # TODO: still needed?
it 'MemberAdded sets added attribute to true' do
assert(Aggregates::Member.new(id, [MemberAdded.new]).attributes[:added])
end
diff --git a/test/aggregates/peer_test.rb b/test/aggregates/peer_test.rb
new file mode 100644
index 0000000..9b6154a
--- /dev/null
+++ b/test/aggregates/peer_test.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+module Aggregates
+ ##
+ # Unit test for the more complex logic in Peer Aggregate
+ class PeerTest < Minitest::Spec
+ let(:applied_events) { [] }
+ let(:aggregate_id) { fake_uuid(Aggregates::Peer, 1) }
+
+ let(:subject) { Aggregates::Peer.new(aggregate_id, applied_events) }
+
+ it '.name defaults to "Synching..."' do
+ assert_equal('Synching...', subject.name)
+ end
+
+ it '.bio defaults to "Synching..."' do
+ assert_equal('Synching...', subject.bio)
+ end
+ end
+end
diff --git a/test/aggregates/registration_test.rb b/test/aggregates/registration_test.rb
index 858d122..dd6c385 100644
--- a/test/aggregates/registration_test.rb
+++ b/test/aggregates/registration_test.rb
@@ -14,7 +14,7 @@ class RegistrationTest < Minitest::Spec
let(:payload) do
{
- username: 'hpotter',
+ handle: '@hpotter@example.com',
password: 'caput draconis',
email: 'hpotter@hogwards.edu.wiz'
}
@@ -28,7 +28,7 @@ class RegistrationTest < Minitest::Spec
end
it 'sets username' do
- assert_equal(subject.username, 'hpotter')
+ assert_equal(subject.handle, '@hpotter@example.com')
end
it 'sets email' do
diff --git a/test/commands/registration/new_registration_test.rb b/test/commands/registration/new_registration_test.rb
index e9a62ec..d5d6d17 100644
--- a/test/commands/registration/new_registration_test.rb
+++ b/test/commands/registration/new_registration_test.rb
@@ -1,6 +1,7 @@
# frozen_string_literal: true
require 'test_helper'
+require 'sinatra'
require 'bcrypt'
class NewRegistrationCommandTest < Minitest::Spec
@@ -8,7 +9,10 @@ class NewRegistrationCommandTest < Minitest::Spec
subject { subject_class.new(params) }
describe 'with email' do
- let(:params) { { 'email' => 'harry@example.com' } }
+ let(:params) do
+ Sinatra::IndifferentHash.new.merge(email: 'harry@example.com')
+ end
+
let(:uuid_v5_for_email) { '377fc540-ff6b-5ddc-9ad8-1d9e9917f626' }
it 'generates a UUIDv5 for this email' do
@@ -17,7 +21,9 @@ class NewRegistrationCommandTest < Minitest::Spec
end
describe 'without email' do
- let(:params) { { 'email' => '' } }
+ let(:params) do
+ Sinatra::IndifferentHash.new.merge(email: '')
+ end
it 'has no aggregate_id' do
assert_equal(subject.aggregate_id, '')
@@ -26,7 +32,10 @@ class NewRegistrationCommandTest < Minitest::Spec
describe 'password' do
let(:password) { 'caput draconis' }
- subject { subject_class.new('password' => password) }
+ subject do
+ params = Sinatra::IndifferentHash.new.merge(password: password)
+ subject_class.new(params)
+ end
it 'generates a secure hash of the password' do
assert_equal(
@@ -38,34 +47,34 @@ class NewRegistrationCommandTest < Minitest::Spec
describe 'validate' do
let(:valid_params) do
- {
- 'email' => 'harry@example.com',
- 'usernane' => 'hpotter',
- 'password' => 'caput draconis'
- }
+ Sinatra::IndifferentHash.new.merge(
+ email: 'harry@example.com',
+ handle: Handle.new('hpotter').to_s,
+ password: 'caput draconis'
+ )
end
it 'raises BadRequest when email is empty' do
assert_raises(BadRequest, 'email is blank') do
- subject_class.new(valid_params.merge('email' => '')).validate
+ subject_class.new(valid_params.merge(email: '')).validate
end
end
it 'raises BadRequest when email is nil' do
assert_raises(BadRequest, 'email is blank') do
- subject_class.new(valid_params.merge('email' => nil)).validate
+ subject_class.new(valid_params.merge(email: nil)).validate
end
end
it 'raises BadRequest when username is empty' do
- assert_raises(BadRequest, 'username is blank') do
- subject_class.new(valid_params.merge('username' => '')).validate
+ assert_raises(BadRequest, 'handle is blank') do
+ subject_class.new(valid_params.merge(handle: '')).validate
end
end
it 'raises BadRequest when password is empty' do
assert_raises(BadRequest, 'password is blank') do
- subject_class.new(valid_params.merge('password' => '')).validate
+ subject_class.new(valid_params.merge(password: '')).validate
end
end
end
diff --git a/test/commands/session/start_test.rb b/test/commands/session/start_test.rb
index 27aa546..42cf902 100644
--- a/test/commands/session/start_test.rb
+++ b/test/commands/session/start_test.rb
@@ -1,20 +1,27 @@
# frozen_string_literal: true
require 'test_helper'
+require 'sinatra'
class SessionStartCommandTest < Minitest::Spec
let(:projection) { Minitest::Mock.new }
- let(:params) { { 'username' => 'hpotter', 'password' => 'caput draconis' } }
+ let(:params) do
+ Sinatra::IndifferentHash.new.merge(
+ { handle: Handle.new('hpotter').to_s, password: 'caput draconis' }
+ )
+ end
let(:member) { nil }
subject do
Commands::Session::Start::Command.new(params, projection: projection)
end
- before { projection.expect(:find_by, member, [{ username: 'hpotter' }]) }
+ before do
+ projection.expect(:find_by, member, [{ handle: '@hpotter@example.com' }])
+ end
describe 'with username' do
- let(:uuid_v5_for_username) { '404fd9f9-c5fc-5b21-b2a9-9ad650520aff' }
+ let(:uuid_v5_for_username) { 'f0f63857-aa2b-5260-ab3d-886116f0f369' }
it 'generates a UUIDv5 for this username' do
assert_equal(uuid_v5_for_username, subject.aggregate_id)
@@ -22,7 +29,7 @@ class SessionStartCommandTest < Minitest::Spec
end
describe 'without username' do
- before { params['username'] = '' }
+ before { params[:handle] = '' }
it 'handles empty username' do
assert_equal(subject.aggregate_id, '')
@@ -44,7 +51,7 @@ class SessionStartCommandTest < Minitest::Spec
end
it "fails if passwords don't match" do
- params['password'] = 'pure-blood'
+ params[:password] = 'pure-blood'
subject = Commands::Session::Start::Command.new(
params,
projection: projection
diff --git a/test/integration/api/member_authenticates_test.rb b/test/integration/api/member_authenticates_test.rb
index e13a5db..c8d8a4e 100644
--- a/test/integration/api/member_authenticates_test.rb
+++ b/test/integration/api/member_authenticates_test.rb
@@ -33,7 +33,7 @@ def secret
aggregate_id: workflow.aggregate_id,
name: workflow.member_name,
email: workflow.member_email,
- handle: '@@example.com'
+ handle: workflow.member_handle
},
parsed_response
)
diff --git a/test/integration/web/federated_contacts_test.rb b/test/integration/web/federated_contacts_test.rb
new file mode 100644
index 0000000..63ccdc0
--- /dev/null
+++ b/test/integration/web/federated_contacts_test.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+##
+# As a member using the web-app
+# When I visit another members' profile
+# And I click the "add to contacts" button
+# Then the member is added to my contacts
+class FederatedContactsTest < Minitest::WebSpec
+ before do
+ skip 'implement remote flow first'
+ harry
+ as(harry)
+
+ # INK: remote_action.
+ adds_contact.upto(:contact_added)
+ end
+
+ it 'adds another member to contacts' do
+ # NOTE that the handle uses .com and rons email .org
+ assert_content(
+ flash(:success),
+ 'ron@example.com was added to your contacts'
+ )
+
+ visit '/contacts'
+ assert_content('ron@example.com')
+ end
+end
diff --git a/test/integration/web/member_logs_in_test.rb b/test/integration/web/member_logs_in_test.rb
index 8a185d6..64bc546 100644
--- a/test/integration/web/member_logs_in_test.rb
+++ b/test/integration/web/member_logs_in_test.rb
@@ -19,7 +19,7 @@ class MemberLogsInTest < Minitest::WebSpec
end
it 'logs in using credentials set at test' do
- fill_in('Username', with: @workflow.form_attributes[:username])
+ fill_in('Handle', with: @workflow.form_attributes[:username])
fill_in('Password', with: @workflow.form_attributes[:password])
click_button('Login')
@@ -30,7 +30,7 @@ class MemberLogsInTest < Minitest::WebSpec
end
it 'attempts to login using wrong password' do
- fill_in('Username', with: @workflow.form_attributes[:username])
+ fill_in('Handle', with: @workflow.form_attributes[:username])
fill_in('Password', with: 'pure-blood')
click_button('Login')
diff --git a/test/integration/web/remote_action_test.rb b/test/integration/web/remote_action_test.rb
new file mode 100644
index 0000000..01578d8
--- /dev/null
+++ b/test/integration/web/remote_action_test.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+##
+# As a member of this.example.com instance
+# When I visit other.example.com instance
+# And I request an action there
+# Then I am am presented with a form for my handle
+# And when I fill that form and click "{action}" button
+# Then I am redirected to my own instance with the proper payload
+# So that I can finalize the action on my own instance
+#
+# NOTE: {action} is any of (but not limited to), add contact, tag, annotate,
+# etc.
+class RemoteActionTest < Minitest::WebSpec
+ let(:handle) { luna[:handle] }
+
+ it 'adds remote member as contact' do
+ landing_path = at(ravenclaw) do
+ visit "/m/#{handle}"
+ click_icon('account-plus')
+
+ fill_in(
+ "Provide your handle to follow #{handle}",
+ with: '@harry@example.com'
+ )
+ click_button('Follow')
+ page.current_path
+ end
+
+ # Revisit the page to open it with harry as session
+ as(harry)
+ visit landing_path
+
+ assert_content(page, "As @harry@example.com you want to follow #{handle}")
+ click_button('Confirm')
+ assert_content(flash(:success), "#{handle} was added to your contacts")
+
+ process_events(%w[contact_fetch_requested contact_added])
+
+ visit '/contacts'
+ assert_content(luna[:handle])
+ end
+
+ # TODO: handle non-logged in on local.
+ # TODO: handle authentication properly with oauth secrets exchange.
+
+ private
+
+ def ravenclaw
+ @ravenclaw ||= RemoteInstance.new('ravenclaw.example.org', self)
+ end
+end
diff --git a/test/integration/web/visitor_registers_test.rb b/test/integration/web/visitor_registers_test.rb
index 574a8c5..4558db3 100644
--- a/test/integration/web/visitor_registers_test.rb
+++ b/test/integration/web/visitor_registers_test.rb
@@ -70,7 +70,7 @@ class VisitorRegistersTest < Minitest::WebSpec
assert_content(
find('.notification.is-error'),
- 'username is blank'\
+ 'handle is blank'\
)
end
end
diff --git a/test/lib/handle_test.rb b/test/lib/handle_test.rb
index 7cb7653..87d06f9 100644
--- a/test/lib/handle_test.rb
+++ b/test/lib/handle_test.rb
@@ -5,22 +5,37 @@
##
# Test the Handle library
class HandleTest < Minitest::Spec
+ describe '#local?' do
+ it 'is false when the domain is not our domain' do
+ refute Handle.new('ron', 'example.org', 'example.com').local?
+ end
+
+ it 'is true when the domain is our domain' do
+ assert Handle.new('ron', 'example.org', 'example.org').local?
+ end
+ end
+
it 'parses @ron@example.org handles and strips the @' do
assert_equal(Handle.parse('@ron@example.org').username, 'ron')
end
it 'parses ron@example.org handles' do
- assert_equal(Handle.parse('@ron@example.org').username, 'ron')
+ assert_equal(Handle.parse('ron@example.org').username, 'ron')
end
it 'parses ron@any.example.org handles' do
- assert_equal(Handle.parse('@ron@any.example.org').domain, 'any.example.org')
+ assert_equal(Handle.parse('ron@any.example.org').domain, 'any.example.org')
end
it 'builds a handle as string from a username using local web_url' do
assert_equal(Handle.new('harry').to_s, '@harry@example.com')
end
+ it 'returns empty string when username is empty' do
+ assert_empty(Handle.new(nil).to_s)
+ assert_empty(Handle.new('').to_s)
+ end
+
it 'is equal when both url and username are equal' do
assert_equal(Handle.new('harry'), Handle.new('harry'))
assert_equal(
diff --git a/test/support/data_helpers.rb b/test/support/data_helpers.rb
index 9289fab..e49498f 100644
--- a/test/support/data_helpers.rb
+++ b/test/support/data_helpers.rb
@@ -10,6 +10,20 @@ module DataHelpers
'Aggregates::Contact' => 4
}.freeze
+ def luna
+ return @_luna if @_luna
+
+ @_luna = {
+ handle: '@luna@ravenclaw.example.org',
+ username: 'luna',
+ email: 'luna@ravenclaw.example.org',
+ password: 'secret'
+ }
+ member_registers(@_luna).upto(:confirmed).html
+
+ @_luna
+ end
+
protected
##
diff --git a/test/support/remote_helpers.rb b/test/support/remote_helpers.rb
new file mode 100644
index 0000000..e8917b0
--- /dev/null
+++ b/test/support/remote_helpers.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+##
+# Helpers for testing events.
+module RemoteHelpers
+ def at(instance, &block)
+ web_url_was = config.web_url
+ domain_was = config.domain
+ fqdn = instance.fqdn
+
+ move_to_instance(URI::HTTP.build(host: fqdn, path: '').to_s, fqdn)
+ Capybara.using_session("on #{fqdn}") { instance.instance_eval(&block) }
+ ensure
+ move_to_instance(web_url_was, domain_was)
+ end
+
+ private
+
+ def move_to_instance(web_url, domain)
+ config.web_url = web_url
+ config.domain = domain
+ end
+
+ def config
+ Roost.config
+ end
+
+ # Test standin for a server, instance, that is external.
+ class RemoteInstance < SimpleDelegator
+ attr_reader :fqdn
+
+ def initialize(fqdn, test_context)
+ @fqdn = fqdn
+ super(test_context)
+ end
+ end
+end
diff --git a/test/support/workflows/add_member.rb b/test/support/workflows/add_member.rb
index 2542b9b..6a3340d 100644
--- a/test/support/workflows/add_member.rb
+++ b/test/support/workflows/add_member.rb
@@ -21,7 +21,11 @@ def member_name
end
def member_email
- 'harry@example.com'
+ 'harry@example.email'
+ end
+
+ def member_handle
+ '@harry@example.com'
end
def aggregate_id
@@ -34,6 +38,7 @@ def member_attributes
{
aggregate_id: aggregate_id,
name: member_name,
+ handle: member_handle,
email: member_email
}
end
diff --git a/test/support/workflows/member_logs_in.rb b/test/support/workflows/member_logs_in.rb
index 2310e5b..53914df 100644
--- a/test/support/workflows/member_logs_in.rb
+++ b/test/support/workflows/member_logs_in.rb
@@ -7,7 +7,7 @@ class MemberLogsIn < Base
def logged_in
visit_login
- fill_in('Username', with: form_attributes[:username])
+ fill_in('Handle', with: form_attributes[:username])
fill_in('Password', with: form_attributes[:password])
click_button('Login')
diff --git a/test/support/workflows/member_registers.rb b/test/support/workflows/member_registers.rb
index b5a9226..b421da3 100644
--- a/test/support/workflows/member_registers.rb
+++ b/test/support/workflows/member_registers.rb
@@ -8,7 +8,7 @@ def registered
visit '/'
click_link 'Register'
- fill_in('Username', with: form_attributes[:username])
+ fill_in('Handle', with: form_attributes[:username])
fill_in('Password', with: form_attributes[:password])
fill_in('Email', with: form_attributes[:email])
click_button('Register')
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 8cf0387..564123c 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -12,6 +12,7 @@
require_relative 'support/file_helpers'
require_relative 'support/mail_helpers'
require_relative 'support/request_helpers'
+require_relative 'support/remote_helpers'
require_relative 'support/time_helpers'
require_relative 'support/web_test_helpers'
require_relative 'support/workflows'
@@ -76,6 +77,7 @@ def app
class WebSpec < Spec
include Capybara::DSL
include Capybara::Minitest::Assertions
+ include RemoteHelpers
include WebTestHelpers
def setup