mtdevise 5.0.0 → 5.0.1

data/config/initializers/devise/strategies/subdomain.rb

@@ -1,26 +1,26 @@
-require 'devise/strategies/authenticatable'
-
-module Devise
-  module Strategies
-    class SubdomainLogin < Authenticatable
-
-      def subdomain
-        request.subdomain
-      end
-
-      def valid?
-        subdomain.present? && params["user"]
-      end
-
-      def authenticate!
-        return fail!('Invalid email or password.') unless account = Mtdevise::Account.find_by(subdomain: subdomain)
-        return fail!('Invalid email or password.') unless user = account.users.find_by(email: params["user"]["email"])
-        return fail!('Invalid email or password.') unless user.valid_password?(params["user"]["password"])
-        success! user
-      end
-
-    end
-  end
-end
-
-Warden::Strategies.add(:subdomain_login, Devise::Strategies::SubdomainLogin)
+require 'devise/strategies/authenticatable'
+
+module Devise
+  module Strategies
+    class SubdomainLogin < Authenticatable
+
+      def subdomain
+        request.subdomain
+      end
+
+      def valid?
+        subdomain.present? && params["user"]
+      end
+
+      def authenticate!
+        return fail!('Invalid email or password.') unless account = Mtdevise::Account.find_by(subdomain: subdomain)
+        return fail!('Invalid email or password.') unless user = account.users.find_by(email: params["user"]["email"])
+        return fail!('Invalid email or password.') unless user.valid_password?(params["user"]["password"])
+        success! user
+      end
+
+    end
+  end
+end
+
+Warden::Strategies.add(:subdomain_login, Devise::Strategies::SubdomainLogin)

data/config/locales/devise.en.yml

@@ -1,60 +1,60 @@
-# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
-
-en:
-  devise:
-    confirmations:
-      confirmed: "Your email address has been successfully confirmed."
-      send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
-      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
-    failure:
-      already_authenticated: "You are already signed in."
-      inactive: "Your account is not activated yet."
-      invalid: "Invalid email or password."
-      locked: "Your account is locked."
-      last_attempt: "You have one more attempt before your account is locked."
-      not_found_in_database: "Invalid %{authentication_keys} or password."
-      timeout: "Your session expired. Please sign in again to continue."
-      unauthenticated: "You need to sign in or sign up before continuing."
-      unconfirmed: "You have to confirm your email address before continuing."
-    mailer:
-      confirmation_instructions:
-        subject: "Confirmation instructions"
-      reset_password_instructions:
-        subject: "Reset password instructions"
-      unlock_instructions:
-        subject: "Unlock instructions"
-    omniauth_callbacks:
-      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
-      success: "Successfully authenticated from %{kind} account."
-    passwords:
-      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
-      send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
-      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
-      updated: "Your password has been changed successfully. You are now signed in."
-      updated_not_active: "Your password has been changed successfully."
-    registrations:
-      destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
-      signed_up: "Welcome! You have signed up successfully."
-      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
-      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
-      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
-      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address."
-      updated: "Your account has been updated successfully."
-    sessions:
-      signed_in: "Signed in successfully."
-      signed_out: "Signed out successfully."
-      already_signed_out: "Signed out successfully."
-    unlocks:
-      send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
-      send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
-      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
-  errors:
-    messages:
-      already_confirmed: "was already confirmed, please try signing in"
-      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
-      expired: "has expired, please request a new one"
-      not_found: "not found"
-      not_locked: "was not locked"
-      not_saved:
-        one: "1 error prohibited this %{resource} from being saved:"
-        other: "%{count} errors prohibited this %{resource} from being saved:"
+# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+
+en:
+  devise:
+    confirmations:
+      confirmed: "Your email address has been successfully confirmed."
+      send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
+    failure:
+      already_authenticated: "You are already signed in."
+      inactive: "Your account is not activated yet."
+      invalid: "Invalid email or password."
+      locked: "Your account is locked."
+      last_attempt: "You have one more attempt before your account is locked."
+      not_found_in_database: "Invalid %{authentication_keys} or password."
+      timeout: "Your session expired. Please sign in again to continue."
+      unauthenticated: "You need to sign in or sign up before continuing."
+      unconfirmed: "You have to confirm your email address before continuing."
+    mailer:
+      confirmation_instructions:
+        subject: "Confirmation instructions"
+      reset_password_instructions:
+        subject: "Reset password instructions"
+      unlock_instructions:
+        subject: "Unlock instructions"
+    omniauth_callbacks:
+      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
+      success: "Successfully authenticated from %{kind} account."
+    passwords:
+      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+      send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+      updated: "Your password has been changed successfully. You are now signed in."
+      updated_not_active: "Your password has been changed successfully."
+    registrations:
+      destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
+      signed_up: "Welcome! You have signed up successfully."
+      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
+      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
+      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address."
+      updated: "Your account has been updated successfully."
+    sessions:
+      signed_in: "Signed in successfully."
+      signed_out: "Signed out successfully."
+      already_signed_out: "Signed out successfully."
+    unlocks:
+      send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
+      send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
+      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
+  errors:
+    messages:
+      already_confirmed: "was already confirmed, please try signing in"
+      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
+      expired: "has expired, please request a new one"
+      not_found: "not found"
+      not_locked: "was not locked"
+      not_saved:
+        one: "1 error prohibited this %{resource} from being saved:"
+        other: "%{count} errors prohibited this %{resource} from being saved:"

