diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.html b/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.html index e43657421e..1bb0939f32 100644 --- a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.html +++ b/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.html @@ -17,6 +17,9 @@ +
+
Login Failed
+
diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.ts b/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.ts index 35767099f8..e8941722a2 100644 --- a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.ts +++ b/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.ts @@ -3,6 +3,7 @@ import {NgForm} from "@angular/forms"; import {RequestOptions, Http, Response, Headers} from "@angular/http"; import "rxjs/Rx"; import {Principal} from "./principal"; +import {Observable} from "rxjs"; @Component({ selector: 'app-root', @@ -17,6 +18,8 @@ export class AppComponent implements OnInit{ principal: Principal = new Principal(false, []); + loginFailed: boolean = false; + constructor(private http: Http){} ngOnInit(): void { @@ -24,11 +27,20 @@ export class AppComponent implements OnInit{ } onLogin(form: NgForm) { + this.loginFailed = false; let headers = new Headers({'Content-Type': 'application/json'}); headers.append('Authorization','Basic ' + btoa(form.value.username + ':' + form.value.password)); + headers.append('X-Requested-With','XMLHttpRequest'); let options = new RequestOptions({headers: headers}); this.http.get("/me", options) .map((response: Response) => response.json()) + .catch((error: Response) => { + if (error.status === 401) { + this.loginFailed = true; + } + console.log(error); + return Observable.throw(error); + }) .map((data: any) => new Principal(data.authenticated, data.authorities)) .subscribe((principal: Principal) => { console.log(principal); diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.module.ts b/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.module.ts index 1e702c3505..b09c6b0a7f 100644 --- a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.module.ts +++ b/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.module.ts @@ -1,10 +1,9 @@ import {BrowserModule} from "@angular/platform-browser"; import {NgModule} from "@angular/core"; import {FormsModule} from "@angular/forms"; -import {HttpModule, RequestOptions} from "@angular/http"; +import {HttpModule} from "@angular/http"; import {AppComponent} from "./app.component"; import {NgbModule} from "@ng-bootstrap/ng-bootstrap"; -import {DefaultRequestOptions} from "./default-request-options"; @NgModule({ declarations: [ @@ -16,7 +15,7 @@ import {DefaultRequestOptions} from "./default-request-options"; HttpModule, NgbModule.forRoot() ], - providers: [{provide: RequestOptions, useClass: DefaultRequestOptions}], + providers: [], bootstrap: [AppComponent] }) export class AppModule { } diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/default-request-options.ts b/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/default-request-options.ts deleted file mode 100644 index 49124774ff..0000000000 --- a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/default-request-options.ts +++ /dev/null @@ -1,11 +0,0 @@ -import {Injectable} from "@angular/core"; -import {BaseRequestOptions, Headers} from "@angular/http"; -/** - * Created by tschi on 4/16/2017. - */ -@Injectable() -export class DefaultRequestOptions extends BaseRequestOptions { - headers = new Headers({ - 'X-Requested-With':'XMLHttpRequest', - }); -} diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/public/main.bundle.js b/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/public/main.bundle.js index be9b7f7f10..cc28d6cb1f 100644 --- a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/public/main.bundle.js +++ b/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/public/main.bundle.js @@ -1,6 +1,6 @@ webpackJsonp([1,4],{ -/***/ 196: +/***/ 197: /***/ (function(module, exports) { function webpackEmptyContext(req) { @@ -9,19 +9,19 @@ function webpackEmptyContext(req) { webpackEmptyContext.keys = function() { return []; }; webpackEmptyContext.resolve = webpackEmptyContext; module.exports = webpackEmptyContext; -webpackEmptyContext.id = 196; +webpackEmptyContext.id = 197; /***/ }), -/***/ 197: +/***/ 198: /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_platform_browser_dynamic__ = __webpack_require__(202); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__app_app_module__ = __webpack_require__(208); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_platform_browser_dynamic__ = __webpack_require__(203); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__app_app_module__ = __webpack_require__(209); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__environments_environment__ = __webpack_require__(211); @@ -35,15 +35,17 @@ __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__angular_platform_browser_dyna /***/ }), -/***/ 207: +/***/ 208: /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_http__ = __webpack_require__(63); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_rxjs_Rx__ = __webpack_require__(270); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_http__ = __webpack_require__(102); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_rxjs_Rx__ = __webpack_require__(161); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_rxjs_Rx___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_2_rxjs_Rx__); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__principal__ = __webpack_require__(210); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_rxjs__ = __webpack_require__(161); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_rxjs___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_4_rxjs__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AppComponent; }); var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; @@ -58,6 +60,7 @@ var __metadata = (this && this.__metadata) || function (k, v) { + var AppComponent = (function () { function AppComponent(http) { this.http = http; @@ -66,16 +69,26 @@ var AppComponent = (function () { password: '' }; this.principal = new __WEBPACK_IMPORTED_MODULE_3__principal__["a" /* Principal */](false, []); + this.loginFailed = false; } AppComponent.prototype.ngOnInit = function () { }; AppComponent.prototype.onLogin = function (form) { var _this = this; - var headers = new __WEBPACK_IMPORTED_MODULE_1__angular_http__["c" /* Headers */]({ 'Content-Type': 'application/json' }); + this.loginFailed = false; + var headers = new __WEBPACK_IMPORTED_MODULE_1__angular_http__["b" /* Headers */]({ 'Content-Type': 'application/json' }); headers.append('Authorization', 'Basic ' + btoa(form.value.username + ':' + form.value.password)); - var options = new __WEBPACK_IMPORTED_MODULE_1__angular_http__["b" /* RequestOptions */]({ headers: headers }); + headers.append('X-Requested-With', 'XMLHttpRequest'); + var options = new __WEBPACK_IMPORTED_MODULE_1__angular_http__["c" /* RequestOptions */]({ headers: headers }); this.http.get("/me", options) .map(function (response) { return response.json(); }) + .catch(function (error) { + if (error.status === 401) { + _this.loginFailed = true; + } + console.log(error); + return __WEBPACK_IMPORTED_MODULE_4_rxjs__["Observable"].throw(error); + }) .map(function (data) { return new __WEBPACK_IMPORTED_MODULE_3__principal__["a" /* Principal */](data.authenticated, data.authorities); }) .subscribe(function (principal) { console.log(principal); @@ -85,12 +98,12 @@ var AppComponent = (function () { return AppComponent; }()); AppComponent = __decorate([ - __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__angular_core__["Y" /* Component */])({ + __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__angular_core__["D" /* Component */])({ selector: 'app-root', template: __webpack_require__(268), styles: [__webpack_require__(266)] }), - __metadata("design:paramtypes", [typeof (_a = typeof __WEBPACK_IMPORTED_MODULE_1__angular_http__["e" /* Http */] !== "undefined" && __WEBPACK_IMPORTED_MODULE_1__angular_http__["e" /* Http */]) === "function" && _a || Object]) + __metadata("design:paramtypes", [typeof (_a = typeof __WEBPACK_IMPORTED_MODULE_1__angular_http__["d" /* Http */] !== "undefined" && __WEBPACK_IMPORTED_MODULE_1__angular_http__["d" /* Http */]) === "function" && _a || Object]) ], AppComponent); var _a; @@ -98,17 +111,16 @@ var _a; /***/ }), -/***/ 208: +/***/ 209: /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_platform_browser__ = __webpack_require__(43); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_core__ = __webpack_require__(1); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__angular_forms__ = __webpack_require__(23); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__angular_http__ = __webpack_require__(63); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__app_component__ = __webpack_require__(207); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__ng_bootstrap_ng_bootstrap__ = __webpack_require__(205); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__default_request_options__ = __webpack_require__(209); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__angular_http__ = __webpack_require__(102); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__app_component__ = __webpack_require__(208); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__ng_bootstrap_ng_bootstrap__ = __webpack_require__(206); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AppModule; }); var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; @@ -122,7 +134,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, - var AppModule = (function () { function AppModule() { } @@ -139,7 +150,7 @@ AppModule = __decorate([ __WEBPACK_IMPORTED_MODULE_3__angular_http__["a" /* HttpModule */], __WEBPACK_IMPORTED_MODULE_5__ng_bootstrap_ng_bootstrap__["a" /* NgbModule */].forRoot() ], - providers: [{ provide: __WEBPACK_IMPORTED_MODULE_3__angular_http__["b" /* RequestOptions */], useClass: __WEBPACK_IMPORTED_MODULE_6__default_request_options__["a" /* DefaultRequestOptions */] }], + providers: [], bootstrap: [__WEBPACK_IMPORTED_MODULE_4__app_component__["a" /* AppComponent */]] }) ], AppModule); @@ -148,53 +159,6 @@ AppModule = __decorate([ /***/ }), -/***/ 209: -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_http__ = __webpack_require__(63); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return DefaultRequestOptions; }); -var __extends = (this && this.__extends) || (function () { - var extendStatics = Object.setPrototypeOf || - ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || - function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; - return function (d, b) { - extendStatics(d, b); - function __() { this.constructor = d; } - d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); - }; -})(); -var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { - var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; - if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); - else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; - return c > 3 && r && Object.defineProperty(target, key, r), r; -}; - - -/** - * Created by tschi on 4/16/2017. - */ -var DefaultRequestOptions = (function (_super) { - __extends(DefaultRequestOptions, _super); - function DefaultRequestOptions() { - var _this = _super !== null && _super.apply(this, arguments) || this; - _this.headers = new __WEBPACK_IMPORTED_MODULE_1__angular_http__["c" /* Headers */]({ - 'X-Requested-With': 'XMLHttpRequest', - }); - return _this; - } - return DefaultRequestOptions; -}(__WEBPACK_IMPORTED_MODULE_1__angular_http__["d" /* BaseRequestOptions */])); -DefaultRequestOptions = __decorate([ - __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__angular_core__["c" /* Injectable */])() -], DefaultRequestOptions); - -//# sourceMappingURL=default-request-options.js.map - -/***/ }), - /***/ 210: /***/ (function(module, __webpack_exports__, __webpack_require__) { @@ -266,17 +230,17 @@ module.exports = module.exports.toString(); /***/ 268: /***/ (function(module, exports) { -module.exports = "\n\n
\n
\n

Book Rater App

\n

Keep track of all the latest books and their ratings.

\n
\n\n
\n" +module.exports = "\n\n
\n
\n

Book Rater App

\n

Keep track of all the latest books and their ratings.

\n
\n\n
\n" /***/ }), -/***/ 538: +/***/ 537: /***/ (function(module, exports, __webpack_require__) { -module.exports = __webpack_require__(197); +module.exports = __webpack_require__(198); /***/ }) -},[538]); +},[537]); //# sourceMappingURL=main.bundle.js.map \ No newline at end of file diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/public/polyfills.bundle.js b/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/public/polyfills.bundle.js index 9dccda35d1..e84b2e9993 100644 --- a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/public/polyfills.bundle.js +++ b/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/public/polyfills.bundle.js @@ -20,9 +20,9 @@ module.exports = function(it){ // 5 -> Array#find // 6 -> Array#findIndex var ctx = __webpack_require__(36) - , IObject = __webpack_require__(85) - , toObject = __webpack_require__(94) - , toLength = __webpack_require__(93) + , IObject = __webpack_require__(84) + , toObject = __webpack_require__(93) + , toLength = __webpack_require__(92) , asc = __webpack_require__(217); module.exports = function(TYPE, $create){ var IS_MAP = TYPE == 1 @@ -65,11 +65,11 @@ module.exports = function(TYPE, $create){ "use strict"; var dP = __webpack_require__(26).f - , create = __webpack_require__(87) - , redefineAll = __webpack_require__(88) + , create = __webpack_require__(86) + , redefineAll = __webpack_require__(87) , ctx = __webpack_require__(36) - , anInstance = __webpack_require__(80) - , defined = __webpack_require__(83) + , anInstance = __webpack_require__(79) + , defined = __webpack_require__(82) , forOf = __webpack_require__(45) , $iterDefine = __webpack_require__(227) , step = __webpack_require__(229) @@ -235,9 +235,9 @@ module.exports = !__webpack_require__(29) && !__webpack_require__(25)(function() "use strict"; -var create = __webpack_require__(87) +var create = __webpack_require__(86) , descriptor = __webpack_require__(48) - , setToStringTag = __webpack_require__(89) + , setToStringTag = __webpack_require__(88) , IteratorPrototype = {}; // 25.1.2.1.1 %IteratorPrototype%[@@iterator]() @@ -261,9 +261,9 @@ exports.f = Object.getOwnPropertySymbols; /***/ (function(module, exports, __webpack_require__) { var has = __webpack_require__(17) - , toIObject = __webpack_require__(92) + , toIObject = __webpack_require__(91) , arrayIndexOf = __webpack_require__(215)(false) - , IE_PROTO = __webpack_require__(90)('IE_PROTO'); + , IE_PROTO = __webpack_require__(89)('IE_PROTO'); module.exports = function(object, names){ var O = toIObject(object) @@ -285,7 +285,7 @@ module.exports = function(object, names){ // 19.1.2.14 / 15.2.3.14 Object.keys(O) var $keys = __webpack_require__(154) - , enumBugKeys = __webpack_require__(84); + , enumBugKeys = __webpack_require__(83); module.exports = Object.keys || function keys(O){ return $keys(O, enumBugKeys); @@ -368,7 +368,7 @@ module.exports = function(it, key){ var Map = __webpack_require__(238) , $export = __webpack_require__(8) - , shared = __webpack_require__(91)('metadata') + , shared = __webpack_require__(90)('metadata') , store = shared.store || (shared.store = new (__webpack_require__(254))); var getOrCreateMetadataMap = function(target, targetKey, create){ @@ -423,7 +423,7 @@ module.exports = { /***/ 19: /***/ (function(module, exports, __webpack_require__) { -var store = __webpack_require__(91)('wks') +var store = __webpack_require__(90)('wks') , uid = __webpack_require__(49) , Symbol = __webpack_require__(16).Symbol , USE_SYMBOL = typeof Symbol == 'function'; @@ -437,7 +437,7 @@ $exports.store = store; /***/ }), -/***/ 198: +/***/ 199: /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -446,7 +446,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_core_js_es6_reflect___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_core_js_es6_reflect__); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_core_js_es7_reflect__ = __webpack_require__(213); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_core_js_es7_reflect___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1_core_js_es7_reflect__); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_zone_js_dist_zone__ = __webpack_require__(537); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_zone_js_dist_zone__ = __webpack_require__(536); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_zone_js_dist_zone___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_2_zone_js_dist_zone__); @@ -520,8 +520,8 @@ module.exports = function(iter, ITERATOR){ // false -> Array#indexOf // true -> Array#includes -var toIObject = __webpack_require__(92) - , toLength = __webpack_require__(93) +var toIObject = __webpack_require__(91) + , toLength = __webpack_require__(92) , toIndex = __webpack_require__(236); module.exports = function(IS_INCLUDES){ return function($this, el, fromIndex){ @@ -611,7 +611,7 @@ module.exports = Function.bind || function bind(that /*, args... */){ /***/ (function(module, exports, __webpack_require__) { // getting tag from 19.1.3.6 Object.prototype.toString() -var cof = __webpack_require__(81) +var cof = __webpack_require__(80) , TAG = __webpack_require__(19)('toStringTag') // ES3 wrong here , ARG = cof(function(){ return arguments; }()) == 'Arguments'; @@ -641,11 +641,11 @@ module.exports = function(it){ "use strict"; -var redefineAll = __webpack_require__(88) +var redefineAll = __webpack_require__(87) , getWeak = __webpack_require__(47).getWeak , anObject = __webpack_require__(5) , isObject = __webpack_require__(13) - , anInstance = __webpack_require__(80) + , anInstance = __webpack_require__(79) , forOf = __webpack_require__(45) , createArrayMethod = __webpack_require__(148) , $has = __webpack_require__(17) @@ -773,7 +773,7 @@ module.exports = function(fn, args, that){ /***/ (function(module, exports, __webpack_require__) { // check on default Array iterator -var Iterators = __webpack_require__(86) +var Iterators = __webpack_require__(85) , ITERATOR = __webpack_require__(19)('iterator') , ArrayProto = Array.prototype; @@ -787,7 +787,7 @@ module.exports = function(it){ /***/ (function(module, exports, __webpack_require__) { // 7.2.2 IsArray(argument) -var cof = __webpack_require__(81); +var cof = __webpack_require__(80); module.exports = Array.isArray || function isArray(arg){ return cof(arg) == 'Array'; }; @@ -822,9 +822,9 @@ var LIBRARY = __webpack_require__(230) , redefine = __webpack_require__(38) , hide = __webpack_require__(46) , has = __webpack_require__(17) - , Iterators = __webpack_require__(86) + , Iterators = __webpack_require__(85) , $iterCreate = __webpack_require__(152) - , setToStringTag = __webpack_require__(89) + , setToStringTag = __webpack_require__(88) , getPrototypeOf = __webpack_require__(30) , ITERATOR = __webpack_require__(19)('iterator') , BUGGY = !([].keys && 'next' in [].keys()) // Safari has buggy iterators w/o `next` @@ -941,8 +941,8 @@ module.exports = false; var getKeys = __webpack_require__(155) , gOPS = __webpack_require__(153) , pIE = __webpack_require__(156) - , toObject = __webpack_require__(94) - , IObject = __webpack_require__(85) + , toObject = __webpack_require__(93) + , IObject = __webpack_require__(84) , $assign = Object.assign; // should work with symbols and should have deterministic property order (V8 bug) @@ -996,7 +996,7 @@ module.exports = __webpack_require__(29) ? Object.defineProperties : function de // 19.1.2.7 / 15.2.3.4 Object.getOwnPropertyNames(O) var $keys = __webpack_require__(154) - , hiddenKeys = __webpack_require__(84).concat('length', 'prototype'); + , hiddenKeys = __webpack_require__(83).concat('length', 'prototype'); exports.f = Object.getOwnPropertyNames || function getOwnPropertyNames(O){ return $keys(O, hiddenKeys); @@ -1058,7 +1058,7 @@ module.exports = function(index, length){ var classof = __webpack_require__(219) , ITERATOR = __webpack_require__(19)('iterator') - , Iterators = __webpack_require__(86); + , Iterators = __webpack_require__(85); module.exports = __webpack_require__(35).getIteratorMethod = function(it){ if(it != undefined)return it[ITERATOR] || it['@@iterator'] @@ -1075,7 +1075,7 @@ module.exports = __webpack_require__(35).getIteratorMethod = function(it){ var strong = __webpack_require__(149); // 23.1 Map Objects -module.exports = __webpack_require__(82)('Map', function(get){ +module.exports = __webpack_require__(81)('Map', function(get){ return function Map(){ return get(this, arguments.length > 0 ? arguments[0] : undefined); }; }, { // 23.1.3.6 Map.prototype.get(key) @@ -1118,7 +1118,7 @@ $export($export.S + $export.F * !__webpack_require__(25)(function(){ // 26.1.2 Reflect.construct(target, argumentsList [, newTarget]) var $export = __webpack_require__(8) - , create = __webpack_require__(87) + , create = __webpack_require__(86) , aFunction = __webpack_require__(34) , anObject = __webpack_require__(5) , isObject = __webpack_require__(13) @@ -1173,7 +1173,7 @@ $export($export.S + $export.F * (NEW_TARGET_BUG || ARGS_BUG), 'Reflect', { var dP = __webpack_require__(26) , $export = __webpack_require__(8) , anObject = __webpack_require__(5) - , toPrimitive = __webpack_require__(95); + , toPrimitive = __webpack_require__(94); // MS Edge has broken Reflect.defineProperty - throwing instead of returning false $export($export.S + $export.F * __webpack_require__(25)(function(){ @@ -1445,7 +1445,7 @@ $export($export.S, 'Reflect', {set: set}); var strong = __webpack_require__(149); // 23.2 Set Objects -module.exports = __webpack_require__(82)('Set', function(get){ +module.exports = __webpack_require__(81)('Set', function(get){ return function Set(){ return get(this, arguments.length > 0 ? arguments[0] : undefined); }; }, { // 23.2.3.1 Set.prototype.add(value) @@ -1495,7 +1495,7 @@ var methods = { }; // 23.3 WeakMap Objects -var $WeakMap = module.exports = __webpack_require__(82)('WeakMap', wrapper, methods, weak, true, true); +var $WeakMap = module.exports = __webpack_require__(81)('WeakMap', wrapper, methods, weak, true, true); // IE11 WeakMap frozen keys fix if(new $WeakMap().set((Object.freeze || Object)(tmp), 7).get(tmp) != 7){ @@ -1621,7 +1621,7 @@ metadata.exp({getOwnMetadataKeys: function getOwnMetadataKeys(target /*, targetK var anObject = __webpack_require__(5) , IE8_DOM_DEFINE = __webpack_require__(151) - , toPrimitive = __webpack_require__(95) + , toPrimitive = __webpack_require__(94) , dP = Object.defineProperty; exports.f = __webpack_require__(29) ? Object.defineProperty : function defineProperty(O, P, Attributes){ @@ -1913,8 +1913,8 @@ module.exports = !__webpack_require__(25)(function(){ // 19.1.2.9 / 15.2.3.2 Object.getPrototypeOf(O) var has = __webpack_require__(17) - , toObject = __webpack_require__(94) - , IE_PROTO = __webpack_require__(90)('IE_PROTO') + , toObject = __webpack_require__(93) + , IE_PROTO = __webpack_require__(89)('IE_PROTO') , ObjectProto = Object.prototype; module.exports = Object.getPrototypeOf || function(O){ @@ -1976,8 +1976,8 @@ module.exports = function(fn, that, length){ var pIE = __webpack_require__(156) , createDesc = __webpack_require__(48) - , toIObject = __webpack_require__(92) - , toPrimitive = __webpack_require__(95) + , toIObject = __webpack_require__(91) + , toPrimitive = __webpack_require__(94) , has = __webpack_require__(17) , IE8_DOM_DEFINE = __webpack_require__(151) , gOPD = Object.getOwnPropertyDescriptor; @@ -2038,7 +2038,7 @@ var ctx = __webpack_require__(36) , call = __webpack_require__(226) , isArrayIter = __webpack_require__(224) , anObject = __webpack_require__(5) - , toLength = __webpack_require__(93) + , toLength = __webpack_require__(92) , getIterFn = __webpack_require__(237) , BREAK = {} , RETURN = {}; @@ -2171,7 +2171,7 @@ module.exports = function(it){ /***/ }), -/***/ 537: +/***/ 536: /***/ (function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function(global, process) {/** @@ -4246,10 +4246,10 @@ if (_global['PromiseRejectionEvent']) { /***/ }), -/***/ 539: +/***/ 538: /***/ (function(module, exports, __webpack_require__) { -module.exports = __webpack_require__(198); +module.exports = __webpack_require__(199); /***/ }), @@ -4280,6 +4280,17 @@ try { module.exports = g; +/***/ }), + +/***/ 79: +/***/ (function(module, exports) { + +module.exports = function(it, Constructor, name, forbiddenField){ + if(!(it instanceof Constructor) || (forbiddenField !== undefined && forbiddenField in it)){ + throw TypeError(name + ': incorrect invocation!'); + } return it; +}; + /***/ }), /***/ 8: @@ -4334,17 +4345,6 @@ module.exports = $export; /***/ 80: /***/ (function(module, exports) { -module.exports = function(it, Constructor, name, forbiddenField){ - if(!(it instanceof Constructor) || (forbiddenField !== undefined && forbiddenField in it)){ - throw TypeError(name + ': incorrect invocation!'); - } return it; -}; - -/***/ }), - -/***/ 81: -/***/ (function(module, exports) { - var toString = {}.toString; module.exports = function(it){ @@ -4353,7 +4353,7 @@ module.exports = function(it){ /***/ }), -/***/ 82: +/***/ 81: /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -4361,14 +4361,14 @@ module.exports = function(it){ var global = __webpack_require__(16) , $export = __webpack_require__(8) , redefine = __webpack_require__(38) - , redefineAll = __webpack_require__(88) + , redefineAll = __webpack_require__(87) , meta = __webpack_require__(47) , forOf = __webpack_require__(45) - , anInstance = __webpack_require__(80) + , anInstance = __webpack_require__(79) , isObject = __webpack_require__(13) , fails = __webpack_require__(25) , $iterDetect = __webpack_require__(228) - , setToStringTag = __webpack_require__(89) + , setToStringTag = __webpack_require__(88) , inheritIfRequired = __webpack_require__(222); module.exports = function(NAME, wrapper, methods, common, IS_MAP, IS_WEAK){ @@ -4445,7 +4445,7 @@ module.exports = function(NAME, wrapper, methods, common, IS_MAP, IS_WEAK){ /***/ }), -/***/ 83: +/***/ 82: /***/ (function(module, exports) { // 7.2.1 RequireObjectCoercible(argument) @@ -4456,7 +4456,7 @@ module.exports = function(it){ /***/ }), -/***/ 84: +/***/ 83: /***/ (function(module, exports) { // IE 8- don't enum bug keys @@ -4466,32 +4466,32 @@ module.exports = ( /***/ }), -/***/ 85: +/***/ 84: /***/ (function(module, exports, __webpack_require__) { // fallback for non-array-like ES3 and non-enumerable old V8 strings -var cof = __webpack_require__(81); +var cof = __webpack_require__(80); module.exports = Object('z').propertyIsEnumerable(0) ? Object : function(it){ return cof(it) == 'String' ? it.split('') : Object(it); }; /***/ }), -/***/ 86: +/***/ 85: /***/ (function(module, exports) { module.exports = {}; /***/ }), -/***/ 87: +/***/ 86: /***/ (function(module, exports, __webpack_require__) { // 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties]) var anObject = __webpack_require__(5) , dPs = __webpack_require__(232) - , enumBugKeys = __webpack_require__(84) - , IE_PROTO = __webpack_require__(90)('IE_PROTO') + , enumBugKeys = __webpack_require__(83) + , IE_PROTO = __webpack_require__(89)('IE_PROTO') , Empty = function(){ /* empty */ } , PROTOTYPE = 'prototype'; @@ -4532,7 +4532,7 @@ module.exports = Object.create || function create(O, Properties){ /***/ }), -/***/ 88: +/***/ 87: /***/ (function(module, exports, __webpack_require__) { var redefine = __webpack_require__(38); @@ -4543,7 +4543,7 @@ module.exports = function(target, src, safe){ /***/ }), -/***/ 89: +/***/ 88: /***/ (function(module, exports, __webpack_require__) { var def = __webpack_require__(26).f @@ -4556,10 +4556,10 @@ module.exports = function(it, tag, stat){ /***/ }), -/***/ 90: +/***/ 89: /***/ (function(module, exports, __webpack_require__) { -var shared = __webpack_require__(91)('keys') +var shared = __webpack_require__(90)('keys') , uid = __webpack_require__(49); module.exports = function(key){ return shared[key] || (shared[key] = uid(key)); @@ -4567,7 +4567,7 @@ module.exports = function(key){ /***/ }), -/***/ 91: +/***/ 90: /***/ (function(module, exports, __webpack_require__) { var global = __webpack_require__(16) @@ -4579,19 +4579,19 @@ module.exports = function(key){ /***/ }), -/***/ 92: +/***/ 91: /***/ (function(module, exports, __webpack_require__) { // to indexed object, toObject with fallback for non-array-like ES3 strings -var IObject = __webpack_require__(85) - , defined = __webpack_require__(83); +var IObject = __webpack_require__(84) + , defined = __webpack_require__(82); module.exports = function(it){ return IObject(defined(it)); }; /***/ }), -/***/ 93: +/***/ 92: /***/ (function(module, exports, __webpack_require__) { // 7.1.15 ToLength @@ -4603,18 +4603,18 @@ module.exports = function(it){ /***/ }), -/***/ 94: +/***/ 93: /***/ (function(module, exports, __webpack_require__) { // 7.1.13 ToObject(argument) -var defined = __webpack_require__(83); +var defined = __webpack_require__(82); module.exports = function(it){ return Object(defined(it)); }; /***/ }), -/***/ 95: +/***/ 94: /***/ (function(module, exports, __webpack_require__) { // 7.1.1 ToPrimitive(input [, PreferredType]) @@ -4632,5 +4632,5 @@ module.exports = function(it, S){ /***/ }) -},[539]); +},[538]); //# sourceMappingURL=polyfills.bundle.js.map \ No newline at end of file diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/public/styles.bundle.js b/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/public/styles.bundle.js index 71a598576d..a485e63b9e 100644 --- a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/public/styles.bundle.js +++ b/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/public/styles.bundle.js @@ -1,6 +1,6 @@ webpackJsonp([2,4],{ -/***/ 195: +/***/ 196: /***/ (function(module, exports) { /* @@ -253,7 +253,7 @@ function updateLink(linkElement, obj) { /***/ }), -/***/ 199: +/***/ 200: /***/ (function(module, exports, __webpack_require__) { // style-loader: Adds some css to the DOM by adding a