Merge pull request openshift#943 from liggitt/encode-state

Merged by openshift-bot

Author: OpenShift Bot

app/index.html

@@ -152,6 +152,7 @@ <h1>JavaScript Required</h1>
     <script src="bower_components/angular-inview/angular-inview.js"></script>
     <script src="bower_components/js-yaml/dist/js-yaml.js"></script>
     <script src="bower_components/angular-moment/angular-moment.js"></script>
+    <script src="bower_components/angular-utf8-base64/angular-utf8-base64.js"></script>
     <!-- endbower -->
     <!-- endbuild -->
 
@@ -163,6 +164,7 @@ <h1>JavaScript Required</h1>
         <script src="scripts/constants.js"></script>
         <script src="scripts/app.js"></script>
         <script src="scripts/services/logger.js"></script>
+        <script src="scripts/services/base64util.js"></script>
         <script src="scripts/services/ws.js"></script>
         <script src="scripts/services/userstore.js"></script>
         <script src="scripts/services/api.js"></script>

app/scripts/app.js

@@ -29,7 +29,8 @@ angular
     'ui.select',
     'key-value-editor',
     'angular-inview',
-    'angularMoment'
+    'angularMoment',
+    'ab-base64'
   ])
   .config(function ($routeProvider) {
     $routeProvider

app/scripts/services/base64util.js

@@ -0,0 +1,16 @@
+'use strict';
+
+angular.module('openshiftConsole')
+  .factory('base64util', function() {
+    return {
+      pad: function(data){
+        if (!data) { return ""; }
+        switch (data.length % 4) {
+          case 1:  return data + "===";
+          case 2:  return data + "==";
+          case 3:  return data + "=";
+          default: return data;
+        }
+      }
+    };
+  });

app/scripts/services/data.js

@@ -2,7 +2,7 @@
 /* jshint eqeqeq: false, unused: false, expr: true */
 
 angular.module('openshiftConsole')
-.factory('DataService', function($cacheFactory, $http, $ws, $rootScope, $q, API_CFG, APIService, Notification, Logger, $timeout) {
+.factory('DataService', function($cacheFactory, $http, $ws, $rootScope, $q, API_CFG, APIService, Notification, Logger, $timeout, base64, base64util) {
 
   function Data(array) {
     this._data = {};
@@ -420,14 +420,6 @@ angular.module('openshiftConsole')
     return deferred.promise;
   };
 
-// https://developer.mozilla.org/en-US/docs/Web/API/WindowBase64/btoa
-function utf8_to_b64( str ) {
-    return window.btoa(window.unescape(encodeURIComponent( str )));
-}
-function b64_to_utf8( str ) {
-    return decodeURIComponent(window.escape(window.atob( str )));
-}
-
 // TODO (bpeterse): Create a new Streamer service & get this out of DataService.
 DataService.prototype.createStream = function(resource, name, context, opts, isRaw) {
   var self = this;
@@ -461,7 +453,7 @@ DataService.prototype.createStream = function(resource, name, context, opts, isR
 
                               var message;
                               if(!isRaw) {
-                                message = b64_to_utf8(evt.data);
+                                message = base64.decode(base64util.pad(evt.data));
                                 // Count bytes for log streams, which will stop when limitBytes is reached.
                                 // There's no other way to detect we've reach the limit currently.
                                 cumulativeBytes += message.length;

app/scripts/services/login.js

@@ -26,7 +26,7 @@ angular.module('openshiftConsole')
     return _oauth_redirect_uri;
   };
 
-  this.$get = function($location, $q, Logger) {
+  this.$get = function($location, $q, Logger, base64) {
     var authLogger = Logger.get("auth");
 
     var getRandomInts = function(length) {
@@ -64,7 +64,7 @@ angular.module('openshiftConsole')
       } catch(e) {
         authLogger.log("RedirectLoginService.makeState, localStorage error: ", e);
       }
-      return JSON.stringify({then: then, nonce:nonce});
+      return base64.urlencode(JSON.stringify({then: then, nonce:nonce}));
     };
     var parseState = function(state) {
       var retval = {
@@ -81,7 +81,7 @@ angular.module('openshiftConsole')
       }
 
       try {
-        var data = state ? JSON.parse(state) : {};
+        var data = state ? JSON.parse(base64.urldecode(state)) : {};
         if (data && data.nonce && nonce && data.nonce === nonce) {
           retval.verified = true;
           retval.then = data.then;

bower.json

@@ -43,7 +43,8 @@
     "angular-key-value-editor": "2.9.2",
     "angular-inview": "1.5.7",
     "js-yaml": "3.6.1",
-    "angular-moment": "1.0.0"
+    "angular-moment": "1.0.0",
+    "angular-utf8-base64": "0.0.5"
   },
   "devDependencies": {
     "angular-mocks": "1.3.20",