radiant-booking_app-extension 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5331470a00155ab21fc6817ba578a494e0cb36f
-  data.tar.gz: 19f019e66df0b6d0397595e5323499776c3af0b4
+  metadata.gz: 55efe97874af8834b63eab525715118924e4b38a
+  data.tar.gz: 5fe8d585ccc5957bf3320f616575f5994b22d758
 SHA512:
-  metadata.gz: 5d4c07c1c8e0ff295489b126a4a343b205dbb5ef4cfde1869e8533ed7b7d611897033976584018ea1100936dbc5b3d55225624af865e6645ca6f763f2d4fd8cb
-  data.tar.gz: 6e0006146463aa1350b3bcf387f4d5599a6d9420715e6a7c7b32efbc939a33048a7d6b5ee773c54518215dec580f4ab67429f050136f9fe63adc637d4b9a0269
+  metadata.gz: b67c9e3fc95998ae632a9f73656aa86eeeecd742ca3ba1330b01031304ba5cf28e2931c31abac32a0f56d77189106dd267af8d08078571e108ed7689e451c727
+  data.tar.gz: 24ef32b55f26641660db56e29260d73572d4618567bd64b4f0c4c045a021ed083e37211f12d241e991fa9a9d579460262261b4a90e730d25d05fc8d0808238c9

data/CHANGELOG.md

@@ -0,0 +1,17 @@
++# Change Log
++All notable changes to this project will be documented in this file.
++This project adheres to [Semantic Versioning](http://semver.org/).
++This changelog adheres to [Keep a
+CHANGELOG](http://keepachangelog.com/).
+
+## Unreleased
+### Changed
+- [TT-1567] Hack for exclusive products fixed by storing additional details
+  (Requires CMS to use ajax login)
+
+### Removed
+- [TT-938] Remove deprecated secure-pay url
+
+### Updated
+- [TT-1377] Maintain the files original status code when proxying
+- [TT-1340] Proxy more content-types as file

data/app/controllers/page_mount_controller.rb

@@ -17,6 +17,9 @@ class PageMountController < SiteController
     # ... or determine if having blank cookies means "don't set anything buddy"
     session[:proxied_cookies] = response.cookies unless response.cookies.blank?
 
+    # Must be done before redirect (for logout)
+    store_client_type_id_in_cms_session(response, request)
+
     if response.redirect?
       redirect_to response.redirect_location
       return
@@ -36,11 +39,10 @@ class PageMountController < SiteController
       send_file(proxy_response)
     else
       @title = proxy_response.headers[:x_title]
-      store_client_type_id_in_cms_session(proxy_response) if login_details_request?(request)
       render text:         proxy_response.body,
              content_type: proxy_response.content_type,
              status:       proxy_response.code,
-             layout:       true
+             layout:       (request.path != '/app_cells')
     end
   end
 
@@ -50,13 +52,19 @@ class PageMountController < SiteController
 
   private
 
-  def store_client_type_id_in_cms_session(proxy_response)
+  def store_client_type_id_in_cms_session(response, request)
     # Special Hack so CC can show exclusive products for clients
-    session[:client_type_id] = JSON.parse(proxy_response.body)['client_type_id']
-  end
-
-  def login_details_request?(request)
-    request.path == '/parties/login_header_details'
+    case request.path
+    when '/parties/login.json'
+      json = JSON.parse(response.body)
+      session[:client_id] = json['client_id']
+      session[:client_type_id] = json['client_type_id']
+      session[:client_type_is_agent] = json['client_type_is_agent']
+    when '/parties/logout'
+      session[:client_id] = nil
+      session[:client_type_id] = nil
+      session[:client_type_is_agent] = nil
+    end
   end
 
   def http_proxy(url)
@@ -95,6 +103,7 @@ class PageMountController < SiteController
 
   def send_file(proxy_response)
     send_data proxy_response.body,
+              status:      proxy_response.code,
               type:        proxy_response.content_type,
               disposition: proxy_response.content_disposition
   end
@@ -127,7 +136,7 @@ class PageMountController < SiteController
       headers[:content_disposition] || DEFAULT_CONTENT_DISPOSITION
     end
 
-    delegate :body, :content_type, :code, to: :response
+    delegate :body, :code, to: :response
 
     def headers
       @response.body.headers

data/config/routes.rb

@@ -20,7 +20,6 @@ ActionController::Routing::Routes.draw do |map|
 
     page_mount.connect 'cart/*paths'
 
-    page_mount.connect 'secure-pay'
     page_mount.connect 'secure-payment'
     page_mount.connect 'cart_activations/*paths'
     page_mount.connect 'bookings/manage/*paths'

data/radiant-booking_app-extension.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "radiant-booking_app-extension"
-  spec.version       = '0.1.1'
+  spec.version       = '0.2.0'
   spec.authors       = ["Michael Noack"]
   spec.email         = ["support@travellink.com.au"]
   spec.description   = %q{Integrate booking app with radiant}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: radiant-booking_app-extension
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Noack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-23 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: radius
@@ -73,6 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - Rakefile
 - app/controllers/page_mount_controller.rb
 - app/views/page_mount/proxy.erb