#1028: calculate proper iframe url (#1054)

* WIP for iframe calc, stuck on AWS keys * More tweaks * Revert changes to systemconnectionstep
stripe · Mar 24, 2023 · f599918 · f599918
1 parent bf2f4f0
commit f599918
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -17,6 +17,7 @@ gem 'activesupport', '~> 6.1.7'
 gem 'reline', '~> 0.3.1'
 
 gem 'dotenv-rails', '2.8.1', groups: [:development, :test]
+gem 'foreman', groups: [:development, :test]
 gem 'rails', '~> 6.1.7.2'
 gem 'lograge', '~> 0.12'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -137,6 +137,7 @@ GEM
       multipart-post (~> 2)
     faraday-net_http (2.1.0)
     ffi (1.15.5)
+    foreman (0.87.2)
     fugit (1.8.1)
       et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
@@ -453,6 +454,7 @@ DEPENDENCIES
   capybara-screenshot (~> 1.0.26)
   database_cleaner (~> 1.7.0)
   dotenv-rails (= 2.8.1)
+  foreman
   hash_diff (~> 1.1.1)
   listen
   lograge (~> 0.12)

diff --git a/app/controllers/controller_helpers.rb b/app/controllers/controller_helpers.rb
@@ -32,7 +32,7 @@ module ControllerHelpers
   sig { params(user: StripeForce::User).returns(String) }
   protected def iframe_domain_from_user(user)
     if user.scratch_org?
-      "vf.force.com"
+      "scratch.vf.force.com"
     else
       "visualforce.com"
     end

diff --git a/sfdx/force-app/main/default/lwc/systemConnectionsStep/systemConnectionsStep.js b/sfdx/force-app/main/default/lwc/systemConnectionsStep/systemConnectionsStep.js
@@ -7,7 +7,7 @@ export default class SystemConnectionsStep extends LightningElement {
     @track stripeComplete = false;
     @track connectWindow;
     @track isSandbox;
-    // TODO should be pulled from APEX
+    // TODO should be pulled from APEX, use http://localhost:3100 for localdev
     @track rubyBaseURI = 'https://salesforce.suitesync.io';
     @track salesforceNamespace;
     @api hideAction = false;
@@ -19,6 +19,7 @@ export default class SystemConnectionsStep extends LightningElement {
     stripeConnectedAppCallback() {
         this.validateConnectionStatus(true, '');
         this.postMessageListener = (event) => {
+//            console.log('Got event: ' + JSON.parse(JSON.stringify(event)));
             if(event.origin !== this.rubyBaseURI) {
                 console.log("bad post message origin")
                 return