From b02c9796e79aa665c09c6502f2c447d8b2b9cd4f Mon Sep 17 00:00:00 2001
From: Sebastian Stehle <sebastian@squidex.io>
Date: Thu, 25 Oct 2018 19:03:39 +0200
Subject: [PATCH] Updated webpack

---
 .../pages/users/user-page.component.html      |  2 ++
 .../pages/users/user-page.component.scss      |  2 ++
 .../framework/angular/http/http-extensions.ts |  4 ++++
 .../app/shared/services/auth.service.ts       |  2 +-
 src/Squidex/package.json                      | 24 +++++++++----------
 5 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/Squidex/app/features/administration/pages/users/user-page.component.html b/src/Squidex/app/features/administration/pages/users/user-page.component.html
index ba9d4acf1..08abdbb61 100644
--- a/src/Squidex/app/features/administration/pages/users/user-page.component.html
+++ b/src/Squidex/app/features/administration/pages/users/user-page.component.html
@@ -70,6 +70,8 @@
                 </div>
             </div>
 
+            <hr />
+
             <div class="form-group">
                 <label for="permissions">Permissions</label>
 
diff --git a/src/Squidex/app/features/administration/pages/users/user-page.component.scss b/src/Squidex/app/features/administration/pages/users/user-page.component.scss
index 8fdc95535..fa9e8fa87 100644
--- a/src/Squidex/app/features/administration/pages/users/user-page.component.scss
+++ b/src/Squidex/app/features/administration/pages/users/user-page.component.scss
@@ -7,4 +7,6 @@
 
 textarea {
     height: 200px;
+    font-size: .9rem;
+    font-weight: normal;
 }
\ No newline at end of file
diff --git a/src/Squidex/app/framework/angular/http/http-extensions.ts b/src/Squidex/app/framework/angular/http/http-extensions.ts
index 9bebcbc3e..543213b9a 100644
--- a/src/Squidex/app/framework/angular/http/http-extensions.ts
+++ b/src/Squidex/app/framework/angular/http/http-extensions.ts
@@ -63,6 +63,10 @@ export module HTTP {
 
 export const pretifyError = (message: string) => <T>(source: Observable<T>) =>
     source.pipe(catchError((response: HttpErrorResponse) => {
+        if (Types.is(response, ErrorDto)) {
+            return throwError(response);
+        }
+
         let result: ErrorDto | null = null;
 
         if (!Types.is(response.error, Error)) {
diff --git a/src/Squidex/app/shared/services/auth.service.ts b/src/Squidex/app/shared/services/auth.service.ts
index 9bc366297..997027056 100644
--- a/src/Squidex/app/shared/services/auth.service.ts
+++ b/src/Squidex/app/shared/services/auth.service.ts
@@ -52,7 +52,7 @@ export class Profile {
     constructor(
         public readonly user: User
     ) {
-        const permissions = this.user.profile['uri:squidex:permissions'];
+        const permissions = this.user.profile['urn:squidex:permissions'];
 
         if (Types.isArrayOfString(permissions)) {
             this.permissions = permissions.map(x => new Permission(x));
diff --git a/src/Squidex/package.json b/src/Squidex/package.json
index 41b7079c1..51343c343 100644
--- a/src/Squidex/package.json
+++ b/src/Squidex/package.json
@@ -9,7 +9,7 @@
     "test:coverage": "karma start karma.coverage.conf.js",
     "test:clean": "rimraf _test-output",
     "dev": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/ && webpack-dev-server --config app-config/webpack.run.dev.js --inline --port 3000",
-    "start": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/ && webpack-dev-server --config app-config/webpack.run.dev.js --inline --port 3000",
+    "start": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/ && webpack-dev-server --config app-config/webpack.run.dev.js --inline --port 3000 --hot",
     "build": "webpack --config app-config/webpack.run.prod.js",
     "build:copy": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/",
     "build:clean": "rimraf wwwroot/build",
@@ -60,7 +60,7 @@
     "angular-router-loader": "0.8.5",
     "angular2-template-loader": "0.6.2",
     "awesome-typescript-loader": "5.2.1",
-    "codelyzer": "4.4.4",
+    "codelyzer": "4.5.0",
     "cpx": "1.5.0",
     "css-loader": "1.0.0",
     "exports-loader": "0.7.0",
@@ -70,18 +70,18 @@
     "ignore-loader": "0.1.2",
     "istanbul-instrumenter-loader": "0.2.0",
     "jasmine-core": "3.2.1",
-    "karma": "3.0.0",
+    "karma": "3.1.1",
     "karma-chrome-launcher": "2.2.0",
     "karma-cli": "1.0.1",
     "karma-coverage": "1.1.2",
-    "karma-htmlfile-reporter": "0.3.6",
+    "karma-htmlfile-reporter": "0.3.7",
     "karma-jasmine": "1.1.2",
     "karma-jasmine-html-reporter": "1.3.1",
     "karma-mocha-reporter": "2.2.5",
     "karma-sourcemap-loader": "0.3.7",
-    "karma-webpack": "3.0.4",
-    "mini-css-extract-plugin": "0.4.2",
-    "node-sass": "4.9.3",
+    "karma-webpack": "3.0.5",
+    "mini-css-extract-plugin": "0.4.4",
+    "node-sass": "4.9.4",
     "noop-loader": "1.0.0",
     "null-loader": "0.1.1",
     "raw-loader": "0.5.1",
@@ -89,17 +89,17 @@
     "rxjs-tslint": "0.1.5",
     "sass-lint": "1.12.1",
     "sass-loader": "7.1.0",
-    "style-loader": "0.23.0",
+    "style-loader": "0.23.1",
     "tsconfig-paths-webpack-plugin": "3.2.0",
     "tslint": "5.11.0",
     "tslint-loader": "3.6.0",
     "typemoq": "2.1.0",
     "typescript": "2.9.1",
-    "uglifyjs-webpack-plugin": "1.3.0",
+    "uglifyjs-webpack-plugin": "2.0.1",
     "underscore": "1.9.1",
-    "webpack": "4.17.2",
-    "webpack-cli": "3.1.0",
-    "webpack-dev-server": "3.1.8",
+    "webpack": "4.23.1",
+    "webpack-cli": "3.1.2",
+    "webpack-dev-server": "3.1.10",
     "webpack-merge": "4.1.4"
   }
 }