zuora_connect 3.0.2.pre.m → 3.0.2.pre.p

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 5e7c7ce2e0e78ef1a25360865897abc69fa2c3f21b80e1ca42cee49a85c9cb01
4
- data.tar.gz: 71882230203de07dada155bcc578f7256bd5db78b868ed3a8a58dca134d7559d
3
+ metadata.gz: 10ba53dbb68c71e4355316f0446236cec11abb0e0a1c1fb50db56f932aa566a1
4
+ data.tar.gz: 5fc99abb2ed44c998fff5ee1b80e02e0b7ccea9f8b905d4057ad9cdb50dbdf6c
5
5
  SHA512:
6
- metadata.gz: 044cf34d49fc00ef25d5a6ede5069daef812b5344a6b33a854cdb02e8129e7e92f7b80c8c3a151183ecbffaf91a562e55f6816bdd8ec57a64d2f699e20eca9d5
7
- data.tar.gz: 739faf051944ccf5f6db4ab88dfee35408939a939c72784902146af9dc98864045b57551e1b967933cb5984240fa00e783bbceb13073bbc4ba224ad37ae96557
6
+ metadata.gz: e1258e6b3f018f184992fdbd2d956de1c4e5575ddf3ce531087cbda43e72703bc257a46bffdd8b14d7840b997109fd2e18f4c3b3c1a25144d8304debe6d96ddb
7
+ data.tar.gz: 0ae63bcaee8a665c53f1b43b065111621d66550130c42632431b685be9332eab9452db43afc22bcd20a9a44260a6e4d200fb0e44bdc14c826084461cba18a0ea
@@ -27,7 +27,7 @@ module ZuoraConnect
27
27
  CATALOG_LOOKUP_CACHE_RESULT_KEY = 'CatalogCache'
28
28
  TIMEZONE_LOG_RATE_LIMIT_KEY = 'TimezoneLoggedAt'
29
29
  TIMEZONE_LOG_PERIOD = 4.hours
30
- IGNORED_LOCALS = ['fr', 'ja', 'es', 'zh', 'de']
30
+ IGNORED_LOCALS = ['fr', 'ja', 'es', 'zh', 'de', 'it', 'sv']
31
31
  INTERNAL_HOSTS = []
32
32
  LOGIN_TENANT_DESTINATION = 'target_login'
33
33
  AWS_AUTH_ERRORS = [
@@ -338,7 +338,10 @@ module ZuoraConnect
338
338
 
339
339
  if (missing_identity || missmatched_entity || different_zsession)
340
340
  zuora_details.merge!({'identity' => {'different_zsession' => different_zsession, 'missing_identity' => missing_identity, 'missmatched_entity' => missmatched_entity}})
341
- identity, response = zuora_client.rest_call(url: zuora_client.rest_endpoint("identity"))
341
+ identity, response = zuora_client.rest_call(
342
+ url: zuora_client.rest_endpoint("identity"),
343
+ zuora_track_id: ZuoraConnect::RequestIdMiddleware.zuora_request_id
344
+ )
342
345
 
343
346
  if zuora_entity_id != identity['entityId']
344
347
  if zuora_tenant_id.to_s == "10548"
@@ -366,9 +369,10 @@ module ZuoraConnect
366
369
  ZuoraConnect.logger.debug("UI Authorization", zuora: zuora_details)
367
370
 
368
371
  client_describe, response = zuora_client.rest_call(
369
- url: zuora_client.rest_endpoint("genesis/user/info").gsub('v1/', ''),
370
- session_type: zuora_client.class == ZuoraAPI::Oauth ? :bearer : :basic,
371
- headers: auth_headers
372
+ url: zuora_client.rest_endpoint("genesis/user/info").gsub('v1/', ''),
373
+ session_type: zuora_client.class == ZuoraAPI::Oauth ? :bearer : :basic,
374
+ headers: auth_headers,
375
+ zuora_track_id: ZuoraConnect::RequestIdMiddleware.zuora_request_id
372
376
  )
373
377
  session["ZuoraCurrentUserInfo"] = client_describe
374
378
  end
@@ -380,7 +384,10 @@ module ZuoraConnect
380
384
  else
381
385
  #if app_instance_ids is present then permissions still controlled by connect
382
386
  if params[:app_instance_ids].present?
383
- navbar, response = zuora_client.rest_call(url: zuora_client.rest_endpoint("navigation"))
387
+ navbar, response = zuora_client.rest_call(
388
+ url: zuora_client.rest_endpoint("navigation"),
389
+ zuora_track_id: ZuoraConnect::RequestIdMiddleware.zuora_request_id
390
+ )
384
391
  urls = navbar['menus'].map {|x| x['url']}
385
392
  app_env = ENV["DEIS_APP"] || "xyz123"
386
393
  url = urls.compact.select {|url| File.basename(url).start_with?(app_env + '?')}.first
@@ -462,7 +469,7 @@ module ZuoraConnect
462
469
  appinstances = ZuoraConnect::AppInstance.where("zuora_entity_ids ?& array[:entities] = true AND zuora_domain = :host", entities: [zuora_entity_id], host: zuora_client.rest_domain).pluck(:id, :name)
463
470
 
464
471
  if appinstances.size > 0
465
- redirect_to "https://#{zuora_host}/apps/newlogin.do?retURL=#{request.fullpath}"
472
+ redirect_to "https://#{zuora_host}/apps/newlogin.do?retURL=#{request.fullpath}&pos=0"
466
473
  return
467
474
  end
468
475
  end
@@ -485,12 +492,17 @@ module ZuoraConnect
485
492
  body: body.to_json,
486
493
  url: zuora_client.rest_endpoint("genesis/clients").gsub('v1/', ''),
487
494
  session_type: zuora_client.class == ZuoraAPI::Oauth ? :bearer : :basic,
488
- headers: auth_headers
495
+ headers: auth_headers,
496
+ zuora_track_id: ZuoraConnect::RequestIdMiddleware.zuora_request_id
489
497
  )
