refactor: load organization from db if possible (#1959)

taken from #1949

This can be merged independently, so let's do that!

Co-authored-by: Samuel Oey <samuel.oey@gmail.com>

app/controllers/application_controller.rb

@@ -34,8 +34,11 @@ def delete_otp_session_variables
 
   private
 
-  # TODO: Refactor this in Phase II to handle multi-tenancy
   def set_organization
-    @organization = Organization.singleton
+    @organization = if params[:organization_id].present?
+                      Organization.find(params[:organization_id])
+                    else
+                      Organization.singleton
+                    end
   end
 end