stormpath-rails 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7fca6f7193b201914ce4e96ac41841eb07ef8c4
-  data.tar.gz: 984fbe34b21d5ed95633f5b2f6307340498e096b
+  metadata.gz: 88eef9432856e3264850f71a1cfb8c436e351645
+  data.tar.gz: 26ec1cf47d26e18ebd6a87fac8a9004fc866d15a
 SHA512:
-  metadata.gz: c42251546fc2a3ec727ec8153af72af540baf4dac8fe09098d26b10a4fd6316eaee743e1ccf30a7c26e4c1f26c2b7a53ce18182c6d00dfc2e4c39f8e6ab98d5e
-  data.tar.gz: 31be84edd25ac71931b79b61737468c6e7be73022dd0f8343b4901924830f59974be2cba2fea327d07c7ad318762dbfc6bcab04b99b81652284f0853df25ea86
+  metadata.gz: 189c34db894a9640d635fbd00f87206e8cbad70c471e20d8e0dbc003f0a932115e9bd963db93d704bc54c007421efa51ff65860d06ea862e847ed86a1ec60514
+  data.tar.gz: 092c1446f6cf3369d4a8517ea0f297ec94ec10c62116a50d14f71de4e1306b74c73c8e77a5c46de62a3a1678c484ff56fb55b8bae4a3de86514b4582ec12a9ae

data/.gitignore

@@ -12,4 +12,5 @@ spec/dummy/db/development.sqlite3
 spec/dummy/log/development.log
 spec/dummy/log/test.log
 spec/dummy/tmp
+spec/dummy/.powder
 docs/_build

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 Stormpath Rails Changelog
 ============================
 
+Version 2.5.0
+-------------
+Released on Jan 09, 2017
+- Implement Multi-tenancy
+
+
 Version 2.4.0
 -------------
 Released on Dec 16, 2016

data/README.md

@@ -16,7 +16,7 @@ Add the stormpath-rails integration gem to your Gemfile.
 Stormpath is currently in beta so it is necessary to include the gem version:
 
 ```ruby
-gem 'stormpath-rails', '~> 2.4.0'
+gem 'stormpath-rails', '~> 2.5.0'
 ```
 
 Bundle the Gemfile

data/app/controllers/stormpath/rails/base_controller.rb

@@ -24,6 +24,40 @@ module Stormpath
         request.format =
           ContentTypeNegotiator.new(request.headers['HTTP_ACCEPT']).convert_to_symbol
       end
+
+      def organization_resolution?
+        params.key?(:organization_resolution)
+      end
+
+      def organization_unresolved?
+        stormpath_config.web.multi_tenancy.enabled &&
+          not_on_parent_domain? &&
+          current_organization_name_key.nil?
+      end
+
+      def not_on_parent_domain?
+        req.host != stormpath_config.web.domain_name
+      end
+
+      def current_organization
+        if stormpath_config.web.multi_tenancy.enabled
+          Stormpath::Rails::OrganizationResolver.new(req, params[:organization_name_key])
+                                                .organization
+        end
+      end
+
+      def current_organization_name_key
+        begin
+          current_organization.try(:name_key)
+        rescue Stormpath::Rails::OrganizationResolver::Error
+          nil
+        end
+      end
+      helper_method :current_organization_name_key
+
+      def req
+        request
+      end
     end
   end
 end

data/app/controllers/stormpath/rails/forgot_password/create_controller.rb

@@ -4,11 +4,15 @@ module Stormpath
       class CreateController < Stormpath::Rails::BaseController
         def call
           begin
-            SendPasswordResetEmail.new(params[:email]).call
+            if organization_resolution?
+              OrganizationForm.new(params[:organization_name_key]).save!
+            else
+              SendPasswordResetEmail.new(params[:email], current_organization).call
+            end
             respond_with_success
           rescue SendPasswordResetEmail::UnexistingEmailError
             respond_with_success
-          rescue SendPasswordResetEmail::NoEmailError => error
+          rescue SendPasswordResetEmail::NoEmailError, Stormpath::Rails::OrganizationForm::FormError => error
             respond_with_error(error)
           end
         end
@@ -16,6 +20,8 @@ module Stormpath
         private
 
         def respond_with_success
+          return redirect_to subdomain_forgot_password_url if organization_resolution?
+
           respond_to do |format|
             format.html { redirect_to stormpath_config.web.forgot_password.next_uri }
             format.json { render nothing: true, status: 200 }
@@ -31,6 +37,14 @@ module Stormpath
             end
           end
         end
+
+        def subdomain_forgot_password_url
+          UrlBuilder.create(
+            req,
+            "#{params[:organization_name_key]}.#{stormpath_config.web.domain_name}",
+            stormpath_config.web.forgot_password.uri
+          )
+        end
       end
     end
   end

data/app/controllers/stormpath/rails/forgot_password/new_controller.rb

@@ -3,11 +3,25 @@ module Stormpath
     module ForgotPassword
       class NewController < Stormpath::Rails::BaseController
         def call
-          respond_to do |format|
-            format.json { render nothing: true, status: 404 }
-            format.html { render stormpath_config.web.forgot_password.view }
+          if organization_unresolved?
+            redirect_to(parent_forgot_password_url)
+          else
+            respond_to do |format|
+              format.json { render nothing: true, status: 404 }
+              format.html { render stormpath_config.web.forgot_password.view }
+            end
           end
         end
+
+        private
+
+        def parent_forgot_password_url
+          UrlBuilder.create(
+            req,
+            stormpath_config.web.domain_name,
+            stormpath_config.web.forgot_password.uri
+          )
+        end
       end
     end
   end

data/app/controllers/stormpath/rails/login/create_controller.rb

@@ -7,9 +7,9 @@ module Stormpath
         def call
           begin
             form.save!
-            set_cookies unless social_login?
+            set_cookies if account_login?
             respond_with_success
-          rescue Stormpath::Error, LoginForm::FormError, SocialLoginForm::FormError => error
+          rescue Stormpath::Error, LoginForm::FormError, SocialLoginForm::FormError, OrganizationForm::FormError, OrganizationResolver::Error => error
             respond_with_error(error)
           end
         end
@@ -19,12 +19,18 @@ module Stormpath
         def form
           @form ||= if social_login?
                       SocialLoginForm.new(provider, access_token, cookies)
+                    elsif organization_resolution?
+                      OrganizationForm.new(params[:organization_name_key])
                     else
-                      LoginForm.new(params[:login], params[:password])
+                      LoginForm.new(params[:login],
+                                    params[:password],
+                                    organization_name_key: current_organization.try(:name_key))
                     end
         end
 
         def respond_with_success
+          return redirect_to subdomain_login_url if organization_resolution?
+
           respond_to do |format|
             format.html { redirect_to login_redirect_route, notice: 'Successfully signed in' }
             format.json { render json: serialized_account }
@@ -52,11 +58,7 @@ module Stormpath
         end
 
         def login_redirect_route
-          if params[:next]
-            URI(params[:next]).path
-          else
-            stormpath_config.web.login.next_uri
-          end
+          params[:next] ? URI(params[:next]).path : stormpath_config.web.login.next_uri
         end
 
         def provider
@@ -67,9 +69,21 @@ module Stormpath
           params[:providerData][:accessToken]
         end
 
+        def account_login?
+          !social_login? && !organization_resolution?
+        end
+
         def social_login?
           params[:providerData].present?
         end
+
+        def subdomain_login_url
+          UrlBuilder.create(
+            req,
+            "#{params[:organization_name_key]}.#{stormpath_config.web.domain_name}",
+            stormpath_config.web.login.uri
+          )
+        end
       end
     end
   end

data/app/controllers/stormpath/rails/login/new_controller.rb

@@ -6,7 +6,9 @@ module Stormpath
 
         def call
           if stormpath_config.web.id_site.enabled
-            redirect_to callback_url
+            redirect_to(callback_url)
+          elsif organization_unresolved?
+            redirect_to(parent_login_url)
           else
             respond_to do |format|
               format.json { render json: LoginNewSerializer.to_h }
@@ -23,6 +25,14 @@ module Stormpath
             path: Stormpath::Rails.config.web.id_site.login_uri
           )
         end
+
+        def parent_login_url
+          UrlBuilder.create(
+            req,
+            stormpath_config.web.domain_name,
+            stormpath_config.web.login.uri
+          )
+        end
       end
     end
   end

data/app/controllers/stormpath/rails/register/create_controller.rb

@@ -4,15 +4,17 @@ module Stormpath
       class CreateController < BaseController
         def call
           form.save!
-          login_the_account if auto_login_enabled? && !email_verification_enabled?
+          login_the_account if valid_for_login?
           respond_with_success
-        rescue RegistrationForm::FormError => error
+        rescue RegistrationForm::FormError, OrganizationForm::FormError => error
           respond_with_error(error)
         end
 
         private
 
         def respond_with_success
+          return redirect_to subdomain_register_url if organization_resolution?
+
           respond_to do |format|
             format.html { redirect_to success_redirect_route }
             format.json { render json: serialized_account }
