@xwiki/cristal-authentication-nextcloud-ui 0.20.0 → 0.21.1

package/dist/translations.d.ts

@@ -1,3 +1,22 @@
+/**
+ * See the LICENSE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
 declare const translations: {
     en: {
         "authentication.nextcloud.modal.title": string;
@@ -6,6 +25,8 @@ declare const translations: {
         "authentication.nextcloud.modal.password.label": string;
         "authentication.nextcloud.modal.password.help": string;
         "authentication.nextcloud.modal.submit.label": string;
+        "authentication.nextcloud.modal.error.invalid": string;
+        "authentication.nextcloud.modal.error.generic": string;
     };
     fr: {
         "authentication.nextcloud.modal.title": string;
@@ -14,6 +35,8 @@ declare const translations: {
         "authentication.nextcloud.modal.password.label": string;
         "authentication.nextcloud.modal.password.help": string;
         "authentication.nextcloud.modal.submit.label": string;
+        "authentication.nextcloud.modal.error.invalid": string;
+        "authentication.nextcloud.modal.error.generic": string;
     };
 };
 export default translations;

package/langs/translation-en.json

@@ -4,5 +4,7 @@
   "authentication.nextcloud.modal.username.help": "Enter your username.",
   "authentication.nextcloud.modal.password.label": "Password",
   "authentication.nextcloud.modal.password.help": "It is not recommended to enter your own personal password, you should enter a specific application password instead.",
-  "authentication.nextcloud.modal.submit.label": "Log-in"
+  "authentication.nextcloud.modal.submit.label": "Log-in",
+  "authentication.nextcloud.modal.error.invalid": "Invalid username or password.",
+  "authentication.nextcloud.modal.error.generic": "Login check failed. Response status: {status}."
 }

package/langs/translation-fr.json

@@ -4,5 +4,7 @@
   "authentication.nextcloud.modal.username.help": "Saisissez votre nom d'utilisateur.",
   "authentication.nextcloud.modal.password.label": "Mot de passe",
   "authentication.nextcloud.modal.password.help": "Il n'est pas recommandé de saisir votre mot de passe personnel, vous devriez saisir un mot de passe d'application à la place.",
-  "authentication.nextcloud.modal.submit.label": "Se connecter"
+  "authentication.nextcloud.modal.submit.label": "Se connecter",
+  "authentication.nextcloud.modal.error.invalid": "Nom d'utilisateur ou mot de passe invalide.",
+  "authentication.nextcloud.modal.error.generic": "Échec de la vérification de connexion. Status de la réponse: {status}."
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xwiki/cristal-authentication-nextcloud-ui",
-  "version": "0.20.0",
+  "version": "0.21.1",
   "license": "LGPL 2.1",
   "author": "XWiki Org Community <contact@xwiki.org>",
   "homepage": "https://cristal.xwiki.org/",
@@ -27,28 +27,29 @@
   },
   "main": "./dist/index.es.js",
   "dependencies": {
-    "inversify": "7.5.4",
-    "vue-i18n": "11.1.5",
-    "@xwiki/cristal-authentication-nextcloud-state": "0.20.0",
-    "@xwiki/cristal-api": "0.20.0",
-    "@xwiki/cristal-authentication-api": "0.20.0",
-    "@xwiki/cristal-uiextension-api": "0.20.0"
+    "vue-i18n": "11.1.11",
+    "@xwiki/cristal-api": "0.21.1",
+    "@xwiki/cristal-authentication-api": "0.21.1",
+    "@xwiki/cristal-uiextension-api": "0.21.1",
+    "@xwiki/cristal-authentication-nextcloud-state": "0.21.1"
   },
   "peerDependencies": {
+    "inversify": "7.x",
     "reflect-metadata": "0.x",
     "vue": "3.x"
   },
   "devDependencies": {
     "@vue/test-utils": "2.4.6",
+    "inversify": "7.7.0",
     "reflect-metadata": "0.2.2",
-    "typescript": "5.8.3",
-    "vite": "7.0.0",
+    "typescript": "5.9.2",
+    "vite": "7.0.6",
     "vitest": "3.2.4",
-    "vue": "3.5.17",
-    "vue-tsc": "2.2.10",
-    "@xwiki/cristal-dev-test-utils": "0.20.0",
-    "@xwiki/cristal-dev-config": "0.20.0",
-    "@xwiki/cristal-dsapi": "0.20.0"
+    "vue": "3.5.18",
+    "vue-tsc": "2.2.12",
+    "@xwiki/cristal-dev-config": "0.21.1",
+    "@xwiki/cristal-dsapi": "0.21.1",
+    "@xwiki/cristal-dev-test-utils": "0.21.1"
   },
   "scripts": {
     "build": "vue-tsc --project tsconfig.json && vite build",

package/src/NextcloudLoginMenuUIExtension.ts

@@ -1,4 +1,4 @@
-/*
+/**
  * See the LICENSE file distributed with this work for additional
  * information regarding copyright ownership.
  *

package/src/index.ts

@@ -1,4 +1,4 @@
-/*
+/**
  * See the LICENSE file distributed with this work for additional
  * information regarding copyright ownership.
  *

package/src/translations.ts

@@ -1,4 +1,4 @@
-/*
+/**
  * See the LICENSE file distributed with this work for additional
  * information regarding copyright ownership.
  *

package/src/vue/NextcloudLoginMenu.vue

@@ -1,28 +1,28 @@
 <!--
-See the LICENSE file distributed with this work for additional
-information regarding copyright ownership.
+  See the LICENSE file distributed with this work for additional
+  information regarding copyright ownership.
 
-This is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as
-published by the Free Software Foundation; either version 2.1 of
-the License, or (at your option) any later version.
+  This is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as
+  published by the Free Software Foundation; either version 2.1 of
+  the License, or (at your option) any later version.
 
-This software is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
+  This software is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
 
-You should have received a copy of the GNU Lesser General Public
-License along with this software; if not, write to the Free
-Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  You should have received a copy of the GNU Lesser General Public
+  License along with this software; if not, write to the Free
+  Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
 
 <script lang="ts" setup>
 import messages from "../translations";
 import { CristalApp } from "@xwiki/cristal-api";
 import { NextcloudAuthenticationState } from "@xwiki/cristal-authentication-nextcloud-state";
-import { inject, watch } from "vue";
+import { inject, ref, watch } from "vue";
 import { useI18n } from "vue-i18n";
 import type { Ref } from "vue";
 
@@ -38,7 +38,14 @@ const authenticationState = cristal
 const modalOpened: Ref<boolean> = authenticationState.modalOpened;
 const username: Ref<string> = authenticationState.username;
 const password: Ref<string> = authenticationState.password;
-const callback: Ref<() => void> = authenticationState.callback;
+const errorStatus: Ref<number | undefined> = ref(undefined);
+
+async function callback() {
+  const response = await authenticationState.callback();
+  if (!response.success) {
+    errorStatus.value = response.status;
+  }
+}
 
 watch(
   authenticationState.modalOpened,
@@ -46,6 +53,7 @@ watch(
     if (newValue && !oldValue) {
       authenticationState.username.value = "";
       authenticationState.password.value = "";
+      errorStatus.value = undefined;
     }
   },
 );
@@ -58,6 +66,23 @@ watch(
     :title="t('authentication.nextcloud.modal.title')"
   >
     <template #default>
+      <!-- We need 2 different divs to implement the following behavior:
+             - Use max available width from the parent
+             - Do not resize the parent if the content is larger -->
+      <div class="alerts-wrapper">
+        <div class="alerts">
+          <x-alert v-if="errorStatus === 401" type="error">
+            {{ t("authentication.nextcloud.modal.error.invalid") }}
+          </x-alert>
+          <x-alert v-else-if="errorStatus !== undefined" type="error">
+            {{
+              t("authentication.nextcloud.modal.error.generic", {
+                status: errorStatus,
+              })
+            }}
+          </x-alert>
+        </div>
+      </div>
       <x-form id="nextcloud-login-form" @submit="callback">
         <x-text-field
           v-model="username"
@@ -81,3 +106,13 @@ watch(
     </template>
   </x-dialog>
 </template>
+
+<style scoped>
+.alerts-wrapper {
+  display: flex;
+}
+.alerts {
+  flex-grow: 1;
+  width: 0;
+}
+</style>

package/vite.config.ts

@@ -1,4 +1,4 @@
-/*
+/**
  * See the LICENSE file distributed with this work for additional
  * information regarding copyright ownership.
  *

package/vitest.config.ts

@@ -1,4 +1,4 @@
-/*
+/**
  * See the LICENSE file distributed with this work for additional
  * information regarding copyright ownership.
  *