removed unused code

app/controllers/data_app_controller.rb

@@ -5,8 +5,8 @@ class DataAppController < ApplicationController
     @app = DataApp.find(params[:id])
     @app = DataApp.find(params[:id])
     @nilm = @app.nilm
     @nilm = @app.nilm
     head :unauthorized and return unless current_user.views_nilm?(@nilm)
     head :unauthorized and return unless current_user.views_nilm?(@nilm)
-
-
+    # destroy any existing tokens
+    InterfaceAuthToken.where(user: current_user, data_app: @app).destroy_all
     token = InterfaceAuthToken.create(data_app: @app,
     token = InterfaceAuthToken.create(data_app: @app,
                                       user: current_user, expiration: 5.minutes.from_now)
                                       user: current_user, expiration: 5.minutes.from_now)
     @auth_url = _app_auth_url(token)
     @auth_url = _app_auth_url(token)
@@ -21,13 +21,4 @@ class DataAppController < ApplicationController
     "#{base}/#{token.data_app.id}/?auth_token=#{token.value}"
     "#{base}/#{token.data_app.id}/?auth_token=#{token.value}"
   end
   end
 
 
-  def authenticate_interface_user
-    @current_user = User.find_by_id(session[:user_id])
-    @app = DataApp.find_by_id(session[:interface_id])
-    if @current_user.nil? || @app.nil?
-      return false
-    end
-    true
-  end
-
 end
 end

app/controllers/nilms_controller.rb

@@ -26,12 +26,6 @@ class NilmsController < ApplicationController
     else
     else
       @service = StubService.new
       @service = StubService.new
     end
     end
-    # url's for data apps
-    @apps_available = request.headers.key?("HTTP_X_APP_BASE_URI")
-    if @apps_available
-      @base_url = request.headers["HTTP_X_APP_BASE_URI"]
-    end
-
   end
   end
 
 
   # POST /nilms.json
   # POST /nilms.json

app/views/nilms/show.json.jbuilder

@@ -13,16 +13,11 @@ json.data do
       end
       end
     end
     end
   end
   end
-  if @apps_available
-    json.data_apps(@nilm.data_apps) do |app|
-      json.id app.id
-      json.name app.name
-      json.url "#{@base_url}/#{app.id}/"
-      json.nilm_id @nilm.id
-    end
-  else
-    json.data_apps = []
+  json.data_apps(@nilm.data_apps) do |app|
+    json.id app.id
+    json.name app.name
+    json.url "" # this can be retrieved with data_app#show
+    json.nilm_id @nilm.id
   end
   end
-
 end
 end
 json.partial! 'helpers/messages', service: @service
 json.partial! 'helpers/messages', service: @service