@@ -57,6 +59,10 @@ module Stormpath
           render stormpath_config.web.register.view
         end
 
+        def valid_for_login?
+          auto_login_enabled? && !email_verification_enabled? && !organization_resolution?
+        end
+
         def auto_login_enabled?
           stormpath_config.web.register.auto_login
         end
@@ -74,12 +80,29 @@ module Stormpath
         end
 
         def form
-          @form ||= RegistrationForm.new(params.except(*excluded_root_params))
+          @form ||= if organization_resolution?
+                      OrganizationForm.new(params[:organization_name_key])
+                    else
+                      RegistrationForm.new(permitted_params)
+                    end
         end
 
         def excluded_root_params
           [:controller, :action, :format, :create, :utf8, :button, :authenticity_token]
         end
+
+        def permitted_params
+          params.except(*excluded_root_params)
+                .merge(organization_name_key: current_organization_name_key)
+        end
+
+        def subdomain_register_url
+          UrlBuilder.create(
+            req,
+            "#{params[:organization_name_key]}.#{stormpath_config.web.domain_name}",
+            stormpath_config.web.register.uri
+          )
+        end
       end
     end
   end

data/app/controllers/stormpath/rails/register/new_controller.rb

@@ -2,11 +2,14 @@ module Stormpath
   module Rails
     module Register
       class NewController < BaseController
+
         def call
           if stormpath_config.web.id_site.enabled
-            redirect_to callback_url
+            redirect_to(callback_url)
           elsif signed_in?
-            redirect_to root_path
+            redirect_to(root_path)
+          elsif organization_unresolved?
+            redirect_to(parent_register_url)
           else
             respond_to do |format|
               format.json { render json: RegistrationFormSerializer.to_h }
@@ -23,6 +26,14 @@ module Stormpath
             path: Stormpath::Rails.config.web.id_site.register_uri
           )
         end
+
+        def parent_register_url
+          UrlBuilder.create(
+            req,
+            stormpath_config.web.domain_name,
+            stormpath_config.web.register.uri
+          )
+        end
       end
     end
   end

data/app/controllers/stormpath/rails/verify_email/create_controller.rb

@@ -4,11 +4,15 @@ module Stormpath
       class CreateController < BaseController
         def call
           begin
-            ResendEmailVerification.new(params[:email]).call
+            if organization_resolution?
+              OrganizationForm.new(params[:organization_name_key]).save!
+            else
+              ResendEmailVerification.new(params[:email], current_organization).call
+            end
             respond_with_success
           rescue ResendEmailVerification::UnexistingEmailError
             respond_with_success
-          rescue ResendEmailVerification::NoEmailError => error
+          rescue ResendEmailVerification::NoEmailError, Stormpath::Rails::OrganizationForm::FormError => error
             respond_with_error(error)
           end
         end
@@ -16,6 +20,8 @@ module Stormpath
         private
 
         def respond_with_success
+          return redirect_to subdomain_verify_email_url if organization_resolution?
+
           respond_to do |format|
             format.html { redirect_to "#{stormpath_config.web.login.uri}?status=unverified" }
             format.json { render nothing: true }
@@ -31,6 +37,14 @@ module Stormpath
             end
           end
         end
+
+        def subdomain_verify_email_url
+          UrlBuilder.create(
+            req,
+            "#{params[:organization_name_key]}.#{stormpath_config.web.domain_name}",
+            stormpath_config.web.verify_email.uri
+          )
+        end
       end
     end
   end

data/app/controllers/stormpath/rails/verify_email/show_controller.rb

@@ -4,8 +4,11 @@ module Stormpath
       class ShowController < BaseController
         def call
           begin
+            return redirect_to(parent_verify_email_url) if organization_unresolved?
+
             account = VerifyEmailToken.new(params[:sptoken]).call
             login_the_account(account) if stormpath_config.web.register.auto_login
+
             respond_with_success
           rescue InvalidSptokenError, NoSptokenError => error
             respond_to_error(error)
@@ -23,6 +26,8 @@ module Stormpath
         end
 
         def respond_with_success
+          return redirect_to parent_verify_email_url if organization_resolution?
+
           respond_to do |format|
             format.html { redirect_to success_redirect_route }
             format.json { render nothing: true, status: 200 }
@@ -45,6 +50,14 @@ module Stormpath
             end
           end
         end
+
+        def parent_verify_email_url
+          UrlBuilder.create(
+            req,
+            stormpath_config.web.domain_name,
+            stormpath_config.web.verify_email.uri
+          )
+        end
       end
     end
   end

data/app/forms/stormpath/rails/login_form.rb

