From 1aa8d8d88d14f26eb6c8e6e7a810200e09f8475b Mon Sep 17 00:00:00 2001
From: Matthew Dillon <matthewrdillon@gmail.com>
Date: Tue, 20 Oct 2015 10:40:23 -0700
Subject: [PATCH] Clear out old stuff

---
 app/initializers/custom-session.js |  9 ---------
 config/environment.js              | 28 ----------------------------
 package.json                       |  1 -
 3 files changed, 38 deletions(-)
 delete mode 100644 app/initializers/custom-session.js

diff --git a/app/initializers/custom-session.js b/app/initializers/custom-session.js
deleted file mode 100644
index 011cd90..0000000
--- a/app/initializers/custom-session.js
+++ /dev/null
@@ -1,9 +0,0 @@
-export function initialize(container, application) {
-  application.inject('session:custom', '_store', 'service:store');
-}
-
-export default {
-  name: 'custom-session',
-  after: 'ember-data',
-  initialize: initialize
-};
diff --git a/config/environment.js b/config/environment.js
index d03d0ff..2b1e044 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -15,30 +15,6 @@ module.exports = function(environment) {
       genus: 'hymenobacter',
     },
     podModulePrefix: 'hymenobacterdotinfo/pods',
-    'simple-auth': {
-      session: 'session:custom',
-      authorizer: 'simple-auth-authorizer:token',
-      store: 'simple-auth-session-store:local-storage',
-      routeAfterAuthentication: 'protected.index',
-    },
-    'simple-auth-token': {
-      identificationField: 'email',
-      passwordField: 'password',
-      tokenPropertyName: 'token',
-      authorizationPrefix: 'Bearer ',
-      authorizationHeaderName: 'Authorization',
-      refreshAccessTokens: true,
-      timeFactor: 1000, // 1000 ms/s; JWT returned in unix time seconds
-      refreshLeeway: 1800, // (60 s/min) * (30 min) = 1800 s
-    },
-    contentSecurityPolicy: {
-      'default-src': "'none'",
-      'script-src': "'self'",
-      'font-src': "'self'",
-      'img-src': "'self' data:",
-      'style-src': "'self' 'unsafe-inline'",
-      'media-src': "'self'"
-    },
     flashMessageDefaults: {
       sticky: true,
       type: 'error',
@@ -62,11 +38,7 @@ module.exports = function(environment) {
     apiURL = 'https://bactdb.herokuapp.com';
   }
 
-  ENV['simple-auth']['crossOriginWhitelist'] = [apiURL];
-  ENV['simple-auth-token']['serverTokenEndpoint'] = apiURL + '/api/authenticate';
-  ENV['simple-auth-token']['serverTokenRefreshEndpoint'] = apiURL + '/api/refresh';
   ENV.apiURL = apiURL;
-  ENV.contentSecurityPolicy['connect-src'] = "'self' " + apiURL;
 
   return ENV;
 };
diff --git a/package.json b/package.json
index bec8b94..aa25acd 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,6 @@
     "ember-cli": "1.13.8",
     "ember-cli-app-version": "0.5.0",
     "ember-cli-babel": "^5.1.3",
-    "ember-cli-content-security-policy": "0.4.0",
     "ember-cli-dependency-checker": "^1.0.1",
     "ember-cli-divshot": "^0.1.7",
     "ember-cli-flash": "1.3.3",