data/config/routes.rb

@@ -1,22 +1,22 @@
-require 'mtdevise/constraints/subdomain_required'
-
-Mtdevise::Engine.routes.draw do
-
-	# Backend User Routes
-	constraints(Mtdevise::Constraints::SubdomainRequired) do
-		scope :module => "account" do
-			root :to => "dashboard#index", :as => :account_root
-			# get "/sign_in", :to => "sessions#new"
-			# post "/sign_in", :to => "sessions#create", :as => :sessions
-			get "/sign_up", :to => "users#new", :as => :user_sign_up
-			post "/sign_up", :to => "users#create", :as => :do_user_sign_up
-		end
-	end
-
-	# FrontEnd User Routes
-	devise_for :users, class_name: 'Mtdevise::User', module: :devise
-	get '/sign_up', :to => 'accounts#new', :as => :sign_up
-	resources :accounts, only: [:create, :index, :new]
-	root 'welcome#index'
-
-end
+require 'mtdevise/constraints/subdomain_required'
+
+Mtdevise::Engine.routes.draw do
+
+	# Backend User Routes
+	constraints(Mtdevise::Constraints::SubdomainRequired) do
+		scope :module => "account" do
+			root :to => "dashboard#index", :as => :account_root
+			# get "/sign_in", :to => "sessions#new"
+			# post "/sign_in", :to => "sessions#create", :as => :sessions
+			get "/sign_up", :to => "users#new", :as => :user_sign_up
+			post "/sign_up", :to => "users#create", :as => :do_user_sign_up
+		end
+	end
+
+	# FrontEnd User Routes
+	devise_for :users, class_name: 'Mtdevise::User', module: :devise
+	get '/sign_up', :to => 'accounts#new', :as => :sign_up
+	resources :accounts, only: [:create, :index, :new]
+	root 'welcome#index'
+
+end

data/db/migrate/20150426071228_create_mtdevise_accounts.rb

@@ -1,11 +1,11 @@
-class CreateMtdeviseAccounts < ActiveRecord::Migration[5.0]
-  def change
-    create_table :mtdevise_accounts do |t|
-
-      t.string :name
-
-      t.timestamps
-
-    end
-  end
-end
+class CreateMtdeviseAccounts < ActiveRecord::Migration[5.0]
+  def change
+    create_table :mtdevise_accounts do |t|
+
+      t.string :name
+
+      t.timestamps
+
+    end
+  end
+end

data/db/migrate/20150426115631_add_owner_id_to_mtdevise_accounts.rb

@@ -1,7 +1,7 @@
-class AddOwnerIdToMtdeviseAccounts < ActiveRecord::Migration[5.0]
-  def change
-
-    add_column :mtdevise_accounts, :owner_id, :integer
-
-  end
-end
+class AddOwnerIdToMtdeviseAccounts < ActiveRecord::Migration[5.0]
+  def change
+
+    add_column :mtdevise_accounts, :owner_id, :integer
+
+  end
+end

data/db/migrate/20150426115910_create_mtdevise_users.rb

@@ -1,12 +1,12 @@
-class CreateMtdeviseUsers < ActiveRecord::Migration[5.0]
-  def change
-    create_table :mtdevise_users do |t|
-
-      t.string :email
-      t.string :password_digest
-
-      t.timestamps
-
-    end
-  end
-end
+class CreateMtdeviseUsers < ActiveRecord::Migration[5.0]
+  def change
+    create_table :mtdevise_users do |t|
+
+      t.string :email
+      t.string :password_digest
+
+      t.timestamps
+
+    end
+  end
+end

data/db/migrate/20150426143800_add_devise_to_mtdevise_users.rb

