DomoApps · jpumford · May 25, 2016 · May 25, 2016 · May 25, 2016 · May 26, 2016
diff --git a/.babelrc b/.babelrc
@@ -1,4 +1,4 @@
 {
-  "presets": ["es2015-loose", "stage-1"],
+  "presets": ["es2015"],
   "plugins": ["transform-runtime", "add-module-exports"]
 }
diff --git a/.eslintrc b/.eslintrc
@@ -15,6 +15,8 @@
     "ON_DEV": false,
     "ON_TEST": false,
     "ON_PROD": false,
+    "APP_NAME": false,
+    "VERSION": false,
     "sinon": false,
     "expect": false,
     "angular": false,

diff --git a/CHANGELOG.md → FRAMEWORK-CHANGELOG.md b/CHANGELOG.md → FRAMEWORK-CHANGELOG.md
diff --git a/FRAMEWORK-CONTRIBUTING.md b/FRAMEWORK-CONTRIBUTING.md
@@ -0,0 +1,27 @@
+## Contributing
+
+We are open to, and grateful for, any contributions made by the community.
+
+## Reporting Issues
+
+Please use the [issue tracker](https://github.com/DomoApps/starter-kit/issues) to log bugs, ask questions, and request features. Search through the issues to make sure your issue hasn’t already been reported.
+
+## Development
+
+Visit the [issue tracker](https://github.com/DomoApps/starter-kit/issues) to find a list of open issues that need attention.
+
+Fork, then clone the repo:
+
+```
+git clone https://github.com/your-username/starter-kit.git
+```
+
+Develop your feature or bugfix and create a Pull Request. Our team will review the PR. If we see potential problems with the code's functionality or design, we will ask you to make changes during the review process; otherwise, we will merge your changes and create a new version of starter-kit. Please keep your Pull Request focused to a specific issue.
+
+Make sure your contributions pass starter-kit's unit tests and linter. To run both the tests and the linter, use this command:
+
+```
+npm run test
+```
+
+Thank you for contributing!
diff --git a/lab.html b/lab.html
@@ -1,7 +1,7 @@
 <html>
   <head>
     <meta charset="UTF-8">
-    <link rel="stylesheet" type="text/css" href="https://domoapps.s3.amazonaws.com/cdn/domo-bits/v1/icon-bits.css">
+    <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css">
     <style>
       body{
         background: red;
@@ -81,11 +81,6 @@
         cursor: move;
       }
 
-      .icon {
-        max-width: 50%;
-        pointer-events: none;
-      }
-
       .menu-options {
         box-sizing: border-box;
         padding: 15px;
@@ -136,6 +131,10 @@
         -ms-user-select: none;
       }
 
+      .fa-large {
+        font-size: 2em;
+      }
+
 
     </style>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.6/d3.js" charset="utf-8"></script>
@@ -156,7 +155,7 @@
     </div>
 
     <div class="menu-container" style="top: 88px;">
-      <div class="menu-button" draggable="true"><i class="icon icon-gear unselectable"></i></div>
+      <div class="menu-button" draggable="true"><i class="fa fa-cog fa-large"></i></div>
       <div class="menu-options unselectable">
         <form>
           <input id="locale" type="text" name="locale" value="en-US" />

diff --git a/other/init-repo.es6.js b/other/init-repo.es6.js
@@ -5,8 +5,7 @@ import inquirer from 'inquirer';
 import kebabCase from 'lodash.kebabcase';
 import shelljs from 'shelljs';
 
-// TODO: update with the repo location on Github after we migrate
-const STARTER_REPO = '[email protected]:AppTeam6/da-webpack.git';
+const STARTER_REPO = 'https://github.com/DomoApps/starter-kit.git';
 const GENERATOR_KEYWORDS = ['da-webpack', 'starter-kit'];
 
 const DOMO_STRICT_LICENSE = [

diff --git a/other/karma.conf.es6.js b/other/karma.conf.es6.js
@@ -1,70 +1,46 @@
-const path = require('path');
+module.exports = config => {
+  // load external cdn dependencies
+  const pkg = require('../package.json');
+  const cdns = Object.values(pkg.cdnDependencies);
 
-// load webpack config here for for webpack preprocessor
-const webpackConfig = require('../webpack.config');
-delete webpackConfig.devtool;
-webpackConfig.cache = true;
+  // entry file that bundles all the test files
+  const testEntryFile = './other/tests.js';
 
-let file;
-// Add new cdns resouces here.
-const cdns = [
-  'https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.10/d3.min.js',
-  'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0-alpha1/jquery.min.js',
-  'https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.10.1/lodash.min.js',
-  'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.3/angular.min.js',
-  'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.3/angular-animate.min.js',
-  'https://cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.15/angular-ui-router.min.js',
-];
+  const webpackConfig = require('../webpack.config');
+  const webpackLoaders = webpackConfig.module.loaders;
 
-const entry = [
-  ...cdns,
-  'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.3/angular-mocks.js',
-];
-const preprocessors = {};
-for (const chunk in webpackConfig.entry) {
-  if ({}.hasOwnProperty.call(webpackConfig.entry, chunk)) {
-    file = path.resolve(webpackConfig.context, webpackConfig.entry[chunk]);
-    entry.push(file);
-    preprocessors[file] = ['webpack'];
-  }
-}
-
-module.exports = (config) => {
   config.set({
-    basePath: './',
     frameworks: ['mocha', 'chai', 'sinon'],
-    files: entry,
-    webpack: webpackConfig,
-
+    files: [
+      ...cdns,
+      testEntryFile
+    ],
+    preprocessors: {
+      [testEntryFile]: ['webpack', 'sourcemap']
+    },
+    webpack: {
+      module: {
+        loaders: webpackLoaders
+      },
+      devtool: 'inline-source-map'
+    },
     webpackMiddleware: {
       noInfo: true
     },
-
-    // list of files to exclude
-    exclude: [
-      'src/switcher.js'
-    ],
-
-    // preprocess matching files before serving them to the browser
-    // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
-    preprocessors: preprocessors,
-
+    // how the test success/failure status is reported:
     reporters: ['dots'],
-    port: 9876,
-    colors: true,
-    autoWatch: true,
+    logLevel: config.LOG_ERROR,
     browsers: ['PhantomJS', 'Chrome', 'Firefox', 'Safari'],
     plugins: [
-      require('karma-webpack'),
-      'karma-coverage',
       'karma-phantomjs-launcher',
+      'karma-sourcemap-loader',
       'karma-chrome-launcher',
       'karma-firefox-launcher',
       'karma-safari-launcher',
       'karma-mocha',
       'karma-chai',
       'karma-sinon',
-    ],
-    logLevel: config.LOG_ERROR
+      'karma-webpack'
+    ]
   });
 };
diff --git a/other/server.es6.js b/other/server.es6.js
@@ -20,6 +20,7 @@ portfinder.basePort = 3000;
 let baseUrl;
 const home = Domo.getHomeDir();
 const mostRecent = getMostRecentLogin();
+const domo = new Domo(mostRecent.instance, mostRecent.sid, mostRecent.devtoken);
 const manifest = fs.readJsonSync(path.resolve(process.cwd() + '/domo/manifest.json'));
 const domainPromise = getDomoappsDomain()
   .then(_baseUrl => baseUrl = _baseUrl)
@@ -46,23 +47,21 @@ server.app.all('/data/v1/:query', proxyRequest);
 function proxyRequest(req, res) {
   domainPromise
     .then(context => {
-      const j = request.jar();
       const url = baseUrl + req.url;
-      const auth = `DA-SID-${getCustomer()}="${mostRecent.sid}"`;
-      const cookie = request.cookie(auth);
-      j.setCookie(cookie, baseUrl);
+      const j = request.jar();
 
       const referer = req.headers.referer.indexOf('?') >= 0 ? `${req.headers.referer}&context=${context.id}` : `${req.headers.referer}?userId=27&customer=dev&locale=en-US&platform=desktop&context=${context.id}`; // jshint ignore:line
+      const headers = Object.assign({
+        referer,
+        accept: req.headers.accept,
+        'content-type': req.headers['content-type'] || req.headers['Content-Type']
+      }, domo.getAuthHeader());
 
       const r = request({
         url,
         method: req.method,
+        headers,
         jar: j,
-        headers: {
-          'content-type': req.headers['content-type'] || req.headers['Content-Type'],
-          referer,
-          accept: req.headers.accept
-        },
         body: JSON.stringify(req.body)
       });
 
@@ -84,8 +83,8 @@ checkSession()
       });
     });
   })
