solidus_auth_devise_devise_token_auth 2.1.0.1 → 2.1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4862634dd669281c67f5a3921e7c64fcc6dc595c6557959f73416375cf21e66
-  data.tar.gz: 5c0a39332a2ff41b43a9404e35a302447501ed5a5e9b93aca80687998dcde96c
+  metadata.gz: 874de97d25517aabe50c32c31c3b1112aa8558239ff85ad9fe631b2641902bc9
+  data.tar.gz: 3847f1d3ceecee1874d2dfd1df35232efaa228a7e42e61703fe49680b4590c39
 SHA512:
-  metadata.gz: 6516217c201c617119a775ac8cfa1a217e5bf71a75b2cd3cd045fa2734f384b27d8e0d75045194b1e1d36cfefe4f615d58547e7383c1468e8aa622f7427a99c6
-  data.tar.gz: bf1e117f5b4961e1f0ed17357dd819f40a8d90bb0a28cfa9d5dbcb34c83eaa2a06e03308e8a59a22358ff32df7638cea8877258b5d5c78a43eb2c98deb6f3182
+  metadata.gz: 41ec9e186219bb5eb9ac289d384eca66e0fc9870170bf4e30a205fceadb990ca34671865fd0ba550953f0f4ad9f42842527fafdfff726cacdc5ac0ad019ff55d
+  data.tar.gz: f3b0859eacef57ba73b02ad689e362352b7771ba62af2ca68ffe7065a9afadb594fb75198cec5cfc1b19c535eb9704046dfbea8d1adc7bab533ce77fdea6aefe

data/db/migrate/20101026184950_rename_columns_for_devise.rb

@@ -1,24 +1,92 @@
 class RenameColumnsForDevise < SolidusSupport::Migration[4.2]
   def up
-    return if column_exists?(:spree_users, :password_salt)
     if column_exists?(:spree_users, :crypted_password)
       rename_column :spree_users, :crypted_password, :encrypted_password
     end
+
     if column_exists?(:spree_users, :salt)
       rename_column :spree_users, :salt, :password_salt
     end
-    rename_column :spree_users, :remember_token_expires_at, :remember_created_at
-    rename_column :spree_users, :login_count, :sign_in_count
-    rename_column :spree_users, :failed_login_count, :failed_attempts
-    rename_column :spree_users, :single_access_token, :reset_password_token
-    rename_column :spree_users, :current_login_at, :current_sign_in_at
-    rename_column :spree_users, :last_login_at, :last_sign_in_at
-    rename_column :spree_users, :current_login_ip, :current_sign_in_ip
-    rename_column :spree_users, :last_login_ip, :last_sign_in_ip
-    add_column :spree_users, :authentication_token, :string
-    add_column :spree_users, :unlock_token, :string
-    add_column :spree_users, :locked_at, :datetime
-    remove_column :spree_users, :openid_identifier
+
+    if column_exists?(:spree_users, :remember_token_expires_at)
+      if column_exists?(:spree_users, :remember_created_at)
+        remove_column :spree_users, :remember_token_expires_at
+      else
+        rename_column :spree_users, :remember_token_expires_at, :remember_created_at
+      end
+    end
+
+    if column_exists?(:spree_users, :login_count)
+      if column_exists?(:spree_users, :sign_in_count)
+        remove_column :spree_users, :login_count
+      else
+        rename_column :spree_users, :login_count, :sign_in_count
+      end
+    end
+
+    if column_exists?(:spree_users, :failed_login_count)
+      if column_exists?(:spree_users, :failed_attempts)
+        remove_column :spree_users, :failed_login_count
+      else
+        rename_column :spree_users, :failed_login_count, :failed_attempts
+      end
+    end
+
+    if column_exists?(:spree_users, :single_access_token)
+      if column_exists?(:spree_users, :reset_password_token)
+        remove_column :spree_users, :single_access_token
+      else
+        rename_column :spree_users, :single_access_token, :reset_password_token
+      end
+    end
+
+    if column_exists?(:spree_users, :current_login_at)
+      if column_exists?(:spree_users, :current_sign_in_at)
+        remove_column :spree_users, :current_login_at
+      else
+        rename_column :spree_users, :current_login_at, :current_sign_in_at
+      end
+    end
+
+    if column_exists?(:spree_users, :last_login_at)
+      if column_exists?(:spree_users, :last_sign_in_at)
+        remove_column :spree_users, :last_login_at
+      else
+        rename_column :spree_users, :last_login_at, :last_sign_in_at
+      end
+    end
+
+    if column_exists?(:spree_users, :current_login_ip)
+      if column_exists?(:current_sign_in_ip)
+        remove_column :spree_users, :current_login_ip
+      else
+        rename_column :spree_users, :current_login_ip, :current_sign_in_ip
+      end
+    end
+
+    if column_exists?(:spree_users, :last_login_ip)
+      if column_exists?(:spree_users, :last_sign_in_ip)
+        remove_column :spree_users, :last_login_ip
+      else
+        rename_column :spree_users, :last_login_ip, :last_sign_in_ip
+      end
+    end
+
+    unless column_exists?(:spree_users, :authentication_token)
+      add_column :spree_users, :authentication_token, :string
+    end
+
+    unless column_exists?(:spree_users, :unlock_token)
+      add_column :spree_users, :unlock_token, :string
+    end
+
+    unless column_exists?(:spree_users, :locked_at)
+      add_column :spree_users, :locked_at, :datetime
+    end
+
+    if column_exists?(:spree_users, :openid_identifier)
+      remove_column :spree_users, :openid_identifier
+    end
   end
 
   def down

data/solidus_auth_devise.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'solidus_auth_devise_devise_token_auth'
-  s.version     = '2.1.0.1'
+  s.version     = '2.1.0.2'
   s.summary     = 'Provides authentication and authorization services for use with Solidus by using Devise and CanCan (devise_token_auth revised version)'
   s.description = s.summary
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_auth_devise_devise_token_auth
 version: !ruby/object:Gem::Version
-  version: 2.1.0.1
+  version: 2.1.0.2
 platform: ruby
 authors:
 - Michał Siwek (skycocker)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-25 00:00:00.000000000 Z
+date: 2018-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core_devise_token_auth