@@ -1,50 +1,50 @@
-class AddDeviseToMtdeviseUsers < ActiveRecord::Migration[5.0]
-
-  def self.up
-    change_table(:mtdevise_users) do |t|
-      ## Database authenticatable
-      t.string :encrypted_password, null: false, default: ""
-
-      ## Recoverable
-      t.string   :reset_password_token
-      t.datetime :reset_password_sent_at
-
-      ## Rememberable
-      t.datetime :remember_created_at
-
-      ## Trackable
-      t.integer  :sign_in_count, default: 0, null: false
-      t.datetime :current_sign_in_at
-      t.datetime :last_sign_in_at
-      t.string   :current_sign_in_ip
-      t.string   :last_sign_in_ip
-
-      ## Confirmable
-      # t.string   :confirmation_token
-      # t.datetime :confirmed_at
-      # t.datetime :confirmation_sent_at
-      # t.string   :unconfirmed_email # Only if using reconfirmable
-
-      ## Lockable
-      # t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
-      # t.string   :unlock_token # Only if unlock strategy is :email or :both
-      # t.datetime :locked_at
-
-
-      # Uncomment below if timestamps were not included in your original model.
-      # t.timestamps null: false
-    end
-
-    add_index :mtdevise_users, :email,                unique: true
-    add_index :mtdevise_users, :reset_password_token, unique: true
-    # add_index :mtdevise_users, :confirmation_token,   unique: true
-    # add_index :mtdevise_users, :unlock_token,         unique: true
-  end
-
-  def self.down
-    # By default, we don't want to make any assumption about how to roll back a migration when your
-    # model already existed. Please edit below which fields you would like to remove in this migration.
-    raise ActiveRecord::IrreversibleMigration
-  end
-
-end
+class AddDeviseToMtdeviseUsers < ActiveRecord::Migration[5.0]
+
+  def self.up
+    change_table(:mtdevise_users) do |t|
+      ## Database authenticatable
+      t.string :encrypted_password, null: false, default: ""
+
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+
+      ## Rememberable
+      t.datetime :remember_created_at
+
+      ## Trackable
+      t.integer  :sign_in_count, default: 0, null: false
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.string   :current_sign_in_ip
+      t.string   :last_sign_in_ip
+
+      ## Confirmable
+      # t.string   :confirmation_token
+      # t.datetime :confirmed_at
+      # t.datetime :confirmation_sent_at
+      # t.string   :unconfirmed_email # Only if using reconfirmable
+
+      ## Lockable
+      # t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
+      # t.string   :unlock_token # Only if unlock strategy is :email or :both
+      # t.datetime :locked_at
+
+
+      # Uncomment below if timestamps were not included in your original model.
+      # t.timestamps null: false
+    end
+
+    add_index :mtdevise_users, :email,                unique: true
+    add_index :mtdevise_users, :reset_password_token, unique: true
+    # add_index :mtdevise_users, :confirmation_token,   unique: true
+    # add_index :mtdevise_users, :unlock_token,         unique: true
+  end
+
+  def self.down
+    # By default, we don't want to make any assumption about how to roll back a migration when your
+    # model already existed. Please edit below which fields you would like to remove in this migration.
+    raise ActiveRecord::IrreversibleMigration
+  end
+
+end

data/db/migrate/20150427200506_add_subdomain_to_mtdevise_accounts.rb

@@ -1,8 +1,8 @@
-class AddSubdomainToMtdeviseAccounts < ActiveRecord::Migration[5.0]
-  def change
-
-    add_column :mtdevise_accounts, :subdomain, :string
-    add_index :mtdevise_accounts, :subdomain
-
-  end
-end
+class AddSubdomainToMtdeviseAccounts < ActiveRecord::Migration[5.0]
+  def change
+
+    add_column :mtdevise_accounts, :subdomain, :string
+    add_index :mtdevise_accounts, :subdomain
+
+  end
+end

data/db/migrate/20150428110406_create_mtdevise_members.rb

@@ -1,12 +1,12 @@
-class CreateMtdeviseMembers < ActiveRecord::Migration[5.0]
-  def change
-    create_table :mtdevise_members do |t|
-
-      t.integer :account_id
-      t.integer :user_id
-
-      t.timestamps
-
-    end
-  end
-end
+class CreateMtdeviseMembers < ActiveRecord::Migration[5.0]
+  def change
+    create_table :mtdevise_members do |t|
+
+      t.integer :account_id
+      t.integer :user_id
+
+      t.timestamps
+
+    end
+  end
+end

data/db/migrate/20150504181830_add_confirmed_at_to_users.rb

@@ -1,10 +1,10 @@
-class AddConfirmedAtToUsers < ActiveRecord::Migration[5.0]
-  def change
-
-    add_column :mtdevise_users, :confirmed_at, :timestamp
-    add_column :mtdevise_users, :confirmation_token, :string
-    add_column :mtdevise_users, :confirmation_sent_at, :timestamp
-    add_column :mtdevise_users, :unconfirmed_email, :string
-
-  end
-end
+class AddConfirmedAtToUsers < ActiveRecord::Migration[5.0]
+  def change
+
+    add_column :mtdevise_users, :confirmed_at, :timestamp
+    add_column :mtdevise_users, :confirmation_token, :string
+    add_column :mtdevise_users, :confirmation_sent_at, :timestamp
+    add_column :mtdevise_users, :unconfirmed_email, :string
+
+  end
+end