@@ -1,13 +1,13 @@
 module Stormpath
   module Rails
     class LoginForm
-      attr_accessor :login, :password
-      attr_accessor :authentication_result
+      attr_accessor :login, :password, :authentication_result, :organization_name_key
       delegate :account, to: :authentication_result
 
-      def initialize(login, password)
+      def initialize(login, password, options = {})
         @login = login
         @password = password
+        @organization_name_key = options[:organization_name_key]
         validate_login_presence
         validate_password_presence
       end
@@ -39,7 +39,9 @@ module Stormpath
       end
 
       def password_grant_request
-        Stormpath::Oauth::PasswordGrantRequest.new(login, password)
+        Stormpath::Oauth::PasswordGrantRequest.new(login,
+                                                   password,
+                                                   organization_name_key: organization_name_key)
       end
 
       def application

data/app/forms/stormpath/rails/organization_form.rb

@@ -0,0 +1,26 @@
+module Stormpath
+  module Rails
+    class OrganizationForm
+      attr_reader :name_key
+
+      def initialize(name_key)
+        @name_key = name_key
+        raise FormError, "Organization Name Key can't be blank" if name_key.blank?
+      end
+
+      class FormError < ArgumentError
+        def status
+          400
+        end
+      end
+
+      def save!
+        begin
+          Stormpath::Rails::OrganizationResolver.new(OpenStruct.new(subdomains: [name_key])).organization
+        rescue Stormpath::Rails::OrganizationResolver::Error
+          raise FormError, 'Organization could not be found'
+        end
+      end
+    end
+  end
+end

data/app/forms/stormpath/rails/registration_form.rb

@@ -3,7 +3,7 @@ module Stormpath
     class RegistrationForm
       include ActiveModel::Model
       attr_accessor(*RegistrationFormFields.enabled_field_names)
-      attr_accessor :account
+      attr_accessor :account, :organization_name_key
 
       validate :validate_presence_of_required_attributes
       validate :validate_password_repeated_twice_matches?
@@ -22,7 +22,7 @@ module Stormpath
         params = params.except(:customData).merge(custom_data_params)
         params = params.stringify_keys.transform_keys(&:underscore).symbolize_keys
 
-        arbitrary_param_names = params.keys - RegistrationFormFields.enabled_field_names
+        arbitrary_param_names = params.keys - RegistrationFormFields.enabled_field_names.push(:organization_name_key)
 
         if arbitrary_param_names.any?
           raise ArbitraryDataSubmitted, "Can't submit arbitrary data: #{arbitrary_param_names.join(', ')}"
@@ -35,9 +35,7 @@ module Stormpath
         return false if invalid?
 
         begin
-          self.account = Stormpath::Rails::Client.application.accounts.create(
-            Stormpath::Resource::Account.new(stormpath_registration_params)
-          )
+          self.account = account_resource
         rescue Stormpath::Error => error
           errors.add(:base, error.message) && false
         end
@@ -50,6 +48,38 @@ module Stormpath
 
       private
 
+      def account_resource
+        account_store.accounts.create(new_account)
+      end
+
+      def account_store
+        organization_resolved? ? organization : Stormpath::Rails::Client.application
+      end
+
+      def new_account
+        Stormpath::Resource::Account.new(stormpath_registration_params)
+      end
+
+      def organization_resolved?
+        if multitenancy_enabled?
+          organization.present? ? true : raise(FormError, 'Organization not found.')
+        else
+          false
+        end
+      end
+
+      def multitenancy_enabled?
+        Stormpath::Rails.config.web.multi_tenancy.enabled
+      end
+
+      def organization
+        begin
+          @organization ||= Stormpath::Rails::Client.client.organizations.search(name_key: organization_name_key).first
+        rescue Stormpath::Error
+          nil
+        end
+      end
+
       def validate_presence_of_required_attributes
         RegistrationFormFields.required_fields.each do |required_field, properties|
           if send(required_field).blank?
@@ -65,7 +95,8 @@ module Stormpath
       end
 
       def stormpath_registration_params
-        predefined_registration_params.merge(custom_data: custom_registration_params)
+        predefined_registration_params.merge(custom_data: custom_registration_params,
+                                             organization_name_key: organization_name_key)
       end
 
       def predefined_registration_params

data/app/forms/stormpath/rails/registration_form_fields.rb

@@ -8,7 +8,8 @@ module Stormpath
         :username,
         :email,
         :password,
-        :confirm_password
+        :confirm_password,
+        :organization_name_key
       ].freeze
 
       class << self

data/app/services/stormpath/rails/organization_resolver.rb

