bbmb 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fc3295b2cda0d75a3081036c93995faeee526a0
-  data.tar.gz: 9a8f77400cee85995a9da0e73c6e716f12a081ea
+  metadata.gz: 74b33b06bdc40e8e375f2cb467bad60696906bd5
+  data.tar.gz: 24fe53d831147f6efdc76eb012bd105c8ef3b780
 SHA512:
-  metadata.gz: 2061a3762bd644ab5869d9174027d5e5554d8d2adca75521954b090e8f376e66a51defe6b4e8002916fd67cc2f4c32c4b8b4af934df9d7e5057e381c1f87850f
-  data.tar.gz: 591fdea209b7846a3e204f0fe3fc585cbe8244e0f3e7f682a62497da26d22071da3575e28098379ddd68873290d7863ece8c531fc53d0b7b7e756ab527bb4dcd
+  metadata.gz: 936dbe0717e852eb213a1b7f2d8c71f03c832b73958be9ded5205461478efc391675018aafbe538b00e243262ee38d804cb8bec1d821b21acf50ced53783b755
+  data.tar.gz: 44ca2e4e4488f7fa689198e8a9e5246e93afe7105d6abc648f75fe7089a0e1a99abc4279a91525a6a6ce1e54bce0dd37d27dd9cfc68bfe5628a3093b3db7dc45

data/History.txt

@@ -1,3 +1,8 @@
+=== 2.2.1 / 17.05.2017
+
+* Fix logout. Uses app
+* Allow changing the e-mail address when old is nil and new one is not used by any other customer
+
 === 2.2.0 / 17.05.2017
 
 * Refuse empty e-mail adress with e_email_required

data/lib/bbmb/html/util/session.rb

@@ -38,7 +38,7 @@ class Session < SBSM::Session
   def logout
     SBSM.info "BBMB::Html::Util::Session logout @auth_session #{@auth_session.class}"
     $stdout.sync = true
-    @app.logout(@user.auth_session) if(@user.respond_to?(:auth_session))
+    BBMB.auth.logout(@user.auth_session) if(@user.respond_to?(:auth_session))
     super
   end
 

data/lib/bbmb/model/customer.rb

@@ -70,7 +70,7 @@ class Customer
       return if @email.eql?(email)
       email = email.encode('UTF-8')
       ## notify the server of this change, as it affects the user-data
-      BBMB.server.rename_user(@email, email)
+      BBMB.server.rename_user(customer_id, @email, email)
       @email = email
     end
   end

data/lib/bbmb/util/server.rb

@@ -43,11 +43,16 @@ module BBMB
       def inject_order(customer_id, products, infos, opts={})
         @app.inject_order(customer_id, products, infos, opts)
       end
-      def rename_user(old_name, new_name)
+      def rename_user(customer_id, old_name, new_name)
         return if old_name.eql?(new_name)
         BBMB.auth.autosession(BBMB.config.auth_domain) do |session|
-          if(old_name.nil?)
-            session.create_entity(new_name)
+          if (old_name.nil?)
+            begin
+              session.create_entity(new_name)
+            rescue => error
+              raise error if Model::Customer.odba_extent.find {|x| x.email && x.email.index(new_name) }
+              SBSM.info("Skip session.create_entity for customer #{customer_id} as we found no customer with e-mail #{new_name}")
+            end
           else
             session.rename(old_name, new_name)
           end

data/lib/bbmb/version.rb

@@ -1,3 +1,3 @@
 module BBMB
-  VERSION = '2.2.0'
+  VERSION = '2.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bbmb
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger