From 7f0e9c1850ca91ebe4f3069450683dd068c32dc2 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 5 Jan 2025 23:46:26 +0100 Subject: [PATCH] Testing (#228) : fix login * Update manifest.toml * Auto-update READMEs * Update manifest.toml * Auto-update READMEs * Fix upgrade from previous versions (#229) * Move patches to the right folder Following the documentation here: https://doc.yunohost.org/en/packaging_apps_helpers_v2.1#ynh-setup-source * Bump version --------- Co-authored-by: lapineige * Auto-update READMEs --------- Co-authored-by: yunohost-bot Co-authored-by: Matteo Giaccone Co-authored-by: lapineige --- ALL_README.md | 1 + README.md | 6 +- README_es.md | 6 +- README_eu.md | 6 +- README_fr.md | 6 +- README_gl.md | 6 +- README_id.md | 6 +- README_nl.md | 6 +- README_pl.md | 55 ++++++++++++++++ README_ru.md | 6 +- README_zh_Hans.md | 6 +- manifest.toml | 7 ++- .../main/00-ldap-auth.patch | 0 .../main/01-logout-success-handler.patch | 0 .../main/02-oauth-workaround.patch | 0 sources/patches/main-00-ldap-auth.patch | 46 -------------- .../main-01-logout-success-handler.patch | 63 ------------------- .../patches/main-02-oauth-workaround.patch | 11 ---- 18 files changed, 97 insertions(+), 140 deletions(-) create mode 100644 README_pl.md rename {sources/patches => patches}/main/00-ldap-auth.patch (100%) rename {sources/patches => patches}/main/01-logout-success-handler.patch (100%) rename {sources/patches => patches}/main/02-oauth-workaround.patch (100%) delete mode 100644 sources/patches/main-00-ldap-auth.patch delete mode 100644 sources/patches/main-01-logout-success-handler.patch delete mode 100644 sources/patches/main-02-oauth-workaround.patch diff --git a/ALL_README.md b/ALL_README.md index df3708b..c93d620 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -7,5 +7,6 @@ - [Le o README en galego](README_gl.md) - [Baca README dalam bahasa bahasa Indonesia](README_id.md) - [Lees de README in het Nederlands](README_nl.md) +- [Przeczytaj README w języku polski](README_pl.md) - [Прочитать README на русский](README_ru.md) - [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index 6d97d95..2f6fb07 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,9 @@ It shall NOT be edited by hand. # Wallabag for YunoHost -[![Integration level](https://dash.yunohost.org/integration/wallabag2.svg)](https://ci-apps.yunohost.org/ci/apps/wallabag2/) ![Working status](https://ci-apps.yunohost.org/ci/badges/wallabag2.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/wallabag2.maintain.svg) +[![Integration level](https://apps.yunohost.org/badge/integration/wallabag2)](https://ci-apps.yunohost.org/ci/apps/wallabag2/) +![Working status](https://apps.yunohost.org/badge/state/wallabag2) +![Maintenance status](https://apps.yunohost.org/badge/maintained/wallabag2) [![Install Wallabag with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=wallabag2) @@ -22,7 +24,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html). -**Shipped version:** 2.5.4~ynh9 +**Shipped version:** 2.5.4~ynh11 **Demo:** diff --git a/README_es.md b/README_es.md index 05de54e..e03ca55 100644 --- a/README_es.md +++ b/README_es.md @@ -5,7 +5,9 @@ No se debe editar a mano. # Wallabag para Yunohost -[![Nivel de integración](https://dash.yunohost.org/integration/wallabag2.svg)](https://ci-apps.yunohost.org/ci/apps/wallabag2/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/wallabag2.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/wallabag2.maintain.svg) +[![Nivel de integración](https://apps.yunohost.org/badge/integration/wallabag2)](https://ci-apps.yunohost.org/ci/apps/wallabag2/) +![Estado funcional](https://apps.yunohost.org/badge/state/wallabag2) +![Estado En Mantención](https://apps.yunohost.org/badge/maintained/wallabag2) [![Instalar Wallabag con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=wallabag2) @@ -22,7 +24,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html). -**Versión actual:** 2.5.4~ynh9 +**Versión actual:** 2.5.4~ynh11 **Demo:** diff --git a/README_eu.md b/README_eu.md index f10cfda..5f969e7 100644 --- a/README_eu.md +++ b/README_eu.md @@ -5,7 +5,9 @@ EZ editatu eskuz. # Wallabag YunoHost-erako -[![Integrazio maila](https://dash.yunohost.org/integration/wallabag2.svg)](https://ci-apps.yunohost.org/ci/apps/wallabag2/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/wallabag2.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/wallabag2.maintain.svg) +[![Integrazio maila](https://apps.yunohost.org/badge/integration/wallabag2)](https://ci-apps.yunohost.org/ci/apps/wallabag2/) +![Funtzionamendu egoera](https://apps.yunohost.org/badge/state/wallabag2) +![Mantentze egoera](https://apps.yunohost.org/badge/maintained/wallabag2) [![Instalatu Wallabag YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=wallabag2) @@ -22,7 +24,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html). -**Paketatutako bertsioa:** 2.5.4~ynh9 +**Paketatutako bertsioa:** 2.5.4~ynh11 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 350c4a2..4f0d4e7 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,9 @@ Il NE doit PAS être modifié à la main. # Wallabag pour YunoHost -[![Niveau d’intégration](https://dash.yunohost.org/integration/wallabag2.svg)](https://ci-apps.yunohost.org/ci/apps/wallabag2/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/wallabag2.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/wallabag2.maintain.svg) +[![Niveau d’intégration](https://apps.yunohost.org/badge/integration/wallabag2)](https://ci-apps.yunohost.org/ci/apps/wallabag2/) +![Statut du fonctionnement](https://apps.yunohost.org/badge/state/wallabag2) +![Statut de maintenance](https://apps.yunohost.org/badge/maintained/wallabag2) [![Installer Wallabag avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=wallabag2) @@ -22,7 +24,7 @@ Sont disponibles une interface web, des add-ons pour navigateurs (Firefox/Chrome La mise à niveau depuis le paquet YunoHost de [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) demande une opération manuelle, c'est pourquoi un nouveau paquet est fournit. Pour le processus de migration, merci de vous référer à [la documentation officiel de Wallabag](https://doc.wallabag.org/fr/user/import/wallabagv1.html). -**Version incluse :** 2.5.4~ynh9 +**Version incluse :** 2.5.4~ynh11 **Démo :** diff --git a/README_gl.md b/README_gl.md index 819cbb7..a9771f9 100644 --- a/README_gl.md +++ b/README_gl.md @@ -5,7 +5,9 @@ NON debe editarse manualmente. # Wallabag para YunoHost -[![Nivel de integración](https://dash.yunohost.org/integration/wallabag2.svg)](https://ci-apps.yunohost.org/ci/apps/wallabag2/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/wallabag2.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/wallabag2.maintain.svg) +[![Nivel de integración](https://apps.yunohost.org/badge/integration/wallabag2)](https://ci-apps.yunohost.org/ci/apps/wallabag2/) +![Estado de funcionamento](https://apps.yunohost.org/badge/state/wallabag2) +![Estado de mantemento](https://apps.yunohost.org/badge/maintained/wallabag2) [![Instalar Wallabag con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=wallabag2) @@ -22,7 +24,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html). -**Versión proporcionada:** 2.5.4~ynh9 +**Versión proporcionada:** 2.5.4~ynh11 **Demo:** diff --git a/README_id.md b/README_id.md index e46b560..52b3e01 100644 --- a/README_id.md +++ b/README_id.md @@ -5,7 +5,9 @@ Ini TIDAK boleh diedit dengan tangan. # Wallabag untuk YunoHost -[![Tingkat integrasi](https://dash.yunohost.org/integration/wallabag2.svg)](https://ci-apps.yunohost.org/ci/apps/wallabag2/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/wallabag2.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/wallabag2.maintain.svg) +[![Tingkat integrasi](https://apps.yunohost.org/badge/integration/wallabag2)](https://ci-apps.yunohost.org/ci/apps/wallabag2/) +![Status kerja](https://apps.yunohost.org/badge/state/wallabag2) +![Status pemeliharaan](https://apps.yunohost.org/badge/maintained/wallabag2) [![Pasang Wallabag dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=wallabag2) @@ -22,7 +24,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html). -**Versi terkirim:** 2.5.4~ynh9 +**Versi terkirim:** 2.5.4~ynh11 **Demo:** diff --git a/README_nl.md b/README_nl.md index 2498f4d..f4dd05a 100644 --- a/README_nl.md +++ b/README_nl.md @@ -5,7 +5,9 @@ Hij mag NIET handmatig aangepast worden. # Wallabag voor Yunohost -[![Integratieniveau](https://dash.yunohost.org/integration/wallabag2.svg)](https://ci-apps.yunohost.org/ci/apps/wallabag2/) ![Mate van functioneren](https://ci-apps.yunohost.org/ci/badges/wallabag2.status.svg) ![Onderhoudsstatus](https://ci-apps.yunohost.org/ci/badges/wallabag2.maintain.svg) +[![Integratieniveau](https://apps.yunohost.org/badge/integration/wallabag2)](https://ci-apps.yunohost.org/ci/apps/wallabag2/) +![Mate van functioneren](https://apps.yunohost.org/badge/state/wallabag2) +![Onderhoudsstatus](https://apps.yunohost.org/badge/maintained/wallabag2) [![Wallabag met Yunohost installeren](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=wallabag2) @@ -22,7 +24,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html). -**Geleverde versie:** 2.5.4~ynh9 +**Geleverde versie:** 2.5.4~ynh11 **Demo:** diff --git a/README_pl.md b/README_pl.md new file mode 100644 index 0000000..c415a20 --- /dev/null +++ b/README_pl.md @@ -0,0 +1,55 @@ + + +# Wallabag dla YunoHost + +[![Poziom integracji](https://apps.yunohost.org/badge/integration/wallabag2)](https://ci-apps.yunohost.org/ci/apps/wallabag2/) +![Status działania](https://apps.yunohost.org/badge/state/wallabag2) +![Status utrzymania](https://apps.yunohost.org/badge/maintained/wallabag2) + +[![Zainstaluj Wallabag z YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=wallabag2) + +*[Przeczytaj plik README w innym języku.](./ALL_README.md)* + +> *Ta aplikacja pozwala na szybką i prostą instalację Wallabag na serwerze YunoHost.* +> *Jeżeli nie masz YunoHost zapoznaj się z [poradnikiem](https://yunohost.org/install) instalacji.* + +## Przegląd + +Wallabag is a self hostable Read-It-Later application allowing you to not miss any content anymore. Click, save, read it when you can. +It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps (Android/iOS/Windows Phone) and even on e-reader (PocketBook/Kobo). + +Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html). + + +**Dostarczona wersja:** 2.5.4~ynh11 + +**Demo:** + +## Zrzuty ekranu + +![Zrzut ekranu z Wallabag](./doc/screenshots/screenshot1.webp) + +## Dokumentacja i zasoby + +- Oficjalna strona aplikacji: +- Oficjalna dokumentacja dla administratora: +- Repozytorium z kodem źródłowym: +- Sklep YunoHost: +- Zgłaszanie błędów: + +## Informacje od twórców + +Wyślij swój pull request do [gałęzi `testing`](https://github.com/YunoHost-Apps/wallabag2_ynh/tree/testing). + +Aby wypróbować gałąź `testing` postępuj zgodnie z instrukcjami: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/wallabag2_ynh/tree/testing --debug +lub +sudo yunohost app upgrade wallabag2 -u https://github.com/YunoHost-Apps/wallabag2_ynh/tree/testing --debug +``` + +**Więcej informacji o tworzeniu paczek aplikacji:** diff --git a/README_ru.md b/README_ru.md index 9e68a09..be2bd5d 100644 --- a/README_ru.md +++ b/README_ru.md @@ -5,7 +5,9 @@ # Wallabag для YunoHost -[![Уровень интеграции](https://dash.yunohost.org/integration/wallabag2.svg)](https://ci-apps.yunohost.org/ci/apps/wallabag2/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/wallabag2.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/wallabag2.maintain.svg) +[![Уровень интеграции](https://apps.yunohost.org/badge/integration/wallabag2)](https://ci-apps.yunohost.org/ci/apps/wallabag2/) +![Состояние работы](https://apps.yunohost.org/badge/state/wallabag2) +![Состояние сопровождения](https://apps.yunohost.org/badge/maintained/wallabag2) [![Установите Wallabag с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=wallabag2) @@ -22,7 +24,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html). -**Поставляемая версия:** 2.5.4~ynh9 +**Поставляемая версия:** 2.5.4~ynh11 **Демо-версия:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 1d841aa..49b57fc 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -5,7 +5,9 @@ # YunoHost 上的 Wallabag -[![集成程度](https://dash.yunohost.org/integration/wallabag2.svg)](https://ci-apps.yunohost.org/ci/apps/wallabag2/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/wallabag2.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/wallabag2.maintain.svg) +[![集成程度](https://apps.yunohost.org/badge/integration/wallabag2)](https://ci-apps.yunohost.org/ci/apps/wallabag2/) +![工作状态](https://apps.yunohost.org/badge/state/wallabag2) +![维护状态](https://apps.yunohost.org/badge/maintained/wallabag2) [![使用 YunoHost 安装 Wallabag](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=wallabag2) @@ -22,7 +24,7 @@ It provides a web interface, browser (Firefox/Chrome/Opera) add-ons, mobile apps Upgrade from the YunoHost [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) app requires a manual operation. That's why it's provided as a new package. For the migration process, please refer to the [Wallabag official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html). -**分发版本：** 2.5.4~ynh9 +**分发版本：** 2.5.4~ynh11 **演示：** diff --git a/manifest.toml b/manifest.toml index f210ff3..7779a8f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -6,7 +6,8 @@ id = "wallabag2" name = "Wallabag" description.en = "Save and classify articles. Read them later" description.fr = "Enregistrez et classez les articles. Lisez-les plus tard" -version = "2.5.4~ynh9" + +version = "2.5.4~ynh11" maintainers = ["lapineige"] @@ -20,12 +21,14 @@ cpe = "cpe:2.3:a:wallabag:wallabag" fund = "https://liberapay.com/wallabag" [integration] -yunohost = ">= 11.2.30" +yunohost = ">= 12.0.9" helpers_version = "2.1" architectures = "all" multi_instance = true + ldap = true sso = true + disk = "200M" ram.build = "150M" ram.runtime = "50M" diff --git a/sources/patches/main/00-ldap-auth.patch b/patches/main/00-ldap-auth.patch similarity index 100% rename from sources/patches/main/00-ldap-auth.patch rename to patches/main/00-ldap-auth.patch diff --git a/sources/patches/main/01-logout-success-handler.patch b/patches/main/01-logout-success-handler.patch similarity index 100% rename from sources/patches/main/01-logout-success-handler.patch rename to patches/main/01-logout-success-handler.patch diff --git a/sources/patches/main/02-oauth-workaround.patch b/patches/main/02-oauth-workaround.patch similarity index 100% rename from sources/patches/main/02-oauth-workaround.patch rename to patches/main/02-oauth-workaround.patch diff --git a/sources/patches/main-00-ldap-auth.patch b/sources/patches/main-00-ldap-auth.patch deleted file mode 100644 index 3a36f5e..0000000 --- a/sources/patches/main-00-ldap-auth.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/app/config/security.yml b/app/config/security.yml -index 02afc9ea..5a3f7a34 100644 ---- a/app/config/security.yml -+++ b/app/config/security.yml -@@ -13,6 +13,14 @@ security: - property: username - fos_userbundle: - id: fos_user.user_provider.username_email -+ yunohost_users: -+ ldap: -+ service: yunohost.ldap -+ base_dn: ou=users,dc=yunohost,dc=org -+ search_dn: -+ search_password: -+ filter: (&(uid={username})(objectClass=posixAccount)) -+ default_roles: ROLE_USER - - # the main part of the security, where you can set up firewalls - # for specific sections of your app -@@ -38,6 +46,9 @@ security: - - secured_area: - pattern: ^/ -+ http_basic_ldap: -+ service: yunohost.ldap -+ dn_string: "uid={username},ou=users,dc=yunohost,dc=org" - form_login: - provider: fos_userbundle - csrf_token_generator: security.csrf.token_manager -diff --git a/app/config/services.yml b/app/config/services.yml -index 7b85d846..f23961c5 100644 ---- a/app/config/services.yml -+++ b/app/config/services.yml -@@ -43,6 +43,10 @@ services: - tags: - - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin } - -+ yunohost.ldap: -+ class: Symfony\Component\Ldap\LdapClient -+ arguments: ["localhost"] -+ - craue_config_cache_provider: - class: Symfony\Component\Cache\Adapter\FilesystemAdapter - public: false --- -2.17.1 diff --git a/sources/patches/main-01-logout-success-handler.patch b/sources/patches/main-01-logout-success-handler.patch deleted file mode 100644 index d321d54..0000000 --- a/sources/patches/main-01-logout-success-handler.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/app/config/security.yml b/app/config/security.yml -index 5a3f7a34..1720e741 100644 ---- a/app/config/security.yml -+++ b/app/config/security.yml -@@ -62,7 +62,7 @@ security: - - logout: - path: /logout -- target: / -+ success_handler: yunohost.logout_success_handler - - access_control: - - { path: ^/api/doc, roles: IS_AUTHENTICATED_ANONYMOUSLY } -diff --git a/app/config/services.yml b/app/config/services.yml -index f23961c5..f266e6d1 100644 ---- a/app/config/services.yml -+++ b/app/config/services.yml -@@ -43,6 +43,10 @@ services: - tags: - - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin } - -+ yunohost.logout_success_handler: -+ class: Wallabag\YunoHostBundle\Security\LogoutSuccessHandler -+ -+ - yunohost.ldap: - class: Symfony\Component\Ldap\LdapClient - arguments: ["localhost"] -diff --git a/src/Wallabag/YunoHostBundle/Security/LogoutSuccessHandler.php b/src/Wallabag/YunoHostBundle/Security/LogoutSuccessHandler.php -new file mode 100644 -index 00000000..b3268243 ---- /dev/null -+++ b/src/Wallabag/YunoHostBundle/Security/LogoutSuccessHandler.php -@@ -0,0 +1,27 @@ -+encoderFactory->getEncoder($user); - -- if ($encoder->isPasswordValid($user->getPassword(), $password, $user->getSalt())) { -+ if (true) { - return array( - 'data' => $user, - );