@@ -0,0 +1,40 @@
+module Stormpath
+  module Rails
+    class OrganizationResolver
+      attr_reader :subdomain_name, :organization_name_key
+
+      def initialize(request, organization_name_key = nil)
+        @subdomain_name = request.subdomains.first
+        @organization_name_key = organization_name_key
+      end
+
+      def organization
+        find_organization(subdomain_name) || find_organization(organization_name_key) || raise_error
+      end
+
+      class Error < ArgumentError
+        def status
+          400
+        end
+      end
+
+      private
+
+      def find_organization(name_key)
+        return if name_key.nil?
+
+        application.account_store_mappings.find do |mapping|
+          mapping.account_store.try(:name_key) == name_key
+        end.try(:account_store)
+      end
+
+      def raise_error
+        raise Error, "Organization couldn't be resolved"
+      end
+
+      def application
+        Stormpath::Rails::Client.application
+      end
+    end
+  end
+end

data/app/services/stormpath/rails/resend_email_verification.rb

@@ -3,16 +3,17 @@ module Stormpath
     class ResendEmailVerification
       PROPERTY_VALUE_DOES_NOT_MATCH_A_STORMPATH_RESOURCE_CODE = 2016
 
-      attr_reader :email
+      attr_reader :email, :account_store
 
-      def initialize(email)
+      def initialize(email, account_store = nil)
         raise(NoEmailError, 'Email parameter not provided.') if email.blank?
         @email = email
+        @account_store = account_store
       end
 
       def call
         begin
-          application.verification_emails.create(login: email)
+          application.verification_emails.create(email_verification_params)
         rescue Stormpath::Error => error
           if error.code == PROPERTY_VALUE_DOES_NOT_MATCH_A_STORMPATH_RESOURCE_CODE
             raise UnexistingEmailError, error.message
@@ -22,6 +23,13 @@ module Stormpath
         end
       end
 
+      def email_verification_params
+        {}.tap do |body|
+          body[:login] = email
+          body[:account_store] = { name_key: account_store.name_key } if account_store.present?
+        end
+      end
+
       def application
         Stormpath::Rails::Client.application
       end

data/app/services/stormpath/rails/send_password_reset_email.rb

@@ -3,16 +3,17 @@ module Stormpath
     class SendPasswordResetEmail
       PROPERTY_VALUE_DOES_NOT_MATCH_A_STORMPATH_RESOURCE_CODE = 2016
 
-      attr_reader :email
+      attr_reader :email, :account_store
 
-      def initialize(email)
+      def initialize(email, account_store = nil)
         raise(NoEmailError, 'Email parameter not provided.') if email.blank?
         @email = email
+        @account_store = account_store
       end
 
       def call
         begin
-          application.send_password_reset_email(email)
+          application.send_password_reset_email(email, account_store: account_store)
         rescue Stormpath::Error => error
           if error.code == PROPERTY_VALUE_DOES_NOT_MATCH_A_STORMPATH_RESOURCE_CODE
             raise UnexistingEmailError, error.message

data/app/services/stormpath/rails/url_builder.rb

@@ -0,0 +1,34 @@
+module Stormpath
+  module Rails
+    class UrlBuilder
+      attr_reader :request, :host, :path
+
+      def initialize(request, host, path)
+        @request = request
+        @host = host
+        @path = path
+      end
+
+      def self.create(request, host, path)
+        new(request, host, path).url
+      end
+
+      def url
+        request_scheme_builder.build(host_and_path).to_s
+      end
+
+      private
+
+      def request_scheme_builder
+        request.scheme == 'https' ? URI::HTTPS : URI::HTTP
+      end
+
+      def host_and_path
+        {
+          host: host,
+          path: path
+        }
+      end
+    end
+  end
+end

data/app/views/stormpath/rails/forgot_password/_form.html.erb

@@ -0,0 +1,24 @@
+<div class="email-password-area col-xs-12 large col-sm-12">
+  <div class="header">
+    <span>Forgot your password?</span>
+    <p>Enter your email address below to reset your password. You will be sent an email which you will need to open to continue. You may need to check your spam folder.</p>
+  </div>
+
+  <% if flash[:error] %>
+    <div class="alert alert-danger bad-login">
+      <p><%= flash[:error] %></p>
+    </div>
+  <% end %>
+
+  <%= form_for :password, html: { class: "login-form form-horizontal" }, url: forgot_password_path do |form| %>
+    <div class="form-group group-email">
+      <%= form.label :email, class: "col-sm-4" %>
+      <div class="col-sm-8">
+        <%= form.email_field :email, placeholder: 'Email', class: "form-control", name: :email %>
+      </div>
+    </div>
+    <div>
+      <%= button_tag "Submit", class: "login btn btn-login btn-sp-green", type: "submit" %>
+    </div>
+  <% end %>
+</div>

