diff --git a/app/assets/javascripts/configureTrack.js b/app/assets/javascripts/configureTrack.js index 467f87c7e..4a1ee97d6 100644 --- a/app/assets/javascripts/configureTrack.js +++ b/app/assets/javascripts/configureTrack.js @@ -768,7 +768,7 @@ var $option1 = $('#voice-chat-type > option[value="1"]'); // remove Session Audio option from voice chat if none are available and not already assigned - if (unusedAudioOutputs.length === 0 && chatAssignedList.length === 0) { + if (inputUnassignedList.length === 0 && chatAssignedList.length === 0) { logger.debug("Removing Option 1 from Voice Chat dropdown."); $option1.remove(); } diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 053e2bdb0..c516b01d3 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -73,15 +73,17 @@ class SessionsController < ApplicationController end auth_hash = request.env['omniauth.auth'] - authorization = UserAuthorization.find_by_provider_and_uid(auth_hash["provider"], auth_hash["uid"]) + #authorization = UserAuthorization.find_by_provider_and_uid(auth_hash["provider"], auth_hash["uid"]) - if authorization.nil? + # Always make and save a new authorization. This is because they expire, and honestly there's no cost + # to just making and saving it. + #if authorization.nil? authorization = current_user.user_authorizations.build :provider => auth_hash[:provider], :uid => auth_hash[:uid], :token => auth_hash[:credentials][:token], :token_expiration => Time.at(auth_hash[:credentials][:expires_at]) authorization.save - end + #end render 'oauth_complete', :layout => "landing" end