490
498
 
491
499
  new_zuora_client = ZuoraAPI::Oauth.new(url: "https://#{zuora_host}", oauth_client_id: oauth_response["clientId"], oauth_secret: oauth_response["clientSecret"] )
492
500
  if session["ZuoraCurrentUserInfo"].blank?
493
- client_describe, response = new_zuora_client.rest_call(url: zuora_client.rest_endpoint("genesis/user/info").gsub('v1/', ''), session_type: :bearer)
501
+ client_describe, response = new_zuora_client.rest_call(
502
+ url: zuora_client.rest_endpoint("genesis/user/info").gsub('v1/', ''),
503
+ session_type: :bearer,
504
+ zuora_track_id: ZuoraConnect::RequestIdMiddleware.zuora_request_id
505
+ )
494
506
  else
495
507
  client_describe = session["ZuoraCurrentUserInfo"]
496
508
  end
@@ -544,7 +556,7 @@ module ZuoraConnect
544
556
  end
545
557
 
546
558
  rescue ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError => ex
547
- output_xml, input_xml, response = zuora_client.soap_call(errors: [], z_session: false) do |xml|
559
+ output_xml, input_xml, response = zuora_client.soap_call(errors: [], z_session: false, zuora_track_id: ZuoraConnect::RequestIdMiddleware.zuora_request_id) do |xml|
548
560
  xml['api'].getUserInfo
549
561
  end
550
562
  final_error = output_xml.xpath('//fns:FaultCode', 'fns' =>'http://fault.api.zuora.com/').text
@@ -556,7 +568,7 @@ module ZuoraConnect
556
568
  else
557
569
  ZuoraConnect.logger.info("UI Authorization Error", ex, response: { params: final_error })
558
570
  end
559
- redirect_to "https://#{zuora_host}/apps/newlogin.do?retURL=#{request.fullpath}"
571
+ redirect_to "https://#{zuora_host}/apps/newlogin.do?retURL=#{request.fullpath}&pos=1"
560
572
  return
561
573
 
562
574
  rescue ZuoraAPI::Exceptions::ZuoraAPIError, Exception => ex
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module ZuoraConnect
4
- VERSION = "3.0.2-m"
4
+ VERSION = "3.0.2-p"
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: zuora_connect
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.2.pre.m
4
+ version: 3.0.2.pre.p
5
5
  platform: ruby
6
6
  authors:
7
7
  - Connect Team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-01-26 00:00:00.000000000 Z
11
+ date: 2022-03-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: apartment
@@ -445,7 +445,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
445
445
  - !ruby/object:Gem::Version
446
446
  version: 1.3.1
447
447
  requirements: []
448
- rubygems_version: 3.2.32
448
+ rubygems_version: 3.3.7
449
449
  signing_key:
450
450
  specification_version: 4
451
451
  summary: Summary of Connect.