More fixes for local migrations

farhatahmad · Nov 1, 2023 · 73ac67a · 73ac67a
1 parent 63a86e3
commit 73ac67a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/app/controllers/api/v1/migrations/external_controller.rb b/app/controllers/api/v1/migrations/external_controller.rb
@@ -105,6 +105,11 @@ def create_user
 
           return render_error(status: :bad_request, errors: user&.errors&.to_a) unless user.save
 
+          if user_hash[:provider] != 'greenlight'
+            user.password_digest = nil
+            user.save(validations: false)
+          end
+
           render_data status: :created
         end
 

diff --git a/app/services/meeting_starter.rb b/app/services/meeting_starter.rb
@@ -64,7 +64,7 @@ def computed_options(access_code:)
       logoutURL: room_url,
       meta_endCallbackUrl: meeting_ended_url(host: @base_url),
       'meta_bbb-recording-ready-url': recording_ready_url(host: @base_url),
-      'meta_bbb-origin-version': 3,
+      'meta_bbb-origin-version': ENV.fetch('VERSION_TAG', 'v3'),
       'meta_bbb-origin': 'greenlight'
     }
   end

diff --git a/spec/controllers/admin/server_rooms_controller_spec.rb b/spec/controllers/admin/server_rooms_controller_spec.rb
@@ -154,7 +154,7 @@ def bbb_meetings
                                hasJoinedVoice: 'false',
                                hasVideo: 'false',
                                clientType: 'HTML5' } },
-      metadata: { 'bbb-origin-version': '3',
+      metadata: { 'bbb-origin-version': 'v3',
                   'bbb-recording-ready-url': 'http://localhost:3000/recording_ready',
                   'bbb-origin': 'greenlight',
                   endcallbackurl: 'http://localhost:3000/meeting_ended' },

diff --git a/spec/services/meeting_starter_spec.rb b/spec/services/meeting_starter_spec.rb
@@ -41,7 +41,7 @@
       logoutURL: url,
       meta_endCallbackUrl: File.join(base_url, '/meeting_ended'),
       'meta_bbb-recording-ready-url': File.join(base_url, '/recording_ready'),
-      'meta_bbb-origin-version': 3,
+      'meta_bbb-origin-version': 'v3',
       'meta_bbb-origin': 'greenlight',
       setting: 'value'
     }