data/app/views/stormpath/rails/forgot_password/new.html.erb

@@ -12,31 +12,13 @@
       <% end %>
 
       <div class="box row">
-        <div class="email-password-area col-xs-12 large col-sm-12">
-          <div class="header">
-            <span>Forgot your password?</span>
-            <p>Enter your email address below to reset your password. You will be sent an email which you will need to open to continue. You may need to check your spam folder.</p>
-          </div>
-
-          <% if flash[:error] %>
-            <div class="alert alert-danger bad-login">
-              <p><%= flash[:error] %></p>
-            </div>
-          <% end %>
-
-          <%= form_for :password, html: { class: "login-form form-horizontal" }, url: forgot_password_path do |form| %>
-            <div class="form-group group-email">
-              <%= form.label :email, class: "col-sm-4" %>
-              <div class="col-sm-8">
-                <%= form.email_field :email, placeholder: 'Email', class: "form-control", name: :email %>
-              </div>
-            </div>
-            <div>
-              <%= button_tag "Submit", :class => "login btn btn-login btn-sp-green", :type => "submit" %>
-            </div>
-          <% end %>
-        </div>
+        <% if Stormpath::Rails.config.web.multi_tenancy.enabled && current_organization_name_key.nil? %>
+          <%= render partial: 'stormpath/rails/shared/select_organization', locals: { url: forgot_password_path } %>
+        <% else %>
+          <%= render partial: 'stormpath/rails/forgot_password/form' %>
+        <% end %>
       </div>
+
       <% if Stormpath::Rails.config.web.login.enabled %>
         <%= link_to "Back to Log In", new_login_path, class: "forgot" %>
       <% end %>

data/app/views/stormpath/rails/login/new.html.erb

@@ -2,10 +2,14 @@
   <div class="va-wrapper">
     <div class="view login-view container">
       <div class="box row">
-        <%= render partial: 'stormpath/rails/login/form' %>
+        <% if Stormpath::Rails.config.web.multi_tenancy.enabled && current_organization_name_key.nil? %>
+          <%= render partial: 'stormpath/rails/shared/select_organization', locals: {url: login_path(next: params[:next])} %>
+        <% else %>
+          <%= render partial: 'stormpath/rails/login/form' %>
 
-        <% if Stormpath::Rails.config.web.has_social_providers %>
-          <%= render 'stormpath/rails/shared/social_login' %>
+          <% if Stormpath::Rails.config.web.has_social_providers %>
+            <%= render 'stormpath/rails/shared/social_login' %>
+          <% end %>
         <% end %>
       </div>
 

data/app/views/stormpath/rails/register/new.html.erb

@@ -2,7 +2,11 @@
   <div class="va-wrapper">
     <div class="view registration-view container">
       <div class="box row">
-        <%= render partial: 'stormpath/rails/register/form' %>
+        <% if Stormpath::Rails.config.web.multi_tenancy.enabled && current_organization_name_key.nil? %>
+          <%= render partial: 'stormpath/rails/shared/select_organization', locals: { url: register_path } %>
+        <% else %>
+          <%= render partial: 'stormpath/rails/register/form' %>
+        <% end %>
       </div>
       <% if Stormpath::Rails.config.web.login.enabled %>
         <%= link_to "Back to Log In", new_login_path, class: "to-login" %>

data/app/views/stormpath/rails/shared/_select_organization.html.erb

@@ -0,0 +1,30 @@
+<div class="email-password-area col-xs-12">
+  <div class="header">
+    <span>Select your Organization</span>
+  </div>
+
+  <% if flash[:error] %>
+    <div class="alert alert-danger bad-login">
+      <p><%= flash[:error] %></p>
+    </div>
+  <% end %>
+
+  <%= form_for '', url: url, html: {class: "login-form form-horizontal"} do |form| %>
+    <%= form.hidden_field :organization_resolution %>
+    <div class="form-group group-email">
+      <%= form.label :organization_name_key, 'Enter your organization name to continue', class: 'col-sm-12' %>
+      <div class="<%= input_class %>">
+        <%= form.text_field :organization_name_key,
+            value: params[:organization_name_key],
+            name: :organization_name_key,
+            placeholder: 'e.g. my-company',
+            required: true,
+            class: "form-control"
+        %>
+      </div>
+    </div>
+    <div>
+      <%= button_tag 'Submit', class: 'login btn btn-login btn-sp-green', type: 'submit' %>
+    </div>
+  <% end %>
+</div>