-  .catch(() => {
-    console.warn('Session expired. Please login again using domo login.');
+  .catch(reason => {
+    console.warn(reason);
   });
 
 // helpers
@@ -113,14 +112,10 @@ function getEnv() {
 
 function getDomoappsDomain() {
   const uuid = Domo.createUUID();
-  const j = request.jar();
-  const auth = `SID="${mostRecent.sid}"`;
-  const cookie = request.cookie(auth);
-  j.setCookie(cookie, `https://${mostRecent.instance}`);
   return new Promise((resolve) => {
     request({
       url: `https://${mostRecent.instance}/api/content/v1/mobile/environment`,
-      jar: j
+      headers: domo.getAuthHeader()
     }, (err, res) => {
       if (res.statusCode === 200) {
         resolve(`https://${uuid}.${JSON.parse(res.body).domoappsDomain}`);
@@ -140,9 +135,7 @@ function createContext(designId, mapping) {
         designId,
         mapping
       },
-      headers: {
-        'X-Domo-Authentication': mostRecent.sid
-      }
+      headers: domo.getAuthHeader()
     };
 
     request(options, (err, res) => {
@@ -155,6 +148,11 @@ function createContext(designId, mapping) {
 
 function checkSession() {
   return new Promise((resolve, reject) => {
+    if (typeof mostRecent.devtoken !== 'undefined') {
+      // we don't have any way to check tokens, so we'll default to accent
+      // until this is fixed
+      resolve(true);
+    }
     const options = {
       url: `https://${mostRecent.instance}/auth/validate`,
       method: 'GET',
@@ -170,7 +168,7 @@ function checkSession() {
         if (isValid) {
           resolve(true);
         } else {
-          reject(false);
+          reject('Session expired. Please login again using domo login.');
         }
       } catch (e) {
         // couldn't parse as JSON which means the service doesn't exist yet.

diff --git a/other/tests.js b/other/tests.js
@@ -0,0 +1,4 @@
+require('angular-mocks/ngMock');
+const testFiles = require.context('../src', true, /\.spec\.js$/);
+const ngModule = angular.module('da.test', []);
+testFiles.keys().forEach(key => { testFiles(key)(ngModule); });