[bugfix] IE improvements

Author: lynndylanhurley

Gruntfile.js

@@ -83,9 +83,16 @@ module.exports = function (grunt) {
     browserify: {
       options: {
         debug: true,
-        transform: ['reactify'],
+        transform: ['reactify', 'uglifyify'],
         extensions: ['.jsx']
       },
+      polyfills: {
+        src: [
+          'node_modules/es5-shim/es5-shim.js',
+          'node_modules/es5-shim/es5-sham.js'
+        ],
+        dest: 'demo/dist/scripts/polyfills.js'
+      },
       app: {
         src: [
           'src/j-toker.js',
@@ -215,6 +222,7 @@ module.exports = function (grunt) {
     'clean',
     'sass:dist',
     'copy',
+    'browserify:polyfills',
     'browserify:app',
     'concat',
     'uglify'

demo/app.js

@@ -2,7 +2,8 @@ var express    = require('express'),
     request    = require('request'),
     httpProxy  = require('http-proxy'),
     CONFIG     = require('config'),
-    handlebars = require('express-handlebars');
+    handlebars = require('express-handlebars'),
+    compress   = require('compression');
 
 var port = process.env.PORT || 7777;
 var app  = express();
@@ -15,7 +16,7 @@ var app  = express();
 // proxy api requests (for older IE browsers)
 app.all('/proxy/*', function(req, res, next) {
   // transform request URL into remote URL
-  var apiUrl = 'http:'+CONFIG.get('apiUrl')+req.params[0];
+  var apiUrl = 'http:'+CONFIG.get('apiUrl')+'/'+req.params[0];
   var r = null;
 
   // preserve GET params
@@ -38,6 +39,12 @@ app.all('/proxy/*', function(req, res, next) {
 // redirect to push state url (i.e. /blog -> /#/blog)
 app.get(/^(\/[^#\.]+)$/, function(req, res) {
   var path = req.url
+
+  // preserve GET params
+  if (req._parsedUrl.search) {
+    path += req._parsedUrl.search;
+  }
+
   res.redirect('/#'+path);
 });
 
@@ -57,5 +64,6 @@ app.engine('.html', handlebars({extname: '.html'}));
 app.set('views', __dirname + '/' + CONFIG.get('distDir'));
 app.set('view engine', '.html');
 
+app.use(compress());
 app.use(express.static(__dirname + '/' + CONFIG.get('distDir')));
 app.listen(port);

demo/src/index.html

@@ -8,6 +8,7 @@
     <div id='content'>loading...</div>
 
     <script>window.config = {{{config}}};</script>
+    <script type='text/javascript' src='scripts/polyfills.js'></script>
     <script type='text/javascript' src='scripts/main.js'></script>
   </body>
 </html>

demo/src/scripts/components/access-control.jsx

@@ -33,8 +33,7 @@ module.exports = React.createClass({
   },
 
   handleSingleRequestClick: function(ev) {
-    //var url = Auth.getConfig().apiUrl + '/demo/members_only';
-    var url = Auth.getConfig().apiUrl + $(ev.target).data('url');
+    var url = Auth.getApiUrl() + $(ev.target).data('url');
 
     $.getJSON(url)
       .then(function(resp) {
@@ -52,7 +51,7 @@ module.exports = React.createClass({
   },
 
   handleMultiRequestClick: function(ev) {
-    var url = Auth.getConfig().apiUrl + $(ev.target).data('url');
+    var url = Auth.getApiUrl() + $(ev.target).data('url');
 
     $.when(
       $.getJSON(url),

demo/src/scripts/components/login-form.jsx

@@ -42,7 +42,6 @@ module.exports = React.createClass({
   },
 
   handleSignInClick: function(ev) {
-    console.log('submitting email login', this.state);
     Auth.emailSignIn({
       email:    this.state.email,
       password: this.state.password,

demo/src/scripts/main.jsx

@@ -20,7 +20,7 @@ Auth.configure([
   {
     default: {
       apiUrl:  window.config.apiUrl,
-      proxyIf: function() { return window.oldIE();}
+      proxyIf: function() { return window.isOldIE(); }
     }
   }, {
     evilUser: {

dist/jquery.j-toker.js

@@ -327,6 +327,12 @@
   };
 
 
+  Auth.prototype.getApiUrl = function() {
+    var config = this.getConfig();
+    return (config.proxyIf()) ? config.proxyUrl : config.apiUrl;
+  };
+
+
   // interpolate values of tokenFormat hash with ctx, return new hash
   Auth.prototype.buildAuthHeaders = function(ctx) {
     var headers = {},
@@ -577,7 +583,7 @@
       );
     } else {
       var config = this.getConfig(opts.config),
-          url    = config.apiUrl + config.tokenValidationPath;
+          url    = this.getApiUrl() + config.tokenValidationPath;
 
       // found saved creds, verify with API
       $.ajax({
@@ -634,7 +640,7 @@
     }
 
     var config = this.getConfig(opts.config),
-        url    = config.apiUrl + config.emailRegistrationPath,
+        url    = this.getApiUrl() + config.emailRegistrationPath,
         dfd    = $.Deferred();
 
     opts.config_name = opts.config;
@@ -673,7 +679,7 @@
     }
 
     var config = this.getConfig(opts.config),
-        url    = config.apiUrl + config.emailSignInPath,
+        url    = this.getApiUrl() + config.emailSignInPath,
         dfd    = $.Deferred();
 
     // don't send config name to API
@@ -753,7 +759,7 @@
 
   Auth.prototype.buildOAuthUrl = function(configName, params) {
     var config = this.getConfig(configName),
-        oAuthUrl = config.apiUrl + config.authProviderPaths['github'] +
+        oAuthUrl = this.getApiUrl() + config.authProviderPaths['github'] +
           '?auth_origin_url='+encodeURIComponent(window.location.href) +
           '&config_name='+encodeURIComponent(configName || this.getCurrentConfigName());
 
@@ -804,7 +810,7 @@
     }
 
     var config     = this.getConfig(opts.config),
-        signOutUrl = config.apiUrl + config.signOutPath,
+        signOutUrl = this.getApiUrl() + config.signOutPath,
         dfd        = $.Deferred();
 
     $.ajax({
@@ -840,7 +846,7 @@
     }
 
     var config = this.getConfig(opts.config),
-        url    = config.apiUrl + config.accountUpdatePath,
+        url    = this.getApiUrl() + config.accountUpdatePath,
         dfd    = $.Deferred();
 
     delete opts.config;
@@ -877,7 +883,7 @@
     }
 
     var config = this.getConfig(opts.config),
-        url    = config.apiUrl + config.accountDeletePath,
+        url    = this.getApiUrl() + config.accountDeletePath,
         dfd    = $.Deferred();
 
     $.ajax({
@@ -918,7 +924,7 @@
     }
 
     var config = this.getConfig(opts.config),
-        url    = config.apiUrl + config.passwordResetPath,
+        url    = this.getApiUrl() + config.passwordResetPath,
         dfd    = $.Deferred();
 
     opts.config_name = opts.config;
@@ -956,7 +962,7 @@
     }
 
     var config = this.getConfig(opts.config),
-        url    = config.apiUrl + config.passwordUpdatePath,
+        url    = this.getApiUrl() + config.passwordUpdatePath,
         dfd    = $.Deferred();
 
     delete opts.config;
@@ -1093,9 +1099,17 @@
     // fetch current auth headers from storage
     var currentHeaders = $.auth.retrieveData(SAVED_CREDS_KEY);
 
+    console.log('appending request headers');
+
     // check config apiUrl matches the current request url
     if (isApiRequest(settings.url) && currentHeaders) {
 
+      // bust IE cache
+      xhr.setRequestHeader(
+        'If-Modified-Since',
+        'Mon, 26 Jul 1997 05:00:00 GMT'
+      );
+
       // set header for each key in `tokenFormat` config
       for (var key in $.auth.getConfig().tokenFormat) {
         xhr.setRequestHeader(key, currentHeaders[key]);
@@ -1106,6 +1120,8 @@
 
   // update auth credentials after request is made to the API
   Auth.prototype.updateAuthCredentials = function(ev, xhr, settings) {
+    console.log('ajax complete', settings);
+
     // check config apiUrl matches the current response url
     if (isApiRequest(settings.url)) {
       // set header for each key in `tokenFormat` config
@@ -1222,7 +1238,7 @@
 
 
   var isApiRequest = function(url) {
-    return (url.match($.auth.getConfig().apiUrl));
+    return (url.match($.auth.getApiUrl()));
   };