data/app/views/stormpath/rails/verify_email/_form.html.erb

@@ -0,0 +1,31 @@
+<div class="email-password-area col-xs-12 large col-sm-12">
+  <div class="header">
+    <span>Resend Account Verification Email?</span>
+      <% if params[:sptoken].nil? %>
+        <p>
+          Enter your email address below and we'll resend your account
+          verification email.  You will be sent an email which you will
+          need to open to continue. You may need to check your spam
+          folder.
+        </p>
+      <% end %>
+  </div>
+
+  <% if flash[:error] %>
+    <div class="alert alert-danger bad-login">
+      <p><%= flash[:error] %></p>
+    </div>
+  <% end %>
+
+  <%= form_for :verify_email, html: { class: "login-form form-horizontal" }, url: verify_email_path do |form| %>
+    <div class="form-group group-email">
+      <%= form.label :email, class: "col-sm-4" %>
+      <div class="col-sm-8">
+        <%= form.text_field :email, placeholder: 'Email', class: "form-control", name: :email, type: :email, required: true %>
+      </div>
+    </div>
+    <div>
+      <%= button_tag "Submit", :class => "login btn btn-login btn-sp-green", :type => "submit" %>
+    </div>
+  <% end %>
+</div>

data/app/views/stormpath/rails/verify_email/new.html.erb

@@ -10,39 +10,15 @@
           </div>
         </div>
       <% end %>
-      <div class="box row">
-        <div class="email-password-area col-xs-12 large col-sm-12">
-          <div class="header">
-            <span>Resend Account Verification Email?</span>
-              <% if params[:sptoken].nil? %>
-                <p>
-                  Enter your email address below and we'll resend your account
-                  verification email.  You will be sent an email which you will
-                  need to open to continue. You may need to check your spam
-                  folder.
-                </p>
-              <% end %>
-          </div>
-
-          <% if flash[:error] %>
-            <div class="alert alert-danger bad-login">
-              <p><%= flash[:error] %></p>
-            </div>
-          <% end %>
 
-          <%= form_for :verify_email, html: { class: "login-form form-horizontal" }, url: verify_email_path do |form| %>
-            <div class="form-group group-email">
-              <%= form.label :email, class: "col-sm-4" %>
-              <div class="col-sm-8">
-                <%= form.text_field :email, placeholder: 'Email', class: "form-control", name: :email, type: :email, required: true %>
-              </div>
-            </div>
-            <div>
-              <%= button_tag "Submit", :class => "login btn btn-login btn-sp-green", :type => "submit" %>
-            </div>
-          <% end %>
-        </div>
+      <div class="box row">
+        <% if Stormpath::Rails.config.web.multi_tenancy.enabled && current_organization_name_key.nil? %>
+          <%= render partial: 'stormpath/rails/shared/select_organization', locals: { url: verify_email_path } %>
+        <% else %>
+          <%= render partial: 'stormpath/rails/verify_email/form' %>
+        <% end %>
       </div>
+
       <% if Stormpath::Rails.config.web.login.enabled %>
         <%= link_to "Back to Log In", new_login_path, class: "forgot" %>
       <% end %>

data/docs/changelog.rst

@@ -6,6 +6,12 @@ Change Log
 
 Gem changes until version 2.0.1, in descending order.
 
+Version 2.5.0
+-------------
+Released on Jan 09, 2017
+- Implement Multi-tenancy
+
+
 Version 2.4.0
 -------------
 Released on Dec 16, 2016

data/lib/generators/stormpath/install/templates/default_config.yml

@@ -6,6 +6,22 @@ stormpath:
   web:
     basePath: null
 
+    domainName: null  # Required if using subdomain-based multi-tenancy
+
+    multiTenancy:
+
+      # When enabled, the framework will require the user to authenticate against
+      # a specific Organization.  The authenticated organization is persisted in
+      # the access token that is issued.
+      #
+      # At the moment we only support a sub-domain based strategy, wherby the
+      # user must arrive on the subdomain that correlates with their tenant in
+      # order to authenticate.  If they visit the parent domain, they will be
+      # required to identify the organization they wish to use.
+
+      enabled: false
+      strategy: "subdomain"
+
     oauth2:
       enabled: true
       uri: "/oauth/token"

data/lib/stormpath/rails.rb

@@ -4,6 +4,7 @@ require 'stormpath/rails/config/read_file'
 require 'stormpath/rails/config/application_resolution'
 require 'stormpath/rails/config/account_store_verification'
 require 'stormpath/rails/config/dynamic_configuration'
