bbmb 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce9a5032fdcc3373fb7c9e71aad87962a8bcf544
-  data.tar.gz: e1e8a51f597e798860dbdcc7e72ef05f44a74e17
+  metadata.gz: e3bf4ee6e274ed39fab6f5ba33c8ea2de97fb4ad
+  data.tar.gz: fc49c06f72935b949ddb983497337c97730e582f
 SHA512:
-  metadata.gz: bcb5347927b02ea0c2c8a2cbc8a244cc0517f0c3630478feaa5469fdb11e35ae764684725543666d2fb4f4d78c8a6541337918e0dda88bc2bfc3aad91a4c58e7
-  data.tar.gz: 902fb4f55adafccc2d580428cbd7e4236c13d92a1287848b6250e783a71100f058a83a41723ce1286d096c5d6720c7e0d3d7fe4330bc63df7bd28d43ead9d7f3
+  metadata.gz: 142d5480d2bbba2aad68dade8ee5ad11d9075d2e4de140d2d282bd315ed8d777d6edef257c5ac28bd787d4ae55f1532dad94adcdad32a28c22ba4234df55354a
+  data.tar.gz: fb162c84adfdb3ef9fc0d3b942a531b216b56dfaf662e07f1a90a7cbd817e2b706f0fce15e9682a125653f366b6068df48048c35a0f740d5bd69f0fb63a84bcb

data/.travis.yml

@@ -8,10 +8,8 @@ sudo: false
 before_install:
   - gem --version
 
-script: bundle exec rake test
-
 rvm:
-  - 2.2.3
+  - 2.4.0
   - 2.3.1
   - ruby-head
 

data/Gemfile

@@ -1,5 +1,7 @@
 source 'https://rubygems.org'
 gemspec
+gem 'sbsm', :path => '../sbsm'
+gem 'ydim', :path => '../ydim'
 
 group :debugger do
 	if RUBY_VERSION.match(/^1/)

data/History.txt

@@ -1,18 +1,21 @@
-=== 2.1.3 / 08.09.2016
+=== 2.1.4 / 15.05.2017
 
-* Improve mutex usage on model
+* Admin users create new customer if it does not exist with the given customerid
+* Fixed  set new password for admin users
+* Fixed importer
+* Ported to SBSM with rack (Using SBSM.info/debug for logging)
 
-=== 2.1.2 / 07.09.2016
+=== 2.1.3 / 09.09.2016
 
-* Prevent mail error by no price product
+* minor improvements
 
-=== 2.1.1 / 02.09.2016
+=== 2.1.2 / 07.09.2016
 
-* Fix conversion error for backup_dir at PopMission
+* minor improvements
 
-=== 2.1.0 / 19.08.2016
+=== 2.1.1 / 02.09.2016
 
-* Add ProductInfo#to_product utility method
+* minor improvements
 
 === 2.0.9 / 20.07.2016
 

data/Rakefile

@@ -7,7 +7,7 @@ require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 require 'bbmb/version'
 
-task :default => :test
+task :default => [:clobber, :test, :gem]
 
 # dependencies are now declared in bbmb.gemspec
 

data/bbmb.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version     = BBMB::VERSION
   spec.author      = "Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger"
   spec.email       = "mhatakeyama@ywesee.com, zdavatz@ywesee.com, ngiger@ywesee.com"
-  spec.description = "ywesee distributed invoice manager. A Ruby gem"
-  spec.summary     = "ywesee distributed invoice manager"
+  spec.description = "A Ruby gem for browser based orders of approved medical drugs in Switzerland"
+  spec.summary     = "browser based orders of medical drugs"
   spec.homepage    = "https://github.com/zdavatz/bbmb"
   spec.license       = "GPL-v2"
   spec.files         = `git ls-files -z`.split("\x0")
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ydbd-pg", '>= 0.5.2'
   spec.add_dependency "ydbi",    '>= 0.5.3'
   spec.add_dependency "json"
-  spec.add_dependency "sbsm"
+#  spec.add_dependency "sbsm",    '>= 1.3.5'
   spec.add_dependency "htmlgrid"
   spec.add_dependency "ydim",    '>= 0.5.1'
   spec.add_dependency "syck"

data/lib/bbmb.rb

@@ -4,6 +4,6 @@ require 'bbmb/version'
 
 module BBMB
   class << self
-    attr_accessor :auth, :config, :logger, :persistence, :server
+    attr_accessor :auth, :config, :persistence, :server
   end
 end

data/lib/bbmb/config.rb

@@ -59,8 +59,7 @@ module BBMB
     'invoice_percentage'              => 0.1,
     'i2_100'                          => 'YWESEE',
     'load_files'                      => ['bbmb/util/csv_importer'],
