Merge pull request #320 from nzzdev/release-6.6.0-rc2

Release 6.6.0 rc2

Author: migingreen

client/build/bundles.js

@@ -27,6 +27,7 @@ const aureliaBundle = [
   "aurelia-binding",
   "aurelia-binding",
   "aurelia-bootstrapper",
+  "aurelia-cookie",
   "aurelia-dependency-injection",
   "aurelia-dialog",
   "aurelia-event-aggregator",

client/build/export.js

@@ -2,20 +2,18 @@
 // need to be included when exporting the application
 // for production.
 module.exports = {
-  'list': [
-    'index.html',
-    'livingdocs-component.html',
-    'config.js',
-    '../LICENSE',
-    'jspm_packages/system.js',
-    'jspm_packages/system-polyfills.js',
-    'jspm_packages/system-csp-production.js',
+  list: [
+    "index.html",
+    "config.js",
+    "../LICENSE",
+    "jspm_packages/system.js",
+    "jspm_packages/system-polyfills.js",
+    "jspm_packages/system-csp-production.js",
   ],
   // this section lists any jspm packages that have
   // unbundled resources that need to be exported.
   // these files are in versioned folders and thus
   // must be 'normalized' by jspm to get the proper
   // path.
-  'normalize': [
-  ]
+  normalize: [],
 };

client/config.js

@@ -24,11 +24,16 @@
     "changesSaved": "Die Änderungen wurden gespeichert.",
     "failedToSaveChanges": "Die Änderung konnten nicht gespeichert werden.",
     "loginFailed": "Ihr Benutzername oder Passwort ist unbekannt.",
+    "loginFailedGeneric": "Anmeldung fehlgeschlagen.",
+    "loginTechnicalIssues": "Gibt es technische Probleme?",
+    "loginContactUsOnSlack": "Kontaktiert uns auf Slack.",
     "loginTimeout": "Server braucht zu lange um zu antworten. Wir arbeiten daran. Bitte versuch es später nochmals.",
     "genericServerError": "Es ist ein Problem auf dem Server aufgetreten. Wir arbeiten daran. Bitte versuch es später nochmals.",
     "serverConnectionFailed": "Die Verbindung zum Server ist fehlgeschlagen.",
     "articlesWithThisGraphic": "Artikel mit dieser Grafik",
-    "loadMore": "Mehr laden"
+    "loadMore": "Mehr laden",
+    "mslogin": "Microsoft Login",
+    "orContinueWith": "oder weiter mit"
   },
   "userConfig": {
     "initials": "Initialen",

client/livingdocs-component.html

@@ -24,11 +24,17 @@
     "changesSaved": "Changes saved.",
     "failedToSaveChanges": "Failed to save changes.",
     "loginFailed": "Your username or password is not correct.",
+    "loginFailedGeneric": "Failed to login.",
+    "loginTechnicalIssues": "Are there technical issues?",
+    "loginContactUsOnSlack": "Contact us on slack.",
+    "loginFailedServer": "Failed to login.",
     "loginTimeout": "Server takes too long to reply. We're working on it. Please try again later.",
     "genericServerError": "A problem occured on the server. We're working on it. Please try again later",
     "serverConnectionFailed": "Failed to connect to server.",
     "articlesWithThisGraphic": "Articles with this graphic",
-    "loadMore": "Load more"
+    "loadMore": "Load more",
+    "mslogin": "Microsoft Login",
+    "orContinueWith": "or continue with"
   },
   "userConfig": {
     "initials": "initials",

client/locales/de/translation.json

@@ -24,11 +24,17 @@
     "changesSaved": "Changements sauvegardés.",
     "failedToSaveChanges": "Impossible de sauvegarder les changements.",
     "loginFailed": "Votre identifiant ou mot de passe est incorrect.",
+    "loginFailedGeneric": "Échec de l'inscription.",
+    "loginTechnicalIssues": "Des problèmes techniques?",
+    "loginContactUsOnSlack": "Contacte-nous sur Slack.",
+    "loginFailedServer": "Votre identifiant ou mot de passe est incorrect.",
     "loginTimeout": "Le serveur met trop de temps à répondre. Nous y travaillons. Veuillez réessayer plus tard.",
     "genericServerError": " Il y a un problème sur le serveur. Nous y travaillons. Veuillez réessayer plus tard.",
     "serverConnectionFailed": "Impossible de se connecter au serveur.",
     "articlesWithThisGraphic": "Articles avec ce graphique",
-    "loadMore": "Charger plus"
+    "loadMore": "Charger plus",
+    "mslogin": "Microsoft Login",
+    "orContinueWith": "ou continuer avec"
   },
   "userConfig": {
     "initials": "initiales",

client/locales/en/translation.json

@@ -51,6 +51,7 @@
       "aurelia-authentication": "npm:aurelia-authentication@^3.8.3",
       "aurelia-binding": "npm:aurelia-binding@^2.3.1",
       "aurelia-bootstrapper": "npm:aurelia-bootstrapper@^2.3.3",
+      "aurelia-cookie": "npm:aurelia-cookie@^1.0.10",
       "aurelia-dependency-injection": "npm:aurelia-dependency-injection@^1.4.2",
       "aurelia-dialog": "npm:aurelia-dialog@1",
       "aurelia-event-aggregator": "npm:aurelia-event-aggregator@^1.0.3",

client/locales/fr/translation.json

@@ -1,8 +1,10 @@
 import { inject } from "aurelia-framework";
 import { Redirect, Router } from "aurelia-router";
+import { AureliaCookie } from "aurelia-cookie";
 import User from "resources/User.js";
 import QConfig from "resources/QConfig.js";
 import qEnv from "resources/qEnv.js";
+import { SessionStorage } from "./session-storage";
 
 @inject(QConfig, User, Router)
 export class App {
@@ -34,7 +36,7 @@ export class App {
         route: ["login"],
         name: "login",
         moduleId: "pages/login",
-        title: "Login"
+        title: "Login",
       },
       {
         route: ["", "index"],
@@ -43,45 +45,51 @@ export class App {
         title: "Q",
         auth: true,
         desc: "Übersicht",
-        iconName: "icon-logo"
+        iconName: "icon-logo",
       },
       {
         route: ["item/:id"],
         name: "item",
         moduleId: "pages/item-overview",
-        auth: true
+        auth: true,
       },
       {
         route: ["editor/:tool/:id?"],
         name: "editor",
         moduleId: "pages/editor",
-        auth: true
+        auth: true,
       },
       {
         route: ["feed"],
         name: "feed",
         moduleId: "pages/feed",
-        auth: true
+        auth: true,
       },
       {
         route: ["tasks/:id?"],
         name: "tasks",
         moduleId: "pages/tasks",
-        auth: true
+        auth: true,
+      },
+      {
+        route: ["q-item-picker"],
+        name: "q-item-picker",
+        moduleId: "pages/q-item-picker",
+        auth: true,
       },
       {
         route: ["server-unavailable"],
         name: "server-unavailable",
         moduleId: "pages/server-unavailable",
-        title: "Error"
-      }
+        title: "Error",
+      },
     ];
 
     config.map(routerMap);
 
     config.fallbackRoute("index");
 
-    return qEnv.pushState.then(pushState => {
+    return qEnv.pushState.then((pushState) => {
       if (!pushState) {
         return;
       }
@@ -96,13 +104,13 @@ export class App {
       const stylesheets = await this.qConfig.get("stylesheets");
       if (stylesheets && stylesheets.length) {
         stylesheets
-          .map(stylesheet => {
+          .map((stylesheet) => {
             if (!stylesheet.url && stylesheet.path) {
               stylesheet.url = `${QServerBaseUrl}${stylesheet.path}`;
             }
             return stylesheet;
           })
-          .map(stylesheet => {
+          .map((stylesheet) => {
             if (stylesheet.url) {
               let link = document.createElement("link");
               link.type = "text/css";
@@ -123,19 +131,34 @@ export class App {
   }
 }
 
-@inject(User, QConfig)
+@inject(User, QConfig, SessionStorage)
 class AuthorizeStep {
-  constructor(user, qConfig) {
+  constructor(user, qConfig, sessionStorage) {
     this.user = user;
     this.qConfig = qConfig;
+    this.sessionStorage = sessionStorage;
   }
 
   run(navigationInstruction, next) {
     // Check if the route has an "auth" key
-    if (navigationInstruction.getAllInstructions().some(i => i.config.auth)) {
-      return this.user.loaded
-        .then(() => {
+    if (navigationInstruction.getAllInstructions().some((i) => i.config.auth)) {
+      const azureSession = AureliaCookie.get("azureSession");
+      const headers = {
+        Authorization: `Bearer ${azureSession}`,
+      };
+
+      return this.user
+        .loaded(headers)
+        .then((resp) => {
           if (!this.user.isLoggedIn) {
+            // Store the current route to redirect after login (for azure login)
+            if (window.location.pathname !== "/") {
+              this.sessionStorage.setItem(
+                "redirectPathAfterLogin",
+                window.location.href
+              );
+            }
+
             this.redirectBackAfterLoginRoute = navigationInstruction.fragment;
             return next.cancel(new Redirect("login"));
           }
@@ -146,7 +169,7 @@ class AuthorizeStep {
           }
           return next();
         })
-        .catch(e => {
+        .catch((e) => {
           this.redirectBackAfterLoginRoute = navigationInstruction.fragment;
           return next.cancel(new Redirect("login"));
         });
@@ -166,7 +189,7 @@ class ConfigAvailableCheckStep {
     if (
       navigationInstruction
         .getAllInstructions()
-        .some(i => i.config.name === "server-unavailable")
+        .some((i) => i.config.name === "server-unavailable")
     ) {
       try {
         await this.qConfig.configLoaded;

client/package.json

@@ -3,6 +3,7 @@ import { Notification } from "aurelia-notification";
 import { I18N } from "aurelia-i18n";
 import qEnv from "resources/qEnv.js";
 import { AuthService } from "aurelia-authentication";
+import { AureliaCookie } from "aurelia-cookie";
 const log = LogManager.getLogger("Q");
 
 @inject(Loader, AuthService, Notification, I18N)
@@ -84,18 +85,15 @@ export class SchemaEditorFiles {
       dictMaxFilesExceeded: this.i18n.tr("dropzone.dictMaxFilesExceeded"),
     };
 
-    const authorizationToken = [
-      this.authService.config.authTokenType,
-      this.authService.getAccessToken(),
-    ].join(" ");
+    const azureSession = AureliaCookie.get("azureSession");
 
     this.dropzoneOptions = Object.assign(
       {
         addRemoveLinks: true,
         url: `${QServerBaseUrl}/file`,
         withCredentials: true,
         headers: {
-          Authorization: authorizationToken,
+          Authorization: `Bearer ${azureSession}`,
         },
         thumbnailWidth: 120, // should keep aspect ratio,
         thumbnailHeight: null,
@@ -152,7 +150,7 @@ export class SchemaEditorFiles {
 
       if (Array.isArray(this.data)) {
         // find the removed one in our data by
-        dataArrayIndex = this.data.findIndex(data => data.url === file.name);
+        dataArrayIndex = this.data.findIndex((data) => data.url === file.name);
         if (dataArrayIndex > -1) {
           this.data.splice(dataArrayIndex, 1);
           this.change();