+require 'stormpath/rails/config/multitenancy_verification'
 require 'stormpath/rails/config/social_login_verification'
 require 'stormpath/rails/configuration'
 require 'stormpath/rails/router'

data/lib/stormpath/rails/config/dynamic_configuration.rb

@@ -17,6 +17,7 @@ module Stormpath
         def initialize(static_config)
           @static_config = static_config
           proccess_account_store_verification
+          process_multitenancy_verification if static_config.stormpath.web.multi_tenancy.enabled
         end
 
         def app
@@ -69,6 +70,10 @@ module Stormpath
           ).call
         end
 
+        def process_multitenancy_verification
+          MultitenancyVerification.new(static_config.stormpath.web).call
+        end
+
         def social_login_verification
           @social_login_verification ||= SocialLoginVerification.new(app.href)
         end

data/lib/stormpath/rails/config/multitenancy_verification.rb

@@ -0,0 +1,37 @@
+module Stormpath
+  module Rails
+    module Config
+      class MultitenancyVerification
+        attr_reader :web_config
+
+        def initialize(web_config)
+          @web_config = web_config
+        end
+
+        def call
+          verify_multitenancy_set_correctly
+        end
+
+        private
+
+        def verify_multitenancy_set_correctly
+          return if multitenancy_set_correctly?
+          raise(
+            InvalidConfiguration,
+            "Multitenancy is not set correctly in the configuration file. It needs to have a domainName and multitenancy strategy set to 'subdomain'"
+          )
+        end
+
+        def multitenancy_set_correctly?
+          multitenancy.enabled &&
+            multitenancy.strategy == 'subdomain' &&
+            !web_config.domain_name.nil?
+        end
+
+        def multitenancy
+          web_config.multi_tenancy
+        end
+      end
+    end
+  end
+end

data/lib/stormpath/rails/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Stormpath
   module Rails
-    VERSION = '2.4.0'.freeze
+    VERSION = '2.5.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stormpath-rails
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Nenad Nikolic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-16 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stormpath-sdk
@@ -134,6 +134,7 @@ files:
 - app/controllers/stormpath/rails/verify_email/create_controller.rb
 - app/controllers/stormpath/rails/verify_email/show_controller.rb
 - app/forms/stormpath/rails/login_form.rb
+- app/forms/stormpath/rails/organization_form.rb
 - app/forms/stormpath/rails/registration_form.rb
 - app/forms/stormpath/rails/registration_form_fields.rb
 - app/forms/stormpath/rails/social_login_form.rb
@@ -152,14 +153,17 @@ files:
 - app/services/stormpath/rails/delete_access_token.rb
 - app/services/stormpath/rails/delete_refresh_token.rb
 - app/services/stormpath/rails/forgot_password_token_verification.rb
+- app/services/stormpath/rails/organization_resolver.rb
 - app/services/stormpath/rails/password_change.rb
 - app/services/stormpath/rails/refresh_token_authentication.rb
 - app/services/stormpath/rails/resend_email_verification.rb
 - app/services/stormpath/rails/send_password_reset_email.rb
 - app/services/stormpath/rails/token_and_cookies_cleaner.rb
 - app/services/stormpath/rails/token_cookie_setter.rb
+- app/services/stormpath/rails/url_builder.rb
 - app/services/stormpath/rails/verify_email_token.rb
 - app/views/stormpath/rails/change_password/new.html.erb
+- app/views/stormpath/rails/forgot_password/_form.html.erb
 - app/views/stormpath/rails/forgot_password/new.html.erb
 - app/views/stormpath/rails/layouts/stormpath.html.erb
 - app/views/stormpath/rails/login/_form.html.erb
@@ -167,7 +171,9 @@ files:
 - app/views/stormpath/rails/register/_form.html.erb
 - app/views/stormpath/rails/register/new.html.erb
 - app/views/stormpath/rails/shared/_input.html.erb
+- app/views/stormpath/rails/shared/_select_organization.html.erb
 - app/views/stormpath/rails/shared/_social_login.html.erb
+- app/views/stormpath/rails/verify_email/_form.html.erb
 - app/views/stormpath/rails/verify_email/new.html.erb
 - bin/console
 - bin/rails
@@ -241,6 +247,7 @@ files:
 - lib/stormpath/rails/config/account_store_verification.rb
 - lib/stormpath/rails/config/application_resolution.rb
 - lib/stormpath/rails/config/dynamic_configuration.rb
+- lib/stormpath/rails/config/multitenancy_verification.rb
 - lib/stormpath/rails/config/read_file.rb
 - lib/stormpath/rails/config/social_login_verification.rb
 - lib/stormpath/rails/configuration.rb