-    'log_file'                        => STDERR,
-    'log_level'                       => 'INFO',
+    'log_pattern'                     => File.join(Dir.pwd, 'log','/%Y/%m/%d/app_log'),
     'mail_suppress_sending'           => false,
     'mail_confirm_body'               => nil,
     'mail_confirm_cc'                 => [],
@@ -100,6 +99,11 @@ module BBMB
     'vat_rate'                        => 2.4,
     'ydim_config'                     => nil,
     'ydim_id'                         => nil,
+    'yus_domain'                      => 'com.davaz',
+    'yus_server'                      => nil,
+    'test_user'                       => nil,
+    'test_password'                   => nil,
+    'yus_uri'                         => 'drbssl://localhost:9997',
   }
 
   config = RCLConf::RCLConf.new(ARGV, defaults)

data/lib/bbmb/html/state/change_password.rb

@@ -24,7 +24,7 @@ class ChangePassword < Global
       update_user input
       unless(error?)
         BBMB.persistence.save(@model)
-        return State::Info.new(@session, :message => :login_data_saved, 
+        return State::Info.new(@session, :message => :login_data_saved,
                                          :event => :home)
       end
     end
@@ -36,8 +36,8 @@ class ChangePassword < Global
     @model.protect!(:email)
     if(passhash = input.delete(:confirm_pass))
       begin
-        @session.user.set_password(email, passhash)
-      rescue Yus::YusError => e 
+        @session.auth_session.set_password(email, passhash)
+      rescue Yus::YusError => e
         @errors.store(:pass, create_error(:e_pass_not_set, :email, email))
       end
     end

data/lib/bbmb/html/state/current_order.rb

@@ -30,7 +30,7 @@ class CurrentOrder < Global
   end
   def commit
     ## update most recent values and ensure @model = _customer.current_order
-    do_update 
+    do_update
     if @session.lookandfeel.enabled?(:terms_of_service, false)
       if @session.user_input(:accept_terms)
         _customer.terms_last_accepted ||= Time.now

data/lib/bbmb/html/state/customer.rb

@@ -31,9 +31,9 @@ class Customer < Global
       @cleartext = BBMB::Util::PasswordGenerator.generate(@model)
       passhash = @session.validate(:pass, @cleartext)
       begin
-        @session.user.grant(email, 'login', 
+        @session.auth_session.grant(email, 'login',
                           BBMB.config.auth_domain + '.Customer')
-        @session.user.set_password(email, passhash)
+        @session.auth_session.set_password(email, passhash)
       rescue Yus::YusError
         @errors.store(:pass, create_error(:e_pass_not_set, :pass, nil))
       end
@@ -69,7 +69,7 @@ class Customer < Global
       @errors.store(:error, create_error(:error, :error, nil))
       @errors.store(:user, create_error(:e_user_unsaved, :error, nil))
     else
-      input.each { |key, val| 
+      input.each { |key, val|
         writer = "#{key}="
         if(@model.respond_to?(writer) && @model.send(key) != val)
           @model.send(writer, val)
@@ -93,10 +93,10 @@ class Customer < Global
     @model.protect!(:email)
     if(passhash = input.delete(:confirm_pass))
       begin
-        @session.user.grant(email, 'login', 
+        @session.auth_session.grant(email, 'login',
                           BBMB.config.auth_domain + '.Customer')
-        @session.user.set_password(email, passhash)
-      rescue Yus::YusError => e 
+        @session.auth_session.set_password(email, passhash)
+      rescue Yus::YusError => e
         @errors.store(:pass, create_error(:e_pass_not_set, :email, email))
       end
     end

data/lib/bbmb/html/state/customers.rb

@@ -16,7 +16,7 @@ module BBMB
           start = Time.now
           @model  = BBMB.persistence.all(Model::Customer)
           @sortby = [:organisation]
-          BBMB.logger.debug('State') {
+          SBSM.debug('State') {
             sprintf("Customers#init: loaded %i customers in %1.5fs",
                     @model.size, Time.now - start)
           }
@@ -51,7 +51,7 @@ module BBMB
 
         def page(model)
           index = @session.user_input(:index).to_i
-          step  = @session.user.pagestep || BBMB.config.pagestep
+          step  = @session.user.get_preference(:pagestep) || BBMB.config.pagestep
           page = OpenStruct.new
           page.index     = index
           page.first     = index + 1

data/lib/bbmb/html/state/global.rb

@@ -22,10 +22,12 @@ module BBMB
   module Html
     module State
 class Global < SBSM::State
-  def initialize(first, second)
-    super(first, second)
+  def initialize(session, model)
+    SBSM.info "BBMB::Html::State Global session #{session.class} model #{model.class}"
+    super(session, model)
   end
   def logout
+    SBSM.info "BBMB::Html::State Global logout"
     @session.logout
     State::Login.new(@session, nil)
   end

data/lib/bbmb/html/state/init.rb

@@ -10,6 +10,7 @@ module BBMB
       class Init < SBSM::State
         VIEW = Html::View::LoginForm
         def login
+          SBSM.info "BBMB::Html::Init login #{user_input(:email)} #{user_input(:pass)}  #{@user.class}"
           if(res = @session.login)
             Customers.new(@session, nil)
           end

data/lib/bbmb/html/state/login.rb

@@ -15,6 +15,8 @@ module BBMB
 class Login < SBSM::State
   VIEW = View::Login
   def login
+    # is called from sbsm
+    SBSM.info "BBMB::Html::State Login login #{user_input(:email)} #{user_input(:pass)}  #{@user.class}"
     reconsider_permissions(@session.login)
     trigger(:home)
   rescue Yus::UnknownEntityError
@@ -61,11 +63,13 @@ TVS/Virbac-Nr:  #{input[:customer_id]}
     }
   end
   def viral_modules(user)
-    [ 
+    [
       ['.Admin', State::Viral::Admin],
       ['.Customer', State::Viral::Customer],
     ].each { |key, mod|
+             puts "viral_modules trying #{key} #{mod}"
       if(user.allowed?("login", BBMB.config.auth_domain + key))
+           puts "Was allowed via user #{user} for #{mod}"
         yield mod
       end
     }

data/lib/bbmb/html/state/viral/admin.rb

@@ -23,7 +23,8 @@ module Admin
     Model::Customer.find_by_customer_id(customer_id)
   end
   def home
-    trigger(@session.user.home || :customers)
+    home = @session.user.get_preference(:home) || :customers
+    trigger(home)
   end
   def order
     if(order_id = @session.user_input(:order_id))

data/lib/bbmb/html/state/viral/customer.rb

@@ -23,7 +23,7 @@ module Customer
     :search_favorites =>  State::FavoritesResult,
   }
   def _customer
-    @customer ||= Model::Customer.find_by_email(@session.user.name)
+    @customer ||= Model::Customer.find_by_email(@session.auth_session.name)
   end
   def _increment_order(order)
     quantities = user_input(:quantity)
@@ -58,7 +58,7 @@ module Customer
       false
     else
       quantities.each { |article_number, quantity|
-        order.add(quantity.to_i, 
+        order.add(quantity.to_i,
                   Model::Product.find_by_article_number(article_number))
       }
       BBMB.persistence.save(order, _customer)
@@ -91,7 +91,8 @@ module Customer
     _transfer(_customer.favorites)
   end
   def home
-    trigger(@session.user.home || :current_order)
+    home = @session.user.get_preference(:home) || :current_order
+    trigger(home)
   end
   def increment_order
     if(_increment_order(_customer.current_order))

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

@@ -15,36 +15,68 @@ class KnownUser < SBSM::User
   #
   ### Customers need permissions for:
   # login BBMB.config.auth_domain + ".Customer"
-  attr_reader :auth_session 
+  attr_reader :auth_session
   PREFERENCE_KEYS = [ :home, :pagestep ]
   PREFERENCE_KEYS.each { |key|
     define_method(key) {
-      remote_call(:get_preference, key) 
+      remote_call(:get_preference, key)
     }
-  }
+  } if false
   def initialize(session)
-    @auth_session = session
+    puts "BBMB::Html::Util::KnownUser.new object_id is #{self.object_id} SBSM::Session ? #{self.is_a? SBSM::Session} auth_session is #{session.class}"
+    @auth_session = session.auth_session
+    # puts "backtrace #{caller.join("\n")}"
+    # @auth_session.auth.allowed?('edit', 'yus.entities')
   end
   def allowed?(action, key=nil)
+    if @auth_session
+      return @auth_session.allowed?(action, key)
+      return @auth_session.remote_call(:allowed?, action, key)
+    end
+    SBSM.debug('User ' + sprintf('allowed?(%s, %s)', action, key))
+    if defined?(yus_user) && yus_user
+      allowed = yus_user.send(:allowed?, action, key)
+    end if false
+    return true
+    # SBSM.debug('User'+ sprintf('allowed?(%s, %s) -> %s', action, key, allowed))
+    return allowed
+    # session.rb:25:in `login' BBMB::Html::Util::Session login claude.meier@gmx.net 5972659ce6c7f9b2356c0e650c7c40a3
     allowed = remote_call(:allowed?, action, key)
-    BBMB.logger.debug('User') {
+    SBSM.debug('User') {
       sprintf('%s: allowed?(%s, %s) -> %s', name, action, key, allowed)
     }
     allowed
+  rescue => error
+    puts error
+    puts error.backtrace.join("\n")
   end
   def entity_valid?(email)
-    !!(allowed?('edit', 'yus.entities') \
-      && (entity = remote_call(:find_entity, email)) && entity.valid?)
+    !!(@auth_session.allowed?('edit', 'yus.entities') \
+      && (entity = @auth_session.find_entity(email)) && entity.valid?)
   end
   def navigation
+    puts "BBMB::Html::Util::KnownUser navigation returning  [ :logout ]"
     [ :logout ]
   end
+  def get_preference(key)
+    return @auth_session.get_preference(key.to_s)
+    remote_call(:get_preference, key)
+  end
   def remote_call(method, *args, &block)
-    @auth_session.send(method, *args, &block)
+    SBSM.debug("remote_call #{method} args #{args} block.nil? #{block.nil?}")
+    if defined?(@auth_session) && @auth_session.is_a?(DRb::DRbObject)
+      return @auth_session.send(method, *args, &block)
+    else
+      return false
+      return super(method, *args, &block)
+    end
   rescue RangeError, DRb::DRbError => e
-    BBMB.logger.error('auth') { e }
+    SBSM.info('auth') { e }
+  rescue error
+    puts error
+    puts error.backtrace.join("\n")
   end
-  alias :method_missing :remote_call
+  # alias :method_missing :remote_call
 end
     end
   end

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

@@ -1,14 +1,10 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
+require 'uri'
 require 'bbmb/config'
 require 'sbsm/session'
 require 'bbmb/html/state/global'
-begin
-require 'bbmb/html/util/lookandfeel'
-rescue LoadError
-  # ignore it for unit tests
-end
 require 'bbmb/html/util/known_user'
 
 
@@ -21,12 +17,35 @@ class Session < SBSM::Session
   DEFAULT_STATE = State::Login
   EXPIRES = BBMB.config.session_timeout
   PERSISTENT_COOKIE_NAME = "bbmb-barcodereader"
+  if uri = URI.parse(BBMB.config.http_server)
+    SERVER_NAME = uri.host
+  end
+  attr_reader :email, :pass, :auth_session
+  def initializexx(app:,  cookie_name:, trans_handler:, validator:)
+    super(app,  cookie_name, trans_handler, validator)
+  end
   def login
-    @user = @app.login(user_input(:email), user_input(:pass))
+    @email = user_input(:email)
+    @password = user_input(:pass)
+    # @user.respond_to?(:session=)) is FALSE!!!!
     @user.session = self if(@user.respond_to?(:session=))
+    # Before rack: @user = @app.login(user_input(:email), user_input(:pass))
+    @auth = DRb::DRbObject.new(nil, BBMB.config.auth_url)
+    @auth_session = @auth.login(user_input(:email), user_input(:pass), BBMB.config.auth_domain) # logs in claude meier without problem, but not admin
+    if @auth_session.valid?
+      @user = BBMB::Html::Util::KnownUser.new(self) # TODO:Should we set it already in the initialize method?
+    else
+      @user = SBSM::UnknownUser
+    end
+    SBSM.info "BBMB::Html::Util::Session login #{user_input(:email)} #{user_input(:pass)}  #{@user.class} @auth #{@auth} auth_session #{@auth_session}"
+    pp @auth
+    pp @auth_session
+    pp @user
     @user
   end
   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))
     super
   end
@@ -35,11 +54,12 @@ class Session < SBSM::Session
     if(@lookandfeel.nil? \
       || (@lookandfeel.language != persistent_user_input(:language)))
       require 'bbmb/html/util/lookandfeel'
-      @lookandfeel = Lookandfeel.new(self) # dtsttcpw
+      @lookandfeel = Lookandfeel.new(self)
     end
     @lookandfeel
   end
   def process(request)
+    SBSM.info "BBMB::Html::Util::Session process"
     begin
       if(@user.is_a?(KnownUser) && @user.auth_session.expired?)
         logout
@@ -52,6 +72,11 @@ class Session < SBSM::Session
   def validate(key, value)
     @validator.validate(key, value)
   end
+  def remote_call(method, *args, &block)
+    @yus_user.send(method, *args, &block)
+  rescue RangeError, DRb::DRbError => e
+    BBMB.logger.error('auth') { e }
+  end
 end
     end
   end