From 567f6e27f9e185493f54b30dc928f944d87b1d3f Mon Sep 17 00:00:00 2001 From: binsky Date: Wed, 14 Jun 2023 12:48:28 +0200 Subject: [PATCH 01/11] use psr-4 autoloading compatible file names --- controller/{admincontroller.php => AdminController.php} | 0 controller/{credentialcontroller.php => CredentialController.php} | 0 controller/{filecontroller.php => FileController.php} | 0 controller/{iconcontroller.php => IconController.php} | 0 controller/{internalcontroller.php => InternalController.php} | 0 controller/{pagecontroller.php => PageController.php} | 0 controller/{settingscontroller.php => SettingsController.php} | 0 controller/{sharecontroller.php => ShareController.php} | 0 .../{translationcontroller.php => TranslationController.php} | 0 controller/{vaultcontroller.php => VaultController.php} | 0 middleware/{apimiddleware.php => APIMiddleware.php} | 0 middleware/{sharemiddleware.php => ShareMiddleware.php} | 0 migration/{serversideencryption.php => ServerSideEncryption.php} | 0 13 files changed, 0 insertions(+), 0 deletions(-) rename controller/{admincontroller.php => AdminController.php} (100%) rename controller/{credentialcontroller.php => CredentialController.php} (100%) rename controller/{filecontroller.php => FileController.php} (100%) rename controller/{iconcontroller.php => IconController.php} (100%) rename controller/{internalcontroller.php => InternalController.php} (100%) rename controller/{pagecontroller.php => PageController.php} (100%) rename controller/{settingscontroller.php => SettingsController.php} (100%) rename controller/{sharecontroller.php => ShareController.php} (100%) rename controller/{translationcontroller.php => TranslationController.php} (100%) rename controller/{vaultcontroller.php => VaultController.php} (100%) rename middleware/{apimiddleware.php => APIMiddleware.php} (100%) rename middleware/{sharemiddleware.php => ShareMiddleware.php} (100%) rename migration/{serversideencryption.php => ServerSideEncryption.php} (100%) diff --git a/controller/admincontroller.php b/controller/AdminController.php similarity index 100% rename from controller/admincontroller.php rename to controller/AdminController.php diff --git a/controller/credentialcontroller.php b/controller/CredentialController.php similarity index 100% rename from controller/credentialcontroller.php rename to controller/CredentialController.php diff --git a/controller/filecontroller.php b/controller/FileController.php similarity index 100% rename from controller/filecontroller.php rename to controller/FileController.php diff --git a/controller/iconcontroller.php b/controller/IconController.php similarity index 100% rename from controller/iconcontroller.php rename to controller/IconController.php diff --git a/controller/internalcontroller.php b/controller/InternalController.php similarity index 100% rename from controller/internalcontroller.php rename to controller/InternalController.php diff --git a/controller/pagecontroller.php b/controller/PageController.php similarity index 100% rename from controller/pagecontroller.php rename to controller/PageController.php diff --git a/controller/settingscontroller.php b/controller/SettingsController.php similarity index 100% rename from controller/settingscontroller.php rename to controller/SettingsController.php diff --git a/controller/sharecontroller.php b/controller/ShareController.php similarity index 100% rename from controller/sharecontroller.php rename to controller/ShareController.php diff --git a/controller/translationcontroller.php b/controller/TranslationController.php similarity index 100% rename from controller/translationcontroller.php rename to controller/TranslationController.php diff --git a/controller/vaultcontroller.php b/controller/VaultController.php similarity index 100% rename from controller/vaultcontroller.php rename to controller/VaultController.php diff --git a/middleware/apimiddleware.php b/middleware/APIMiddleware.php similarity index 100% rename from middleware/apimiddleware.php rename to middleware/APIMiddleware.php diff --git a/middleware/sharemiddleware.php b/middleware/ShareMiddleware.php similarity index 100% rename from middleware/sharemiddleware.php rename to middleware/ShareMiddleware.php diff --git a/migration/serversideencryption.php b/migration/ServerSideEncryption.php similarity index 100% rename from migration/serversideencryption.php rename to migration/ServerSideEncryption.php From b83bb2dc5e54882ccef368b413205b71d3cd74ef Mon Sep 17 00:00:00 2001 From: binsky Date: Wed, 14 Jun 2023 12:54:07 +0200 Subject: [PATCH 02/11] require php 8.0 with nc 26 or 27 --- appinfo/info.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index b3627489..a48758db 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -37,12 +37,12 @@ For an demo of this app visit [https://demo.passman.cc](https://demo.passman.cc) https://img.passman.cc/share_credential.png https://img.passman.cc/password_audit.png - + sqlite pgsql mysql openssl - + From 9bba4df657f7487a7c773a75b00ecb0312aab73d Mon Sep 17 00:00:00 2001 From: binsky Date: Wed, 14 Jun 2023 12:54:49 +0200 Subject: [PATCH 03/11] fix deprecations in ExpireCredentials background job --- lib/BackgroundJob/ExpireCredentials.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/BackgroundJob/ExpireCredentials.php b/lib/BackgroundJob/ExpireCredentials.php index a911775e..d8201a86 100644 --- a/lib/BackgroundJob/ExpireCredentials.php +++ b/lib/BackgroundJob/ExpireCredentials.php @@ -23,8 +23,9 @@ namespace OCA\Passman\BackgroundJob; -use OC\BackgroundJob\TimedJob; use OCA\Passman\Service\CronService; +use OCP\AppFramework\Utility\ITimeFactory; +use OCP\BackgroundJob\TimedJob; use OCP\IConfig; /** @@ -34,22 +35,21 @@ use OCP\IConfig; */ class ExpireCredentials extends TimedJob { - protected IConfig $config; - private CronService $cronService; + /** + * ExpireCredentials constructor. + * + * @param ITimeFactory $timeFactory + * @param IConfig $config + * @param CronService $cronService + */ + public function __construct(ITimeFactory $timeFactory, protected IConfig $config, private CronService $cronService) { + parent::__construct($timeFactory); - /** - * ExpireCredentials constructor. - * @param IConfig $config - * @param CronService $cronService - */ - public function __construct(IConfig $config, CronService $cronService) { // Run once per minute $this->setInterval(60); - $this->config = $config; - $this->cronService = $cronService; } - protected function run($argument) { + protected function run($argument): void { $this->cronService->expireCredentials(); } } From 0465c546693625df6af25a7f6fe857157c73f15b Mon Sep 17 00:00:00 2001 From: binsky Date: Wed, 14 Jun 2023 13:23:19 +0200 Subject: [PATCH 04/11] move controller/ to lib/Controller/ --- appinfo/autoload.php | 14 --- appinfo/routes.php | 118 +++++++++--------- lib/AppInfo/Application.php | 4 +- .../Controller}/AdminController.php | 8 +- .../Controller}/CredentialController.php | 2 +- .../Controller}/FileController.php | 3 +- .../Controller}/IconController.php | 2 +- .../Controller}/InternalController.php | 2 +- .../Controller}/PageController.php | 17 +-- .../Controller}/SettingsController.php | 15 ++- .../Controller}/ShareController.php | 2 +- .../Controller}/TranslationController.php | 6 +- .../Controller}/VaultController.php | 3 +- middleware/ShareMiddleware.php | 6 +- tests/unit/controller/FileControllerTest.php | 16 +-- .../controller/InternalControllerTest.php | 7 +- tests/unit/controller/PageControllerTest.php | 7 +- .../controller/SettingsControllerTest.php | 7 +- .../controller/TranslationControllerTest.php | 4 +- tests/unit/controller/VaultControllerTest.php | 7 +- 20 files changed, 107 insertions(+), 143 deletions(-) delete mode 100644 appinfo/autoload.php rename {controller => lib/Controller}/AdminController.php (99%) rename {controller => lib/Controller}/CredentialController.php (99%) rename {controller => lib/Controller}/FileController.php (97%) rename {controller => lib/Controller}/IconController.php (99%) rename {controller => lib/Controller}/InternalController.php (99%) rename {controller => lib/Controller}/PageController.php (84%) rename {controller => lib/Controller}/SettingsController.php (96%) rename {controller => lib/Controller}/ShareController.php (99%) rename {controller => lib/Controller}/TranslationController.php (99%) rename {controller => lib/Controller}/VaultController.php (98%) diff --git a/appinfo/autoload.php b/appinfo/autoload.php deleted file mode 100644 index 93a5e81f..00000000 --- a/appinfo/autoload.php +++ /dev/null @@ -1,14 +0,0 @@ - - * @copyright Sander Brand 2016 - */ - -namespace OCA\Passman\AppInfo; - - diff --git a/appinfo/routes.php b/appinfo/routes.php index f3d3db75..b0e56b99 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -19,88 +19,88 @@ */ return [ 'routes' => [ - ['name' => 'page#index', 'url' => '/', 'verb' => 'GET'], - ['name' => 'page#bookmarklet', 'url' => '/bookmarklet', 'verb' => 'GET'], - ['name' => 'page#publicSharePage', 'url' => '/share/public', 'verb' => 'GET'], + ['name' => 'Page#index', 'url' => '/', 'verb' => 'GET'], + ['name' => 'Page#bookmarklet', 'url' => '/bookmarklet', 'verb' => 'GET'], + ['name' => 'Page#publicSharePage', 'url' => '/share/public', 'verb' => 'GET'], //Vault - ['name' => 'vault#listVaults', 'url' => '/api/v2/vaults', 'verb' => 'GET'], - ['name' => 'vault#create', 'url' => '/api/v2/vaults', 'verb' => 'POST'], - ['name' => 'vault#get', 'url' => '/api/v2/vaults/{vault_guid}', 'verb' => 'GET'], - ['name' => 'vault#update', 'url' => '/api/v2/vaults/{vault_guid}', 'verb' => 'PATCH'], - ['name' => 'vault#delete', 'url' => '/api/v2/vaults/{vault_guid}', 'verb' => 'DELETE'], + ['name' => 'Vault#listVaults', 'url' => '/api/v2/vaults', 'verb' => 'GET'], + ['name' => 'Vault#create', 'url' => '/api/v2/vaults', 'verb' => 'POST'], + ['name' => 'Vault#get', 'url' => '/api/v2/vaults/{vault_guid}', 'verb' => 'GET'], + ['name' => 'Vault#update', 'url' => '/api/v2/vaults/{vault_guid}', 'verb' => 'PATCH'], + ['name' => 'Vault#delete', 'url' => '/api/v2/vaults/{vault_guid}', 'verb' => 'DELETE'], //@TODO make frontend use PATCH - ['name' => 'vault#updateSharingKeys', 'url' => '/api/v2/vaults/{vault_guid}/sharing-keys', 'verb' => 'POST'], + ['name' => 'Vault#updateSharingKeys', 'url' => '/api/v2/vaults/{vault_guid}/sharing-keys', 'verb' => 'POST'], //Credential - ['name' => 'credential#createCredential', 'url' => '/api/v2/credentials', 'verb' => 'POST'], - ['name' => 'credential#getCredential', 'url' => '/api/v2/credentials/{credential_guid}', 'verb' => 'GET'], - ['name' => 'credential#updateCredential', 'url' => '/api/v2/credentials/{credential_guid}', 'verb' => 'PATCH'], - ['name' => 'credential#deleteCredential', 'url' => '/api/v2/credentials/{credential_guid}', 'verb' => 'DELETE'], + ['name' => 'Credential#createCredential', 'url' => '/api/v2/credentials', 'verb' => 'POST'], + ['name' => 'Credential#getCredential', 'url' => '/api/v2/credentials/{credential_guid}', 'verb' => 'GET'], + ['name' => 'Credential#updateCredential', 'url' => '/api/v2/credentials/{credential_guid}', 'verb' => 'PATCH'], + ['name' => 'Credential#deleteCredential', 'url' => '/api/v2/credentials/{credential_guid}', 'verb' => 'DELETE'], //Revisions - ['name' => 'credential#getRevision', 'url' => '/api/v2/credentials/{credential_guid}/revision', 'verb' => 'GET'], - ['name' => 'credential#deleteRevision', 'url' => '/api/v2/credentials/{credential_guid}/revision/{revision_id}', 'verb' => 'DELETE'], - ['name' => 'credential#updateRevision', 'url' => '/api/v2/credentials/{credential_guid}/revision/{revision_id}', 'verb' => 'PATCH'], + ['name' => 'Credential#getRevision', 'url' => '/api/v2/credentials/{credential_guid}/revision', 'verb' => 'GET'], + ['name' => 'Credential#deleteRevision', 'url' => '/api/v2/credentials/{credential_guid}/revision/{revision_id}', 'verb' => 'DELETE'], + ['name' => 'Credential#updateRevision', 'url' => '/api/v2/credentials/{credential_guid}/revision/{revision_id}', 'verb' => 'PATCH'], //File stuff - ['name' => 'file#uploadFile', 'url' => '/api/v2/file', 'verb' => 'POST'], - ['name' => 'file#getFile', 'url' => '/api/v2/file/{file_id}', 'verb' => 'GET'], - ['name' => 'file#deleteFile', 'url' => '/api/v2/file/{file_id}', 'verb' => 'DELETE'], - ['name' => 'file#deleteFiles', 'url' => '/api/v2/files/delete', 'verb' => 'POST'], - ['name' => 'file#updateFile', 'url' => '/api/v2/file/{file_id}', 'verb' => 'PATCH'], + ['name' => 'File#uploadFile', 'url' => '/api/v2/file', 'verb' => 'POST'], + ['name' => 'File#getFile', 'url' => '/api/v2/file/{file_id}', 'verb' => 'GET'], + ['name' => 'File#deleteFile', 'url' => '/api/v2/file/{file_id}', 'verb' => 'DELETE'], + ['name' => 'File#deleteFiles', 'url' => '/api/v2/files/delete', 'verb' => 'POST'], + ['name' => 'File#updateFile', 'url' => '/api/v2/file/{file_id}', 'verb' => 'PATCH'], //Sharing stuff - ['name' => 'share#search', 'url' => '/api/v2/sharing/search', 'verb' => 'POST'], - ['name' => 'share#getVaultsByUser', 'url' => '/api/v2/sharing/vaults/{user_id}', 'verb' => 'GET'], - ['name' => 'share#applyIntermediateShare', 'url' => '/api/v2/sharing/share', 'verb' => 'POST'], - ['name' => 'share#savePendingRequest', 'url' => '/api/v2/sharing/save', 'verb' => 'POST'], - ['name' => 'share#getPendingRequests', 'url' => '/api/v2/sharing/pending', 'verb' => 'GET'], - ['name' => 'share#deleteShareRequest', 'url' => '/api/v2/sharing/decline/{share_request_id}', 'verb' => 'DELETE'], - ['name' => 'share#getVaultItems', 'url' => '/api/v2/sharing/vault/{vault_guid}/get', 'verb' => 'GET'], - ['name' => 'share#getVaultAclEntries', 'url' => '/api/v2/sharing/vault/{vault_guid}/acl', 'verb' => 'GET'], - ['name' => 'share#createPublicShare', 'url' => '/api/v2/sharing/public', 'verb' => 'POST'], - ['name' => 'share#getPublicCredentialData', 'url' => '/api/v2/sharing/credential/{credential_guid}/public', 'verb' => 'GET'], - ['name' => 'share#unshareCredential', 'url' => '/api/v2/sharing/credential/{item_guid}', 'verb' => 'DELETE'], - ['name' => 'share#unshareCredentialFromUser', 'url' => '/api/v2/sharing/credential/{item_guid}/{user_id}', 'verb' => 'DELETE'], - ['name' => 'share#getRevisions', 'url' => '/api/v2/sharing/credential/{item_guid}/revisions', 'verb' => 'GET'], - ['name' => 'share#getItemAcl', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'GET'], - ['name' => 'share#uploadFile', 'url' => '/api/v2/sharing/credential/{item_guid}/file', 'verb' => 'POST'], - ['name' => 'share#getFile', 'url' => '/api/v2/sharing/credential/{item_guid}/file/{file_guid}', 'verb' => 'GET'], - ['name' => 'share#updateSharedCredentialACL', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'PATCH'], - ['name' => 'share#updateSharedCredentialACLSharedKey', 'url' => '/api/v2/sharing/credential/{item_guid}/acl/shared_key', 'verb' => 'PATCH'], - ['name' => 'internal#getAppVersion', 'url' => '/api/v2/version', 'verb' => 'GET'], + ['name' => 'Share#search', 'url' => '/api/v2/sharing/search', 'verb' => 'POST'], + ['name' => 'Share#getVaultsByUser', 'url' => '/api/v2/sharing/vaults/{user_id}', 'verb' => 'GET'], + ['name' => 'Share#applyIntermediateShare', 'url' => '/api/v2/sharing/share', 'verb' => 'POST'], + ['name' => 'Share#savePendingRequest', 'url' => '/api/v2/sharing/save', 'verb' => 'POST'], + ['name' => 'Share#getPendingRequests', 'url' => '/api/v2/sharing/pending', 'verb' => 'GET'], + ['name' => 'Share#deleteShareRequest', 'url' => '/api/v2/sharing/decline/{share_request_id}', 'verb' => 'DELETE'], + ['name' => 'Share#getVaultItems', 'url' => '/api/v2/sharing/vault/{vault_guid}/get', 'verb' => 'GET'], + ['name' => 'Share#getVaultAclEntries', 'url' => '/api/v2/sharing/vault/{vault_guid}/acl', 'verb' => 'GET'], + ['name' => 'Share#createPublicShare', 'url' => '/api/v2/sharing/public', 'verb' => 'POST'], + ['name' => 'Share#getPublicCredentialData', 'url' => '/api/v2/sharing/credential/{credential_guid}/public', 'verb' => 'GET'], + ['name' => 'Share#unshareCredential', 'url' => '/api/v2/sharing/credential/{item_guid}', 'verb' => 'DELETE'], + ['name' => 'Share#unshareCredentialFromUser', 'url' => '/api/v2/sharing/credential/{item_guid}/{user_id}', 'verb' => 'DELETE'], + ['name' => 'Share#getRevisions', 'url' => '/api/v2/sharing/credential/{item_guid}/revisions', 'verb' => 'GET'], + ['name' => 'Share#getItemAcl', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'GET'], + ['name' => 'Share#uploadFile', 'url' => '/api/v2/sharing/credential/{item_guid}/file', 'verb' => 'POST'], + ['name' => 'Share#getFile', 'url' => '/api/v2/sharing/credential/{item_guid}/file/{file_guid}', 'verb' => 'GET'], + ['name' => 'Share#updateSharedCredentialACL', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'PATCH'], + ['name' => 'Share#updateSharedCredentialACLSharedKey', 'url' => '/api/v2/sharing/credential/{item_guid}/acl/shared_key', 'verb' => 'PATCH'], + ['name' => 'Internal#getAppVersion', 'url' => '/api/v2/version', 'verb' => 'GET'], //Settings - ['name' => 'settings#getSettings', 'url' => '/api/v2/settings', 'verb' => 'GET'], - ['name' => 'settings#saveUserSetting', 'url' => '/api/v2/settings/{key}/{value}', 'verb' => 'POST'], - ['name' => 'settings#saveAdminSetting', 'url' => '/api/v2/settings/{key}/{value}/admin1/admin2', 'verb' => 'POST'], + ['name' => 'Settings#getSettings', 'url' => '/api/v2/settings', 'verb' => 'GET'], + ['name' => 'Settings#saveUserSetting', 'url' => '/api/v2/settings/{key}/{value}', 'verb' => 'POST'], + ['name' => 'Settings#saveAdminSetting', 'url' => '/api/v2/settings/{key}/{value}/admin1/admin2', 'verb' => 'POST'], //Translations - ['name' => 'translation#getLanguageStrings', 'url' => '/api/v2/language', 'verb' => 'GET'], + ['name' => 'Translation#getLanguageStrings', 'url' => '/api/v2/language', 'verb' => 'GET'], #Icons - ['name' => 'icon#getSingleIcon', 'url' => '/api/v2/geticon/{base64Url}', 'verb' => 'GET'], - ['name' => 'icon#getIcon', 'url' => '/api/v2/icon/{base64Url}', 'verb' => 'GET'], - ['name' => 'icon#getIcon', 'url' => '/api/v2/icon/{base64Url}/{credentialId}', 'verb' => 'GET'], - ['name' => 'icon#getLocalIconList', 'url' => '/api/v2/icon/list', 'verb' => 'GET'], + ['name' => 'Icon#getSingleIcon', 'url' => '/api/v2/geticon/{base64Url}', 'verb' => 'GET'], + ['name' => 'Icon#getIcon', 'url' => '/api/v2/icon/{base64Url}', 'verb' => 'GET'], + ['name' => 'Icon#getIcon', 'url' => '/api/v2/icon/{base64Url}/{credentialId}', 'verb' => 'GET'], + ['name' => 'Icon#getLocalIconList', 'url' => '/api/v2/icon/list', 'verb' => 'GET'], // - ['name' => 'vault#preflighted_cors', 'url' => '/api/v2/{path}', 'verb' => 'OPTIONS', 'requirements' => array('path' => '.+')], + ['name' => 'Vault#preflighted_cors', 'url' => '/api/v2/{path}', 'verb' => 'OPTIONS', 'requirements' => array('path' => '.+')], //Internal API - ['name' => 'internal#remind', 'url' => '/api/internal/notifications/remind/{credential_id}', 'verb' => 'POST'], - ['name' => 'internal#read', 'url' => '/api/internal/notifications/read/{credential_id}', 'verb' => 'DELETE'], - ['name' => 'internal#getAppVersion', 'url' => '/api/internal/version', 'verb' => 'GET'], - ['name' => 'internal#generatePerson', 'url' => '/api/internal/generate_person', 'verb' => 'GET'], + ['name' => 'Internal#remind', 'url' => '/api/internal/notifications/remind/{credential_id}', 'verb' => 'POST'], + ['name' => 'Internal#read', 'url' => '/api/internal/notifications/read/{credential_id}', 'verb' => 'DELETE'], + ['name' => 'Internal#getAppVersion', 'url' => '/api/internal/version', 'verb' => 'GET'], + ['name' => 'Internal#generatePerson', 'url' => '/api/internal/generate_person', 'verb' => 'GET'], //Admin routes - ['name' => 'admin#searchUser', 'url' => '/admin/search', 'verb' => 'GET'], - ['name' => 'admin#moveCredentials', 'url' => '/admin/move', 'verb' => 'POST'], - ['name' => 'admin#requestDeletion', 'url' => '/admin/request-deletion/{vault_guid}', 'verb' => 'POST'], - ['name' => 'admin#deleteRequestDeletion', 'url' => '/admin/request-deletion/{vault_guid}', 'verb' => 'DELETE'], - ['name' => 'admin#listRequests', 'url' => '/admin/delete-requests', 'verb' => 'GET'], - ['name' => 'admin#acceptRequestDeletion', 'url' => '/admin/accept-delete-request', 'verb' => 'POST'], + ['name' => 'Admin#searchUser', 'url' => '/admin/search', 'verb' => 'GET'], + ['name' => 'Admin#moveCredentials', 'url' => '/admin/move', 'verb' => 'POST'], + ['name' => 'Admin#requestDeletion', 'url' => '/admin/request-deletion/{vault_guid}', 'verb' => 'POST'], + ['name' => 'Admin#deleteRequestDeletion', 'url' => '/admin/request-deletion/{vault_guid}', 'verb' => 'DELETE'], + ['name' => 'Admin#listRequests', 'url' => '/admin/delete-requests', 'verb' => 'GET'], + ['name' => 'Admin#acceptRequestDeletion', 'url' => '/admin/accept-delete-request', 'verb' => 'POST'], ] ]; diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index c97f78e5..02e2ab62 100644 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -25,7 +25,7 @@ namespace OCA\Passman\AppInfo; use OC\Files\View; use OC\ServerContainer; -use OCA\Passman\Controller\ShareController; +use OCA\Passman\controller\ShareController; use OCA\Passman\Middleware\APIMiddleware; use OCA\Passman\Middleware\ShareMiddleware; use OCA\Passman\Notifier; @@ -149,7 +149,7 @@ class Application extends App implements IBootstrap { 'id' => $c->getAppName(), 'order' => 10, 'name' => $c->get(IL10N::class)->t('Passwords'), - 'href' => $urlGenerator->linkToRoute('passman.page.index'), + 'href' => $urlGenerator->linkToRoute('passman.Page.index'), 'icon' => $urlGenerator->imagePath($c->getAppName(), 'app.svg'), ]; }; diff --git a/controller/AdminController.php b/lib/Controller/AdminController.php similarity index 99% rename from controller/AdminController.php rename to lib/Controller/AdminController.php index 2593fbf0..8376408d 100644 --- a/controller/AdminController.php +++ b/lib/Controller/AdminController.php @@ -9,21 +9,21 @@ * @copyright Sander Brand 2016 */ -namespace OCA\Passman\Controller; +namespace OCA\Passman\controller; use OCA\Passman\Db\Credential; use OCA\Passman\Db\CredentialRevision; use OCA\Passman\Db\DeleteVaultRequest; use OCA\Passman\Service\CredentialRevisionService; +use OCA\Passman\Service\CredentialService; use OCA\Passman\Service\DeleteVaultRequestService; use OCA\Passman\Service\FileService; use OCA\Passman\Service\VaultService; use OCA\Passman\Utility\Utils; +use OCP\AppFramework\ApiController; +use OCP\AppFramework\Http\JSONResponse; use OCP\IConfig; use OCP\IRequest; -use OCP\AppFramework\Http\JSONResponse; -use OCP\AppFramework\ApiController; -use OCA\Passman\Service\CredentialService; use OCP\IUserManager; diff --git a/controller/CredentialController.php b/lib/Controller/CredentialController.php similarity index 99% rename from controller/CredentialController.php rename to lib/Controller/CredentialController.php index 87c029c6..bb81937f 100644 --- a/controller/CredentialController.php +++ b/lib/Controller/CredentialController.php @@ -9,7 +9,7 @@ * @copyright Sander Brand 2016 */ -namespace OCA\Passman\Controller; +namespace OCA\Passman\controller; use OCA\Passman\Activity; use OCA\Passman\Db\Credential; diff --git a/controller/FileController.php b/lib/Controller/FileController.php similarity index 97% rename from controller/FileController.php rename to lib/Controller/FileController.php index af9b2911..9ffc469a 100644 --- a/controller/FileController.php +++ b/lib/Controller/FileController.php @@ -9,11 +9,10 @@ * @copyright Sander Brand 2016 */ -namespace OCA\Passman\Controller; +namespace OCA\Passman\controller; use OCA\Passman\Service\FileService; use OCP\AppFramework\ApiController; -use OCP\AppFramework\Db\DoesNotExistException; use OCP\AppFramework\Http\JSONResponse; use OCP\IRequest; use Psr\Log\LoggerInterface; diff --git a/controller/IconController.php b/lib/Controller/IconController.php similarity index 99% rename from controller/IconController.php rename to lib/Controller/IconController.php index 0bf9d221..66f0f786 100644 --- a/controller/IconController.php +++ b/lib/Controller/IconController.php @@ -9,7 +9,7 @@ * @copyright Sander Brand 2016 */ -namespace OCA\Passman\Controller; +namespace OCA\Passman\controller; use Doctrine\DBAL\Exception\DriverException; use OC\App\AppManager; diff --git a/controller/InternalController.php b/lib/Controller/InternalController.php similarity index 99% rename from controller/InternalController.php rename to lib/Controller/InternalController.php index 79c9cf26..110772e2 100644 --- a/controller/InternalController.php +++ b/lib/Controller/InternalController.php @@ -9,7 +9,7 @@ * @copyright Sander Brand 2016 */ -namespace OCA\Passman\Controller; +namespace OCA\Passman\controller; use OCA\Passman\Service\CredentialService; use OCP\App\IAppManager; diff --git a/controller/PageController.php b/lib/Controller/PageController.php similarity index 84% rename from controller/PageController.php rename to lib/Controller/PageController.php index 47d35a41..79eb9474 100644 --- a/controller/PageController.php +++ b/lib/Controller/PageController.php @@ -9,21 +9,16 @@ * @copyright Sander Brand 2016 */ -namespace OCA\Passman\Controller; +namespace OCA\Passman\controller; -use OCP\IRequest; -use OCP\AppFramework\Http\TemplateResponse; -use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Controller; +use OCP\AppFramework\Http\TemplateResponse; +use OCP\IRequest; class PageController extends Controller { - - private $userId; - - public function __construct($AppName, IRequest $request, $UserId){ + public function __construct(string $AppName, IRequest $request, private string $userId) { parent::__construct($AppName, $request); - $this->userId = $UserId; } /** @@ -46,7 +41,7 @@ class PageController extends Controller { * @NoAdminRequired * @NoCSRFRequired */ - public function bookmarklet($url='',$title='') { + public function bookmarklet($url='', $title='') { $params = array('url' => $url, 'title' => $title); return new TemplateResponse('passman', 'bookmarklet', $params); } @@ -60,4 +55,4 @@ class PageController extends Controller { return new TemplateResponse('passman', 'public_share'); } -} \ No newline at end of file +} diff --git a/controller/SettingsController.php b/lib/Controller/SettingsController.php similarity index 96% rename from controller/SettingsController.php rename to lib/Controller/SettingsController.php index 578fd512..eb4aa2b8 100644 --- a/controller/SettingsController.php +++ b/lib/Controller/SettingsController.php @@ -9,15 +9,14 @@ * @copyright Sander Brand 2016 */ -namespace OCA\Passman\Controller; +namespace OCA\Passman\controller; -use OCP\IL10N; -use OCP\Settings\ISettings; -use OCP\AppFramework\Http\TemplateResponse; -use OCP\AppFramework\Http\JSONResponse; -use OCP\AppFramework\ApiController; -use OCP\IRequest; use OCA\Passman\Service\SettingsService; +use OCP\AppFramework\ApiController; +use OCP\AppFramework\Http\JSONResponse; +use OCP\AppFramework\Http\TemplateResponse; +use OCP\IL10N; +use OCP\IRequest; class SettingsController extends ApiController { private $userId; @@ -98,4 +97,4 @@ class SettingsController extends ApiController { return new JSONResponse('OK'); } -} \ No newline at end of file +} diff --git a/controller/ShareController.php b/lib/Controller/ShareController.php similarity index 99% rename from controller/ShareController.php rename to lib/Controller/ShareController.php index a8a97401..813847ad 100644 --- a/controller/ShareController.php +++ b/lib/Controller/ShareController.php @@ -9,7 +9,7 @@ * @copyright Sander Brand 2016 */ -namespace OCA\Passman\Controller; +namespace OCA\Passman\controller; use OCA\Passman\Activity; use OCA\Passman\Db\File; diff --git a/controller/TranslationController.php b/lib/Controller/TranslationController.php similarity index 99% rename from controller/TranslationController.php rename to lib/Controller/TranslationController.php index 47a4fa4d..5791cfb8 100644 --- a/controller/TranslationController.php +++ b/lib/Controller/TranslationController.php @@ -9,12 +9,12 @@ * @copyright Sander Brand 2016 */ -namespace OCA\Passman\Controller; +namespace OCA\Passman\controller; -use OCP\IRequest; -use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\ApiController; +use OCP\AppFramework\Http\JSONResponse; use OCP\IL10N; +use OCP\IRequest; class TranslationController extends ApiController { private $trans; diff --git a/controller/VaultController.php b/lib/Controller/VaultController.php similarity index 98% rename from controller/VaultController.php rename to lib/Controller/VaultController.php index 1455efa0..681de8a8 100644 --- a/controller/VaultController.php +++ b/lib/Controller/VaultController.php @@ -9,7 +9,7 @@ * @copyright Sander Brand 2016 */ -namespace OCA\Passman\Controller; +namespace OCA\Passman\controller; use OCA\Passman\Db\Credential; use OCA\Passman\Service\CredentialService; @@ -19,7 +19,6 @@ use OCA\Passman\Service\SettingsService; use OCA\Passman\Service\VaultService; use OCA\Passman\Utility\NotFoundJSONResponse; use OCP\AppFramework\ApiController; -use OCP\AppFramework\Db\DoesNotExistException; use OCP\AppFramework\Http\JSONResponse; use OCP\IRequest; use Psr\Log\LoggerInterface; diff --git a/middleware/ShareMiddleware.php b/middleware/ShareMiddleware.php index 35553316..1235a00e 100644 --- a/middleware/ShareMiddleware.php +++ b/middleware/ShareMiddleware.php @@ -2,11 +2,11 @@ namespace OCA\Passman\Middleware; -use OCA\Passman\Controller\ShareController; +use OCA\Passman\controller\ShareController; use OCA\Passman\Service\SettingsService; -use OCP\AppFramework\Http\JSONResponse; -use \OCP\AppFramework\Middleware; use OCP\AppFramework\Http; +use OCP\AppFramework\Http\JSONResponse; +use OCP\AppFramework\Middleware; class ShareMiddleware extends Middleware { diff --git a/tests/unit/controller/FileControllerTest.php b/tests/unit/controller/FileControllerTest.php index 105d9faa..68ea0005 100644 --- a/tests/unit/controller/FileControllerTest.php +++ b/tests/unit/controller/FileControllerTest.php @@ -23,25 +23,15 @@ namespace OCA\Passman\Controller; -use OCA\Comments\Activity\Setting; -use OCA\Passman\Service\ActivityService; -use OCA\Passman\Service\CredentialService; use OCA\Passman\Service\FileService; -use OCA\Passman\Service\NotificationService; -use OCA\Passman\Service\SettingsService; -use OCA\Passman\Service\ShareService; -use OCA\Passman\Service\VaultService; -use OCP\IGroupManager; -use OCP\IUserManager; -use PHPUnit_Framework_TestCase; - use OCP\AppFramework\Http\JSONResponse; +use PHPUnit_Framework_TestCase; /** * Class FileControllerTest * * @package OCA\Passman\Controller - * @coversDefaultClass \OCA\Passman\Controller\FileController + * @coversDefaultClass \OCA\Passman\controller\FileController */ class FileControllerTest extends PHPUnit_Framework_TestCase { @@ -96,4 +86,4 @@ class FileControllerTest extends PHPUnit_Framework_TestCase { $this->controller->updateFile('6AD30804-BFFC-4EFC-97F8-20A126FA1709', '0' , '0.jpg'); $this->assertTrue(true); } -} \ No newline at end of file +} diff --git a/tests/unit/controller/InternalControllerTest.php b/tests/unit/controller/InternalControllerTest.php index eeeb13ab..025f0603 100644 --- a/tests/unit/controller/InternalControllerTest.php +++ b/tests/unit/controller/InternalControllerTest.php @@ -23,15 +23,14 @@ namespace OCA\Passman\Controller; -use PHPUnit_Framework_TestCase; - use OCP\AppFramework\Http\JSONResponse; +use PHPUnit_Framework_TestCase; /** * Class InternalControllerTest * * @package OCA\Passman\Controller - * @coversDefaultClass \OCA\Passman\Controller\InternalController + * @coversDefaultClass \OCA\Passman\controller\InternalController */ class InternalControllerTest extends PHPUnit_Framework_TestCase { @@ -97,4 +96,4 @@ class InternalControllerTest extends PHPUnit_Framework_TestCase { $this->assertTrue(true); } -} \ No newline at end of file +} diff --git a/tests/unit/controller/PageControllerTest.php b/tests/unit/controller/PageControllerTest.php index abda25e3..0e441d6a 100644 --- a/tests/unit/controller/PageControllerTest.php +++ b/tests/unit/controller/PageControllerTest.php @@ -23,15 +23,14 @@ namespace OCA\Passman\Controller; -use PHPUnit_Framework_TestCase; - use OCP\AppFramework\Http\TemplateResponse; +use PHPUnit_Framework_TestCase; /** * Class PageControllerTest * * @package OCA\Passman\Controller - * @coversDefaultClass \OCA\Passman\Controller\PageController + * @coversDefaultClass \OCA\Passman\controller\PageController */ class PageControllerTest extends PHPUnit_Framework_TestCase { @@ -74,4 +73,4 @@ class PageControllerTest extends PHPUnit_Framework_TestCase { $this->assertEquals('public_share', $result->getTemplateName()); $this->assertTrue($result instanceof TemplateResponse); } -} \ No newline at end of file +} diff --git a/tests/unit/controller/SettingsControllerTest.php b/tests/unit/controller/SettingsControllerTest.php index 0b280e83..88f3c6c1 100644 --- a/tests/unit/controller/SettingsControllerTest.php +++ b/tests/unit/controller/SettingsControllerTest.php @@ -23,17 +23,16 @@ namespace OCA\Passman\Controller; +use OCA\Passman\Service\SettingsService; use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\TemplateResponse; -use OCP\IConfig; use PHPUnit_Framework_TestCase; -use OCA\Passman\Service\SettingsService; /** * Class SettingsControllerTest * * @package OCA\Passman\Controller - * @coversDefaultClass \OCA\Passman\Controller\SettingsController + * @coversDefaultClass \OCA\Passman\controller\SettingsController */ class SettingsControllerTest extends PHPUnit_Framework_TestCase { @@ -97,4 +96,4 @@ class SettingsControllerTest extends PHPUnit_Framework_TestCase { $result = $this->controller->saveAdminSetting('admin', 'value'); $this->assertTrue($result instanceof JSONResponse); } -} \ No newline at end of file +} diff --git a/tests/unit/controller/TranslationControllerTest.php b/tests/unit/controller/TranslationControllerTest.php index 4a575266..1e6f5884 100644 --- a/tests/unit/controller/TranslationControllerTest.php +++ b/tests/unit/controller/TranslationControllerTest.php @@ -31,7 +31,7 @@ use PHPUnit_Framework_TestCase; * Class TranslationControllerTest * * @package OCA\Passman\Controller - * @coversDefaultClass \OCA\Passman\Controller\TranslationController + * @coversDefaultClass \OCA\Passman\controller\TranslationController */ class TranslationControllerTest extends PHPUnit_Framework_TestCase { @@ -53,4 +53,4 @@ class TranslationControllerTest extends PHPUnit_Framework_TestCase { $result = $this->controller->getLanguageStrings(null); $this->assertTrue($result instanceof JSONResponse); } -} \ No newline at end of file +} diff --git a/tests/unit/controller/VaultControllerTest.php b/tests/unit/controller/VaultControllerTest.php index 69a60a23..24e6e406 100644 --- a/tests/unit/controller/VaultControllerTest.php +++ b/tests/unit/controller/VaultControllerTest.php @@ -27,15 +27,14 @@ use OCA\Passman\Service\CredentialService; use OCA\Passman\Service\DeleteVaultRequestService; use OCA\Passman\Service\SettingsService; use OCA\Passman\Service\VaultService; -use PHPUnit_Framework_TestCase; - use OCP\AppFramework\Http\JSONResponse; +use PHPUnit_Framework_TestCase; /** * Class VaultControllerTest * * @package OCA\Passman\Controller - * @coversDefaultClass \OCA\Passman\Controller\VaultController + * @coversDefaultClass \OCA\Passman\controller\VaultController */ class VaultControllerTest extends PHPUnit_Framework_TestCase { @@ -110,4 +109,4 @@ class VaultControllerTest extends PHPUnit_Framework_TestCase { $result = $this->controller->delete(''); $this->assertTrue($result instanceof JSONResponse); } -} \ No newline at end of file +} From 3c5555c7f28be27daff384474a7c80aaf0b41595 Mon Sep 17 00:00:00 2001 From: binsky Date: Wed, 14 Jun 2023 14:12:49 +0200 Subject: [PATCH 05/11] fix controller namespace --- lib/AppInfo/Application.php | 2 +- lib/Controller/AdminController.php | 2 +- lib/Controller/CredentialController.php | 2 +- lib/Controller/FileController.php | 2 +- lib/Controller/IconController.php | 2 +- lib/Controller/InternalController.php | 2 +- lib/Controller/PageController.php | 2 +- lib/Controller/SettingsController.php | 2 +- lib/Controller/ShareController.php | 2 +- lib/Controller/TranslationController.php | 2 +- lib/Controller/VaultController.php | 2 +- middleware/ShareMiddleware.php | 2 +- tests/unit/controller/FileControllerTest.php | 2 +- tests/unit/controller/InternalControllerTest.php | 2 +- tests/unit/controller/PageControllerTest.php | 2 +- tests/unit/controller/SettingsControllerTest.php | 2 +- tests/unit/controller/TranslationControllerTest.php | 2 +- tests/unit/controller/VaultControllerTest.php | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index 02e2ab62..efdda954 100644 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -25,7 +25,7 @@ namespace OCA\Passman\AppInfo; use OC\Files\View; use OC\ServerContainer; -use OCA\Passman\controller\ShareController; +use OCA\Passman\Controller\ShareController; use OCA\Passman\Middleware\APIMiddleware; use OCA\Passman\Middleware\ShareMiddleware; use OCA\Passman\Notifier; diff --git a/lib/Controller/AdminController.php b/lib/Controller/AdminController.php index 8376408d..e6d450b7 100644 --- a/lib/Controller/AdminController.php +++ b/lib/Controller/AdminController.php @@ -9,7 +9,7 @@ * @copyright Sander Brand 2016 */ -namespace OCA\Passman\controller; +namespace OCA\Passman\Controller; use OCA\Passman\Db\Credential; use OCA\Passman\Db\CredentialRevision; diff --git a/lib/Controller/CredentialController.php b/lib/Controller/CredentialController.php index bb81937f..87c029c6 100644 --- a/lib/Controller/CredentialController.php +++ b/lib/Controller/CredentialController.php @@ -9,7 +9,7 @@ * @copyright Sander Brand 2016 */ -namespace OCA\Passman\controller; +namespace OCA\Passman\Controller; use OCA\Passman\Activity; use OCA\Passman\Db\Credential; diff --git a/lib/Controller/FileController.php b/lib/Controller/FileController.php index 9ffc469a..b5e55e76 100644 --- a/lib/Controller/FileController.php +++ b/lib/Controller/FileController.php @@ -9,7 +9,7 @@ * @copyright Sander Brand 2016 */ -namespace OCA\Passman\controller; +namespace OCA\Passman\Controller; use OCA\Passman\Service\FileService; use OCP\AppFramework\ApiController; diff --git a/lib/Controller/IconController.php b/lib/Controller/IconController.php index 66f0f786..0bf9d221 100644 --- a/lib/Controller/IconController.php +++ b/lib/Controller/IconController.php @@ -9,7 +9,7 @@ * @copyright Sander Brand 2016 */ -namespace OCA\Passman\controller; +namespace OCA\Passman\Controller; use Doctrine\DBAL\Exception\DriverException; use OC\App\AppManager; diff --git a/lib/Controller/InternalController.php b/lib/Controller/InternalController.php index 110772e2..79c9cf26 100644 --- a/lib/Controller/InternalController.php +++ b/lib/Controller/InternalController.php @@ -9,7 +9,7 @@ * @copyright Sander Brand 2016 */ -namespace OCA\Passman\controller; +namespace OCA\Passman\Controller; use OCA\Passman\Service\CredentialService; use OCP\App\IAppManager; diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php index 79eb9474..5e456ea3 100644 --- a/lib/Controller/PageController.php +++ b/lib/Controller/PageController.php @@ -9,7 +9,7 @@ * @copyright Sander Brand 2016 */ -namespace OCA\Passman\controller; +namespace OCA\Passman\Controller; use OCP\AppFramework\Controller; use OCP\AppFramework\Http\TemplateResponse; diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php index eb4aa2b8..875a105d 100644 --- a/lib/Controller/SettingsController.php +++ b/lib/Controller/SettingsController.php @@ -9,7 +9,7 @@ * @copyright Sander Brand 2016 */ -namespace OCA\Passman\controller; +namespace OCA\Passman\Controller; use OCA\Passman\Service\SettingsService; use OCP\AppFramework\ApiController; diff --git a/lib/Controller/ShareController.php b/lib/Controller/ShareController.php index 813847ad..a8a97401 100644 --- a/lib/Controller/ShareController.php +++ b/lib/Controller/ShareController.php @@ -9,7 +9,7 @@ * @copyright Sander Brand 2016 */ -namespace OCA\Passman\controller; +namespace OCA\Passman\Controller; use OCA\Passman\Activity; use OCA\Passman\Db\File; diff --git a/lib/Controller/TranslationController.php b/lib/Controller/TranslationController.php index 5791cfb8..ccdf5765 100644 --- a/lib/Controller/TranslationController.php +++ b/lib/Controller/TranslationController.php @@ -9,7 +9,7 @@ * @copyright Sander Brand 2016 */ -namespace OCA\Passman\controller; +namespace OCA\Passman\Controller; use OCP\AppFramework\ApiController; use OCP\AppFramework\Http\JSONResponse; diff --git a/lib/Controller/VaultController.php b/lib/Controller/VaultController.php index 681de8a8..77d1da18 100644 --- a/lib/Controller/VaultController.php +++ b/lib/Controller/VaultController.php @@ -9,7 +9,7 @@ * @copyright Sander Brand 2016 */ -namespace OCA\Passman\controller; +namespace OCA\Passman\Controller; use OCA\Passman\Db\Credential; use OCA\Passman\Service\CredentialService; diff --git a/middleware/ShareMiddleware.php b/middleware/ShareMiddleware.php index 1235a00e..d69aa5e8 100644 --- a/middleware/ShareMiddleware.php +++ b/middleware/ShareMiddleware.php @@ -2,7 +2,7 @@ namespace OCA\Passman\Middleware; -use OCA\Passman\controller\ShareController; +use OCA\Passman\Controller\ShareController; use OCA\Passman\Service\SettingsService; use OCP\AppFramework\Http; use OCP\AppFramework\Http\JSONResponse; diff --git a/tests/unit/controller/FileControllerTest.php b/tests/unit/controller/FileControllerTest.php index 68ea0005..c6946ed0 100644 --- a/tests/unit/controller/FileControllerTest.php +++ b/tests/unit/controller/FileControllerTest.php @@ -31,7 +31,7 @@ use PHPUnit_Framework_TestCase; * Class FileControllerTest * * @package OCA\Passman\Controller - * @coversDefaultClass \OCA\Passman\controller\FileController + * @coversDefaultClass \OCA\Passman\Controller\FileController */ class FileControllerTest extends PHPUnit_Framework_TestCase { diff --git a/tests/unit/controller/InternalControllerTest.php b/tests/unit/controller/InternalControllerTest.php index 025f0603..7f5ad49b 100644 --- a/tests/unit/controller/InternalControllerTest.php +++ b/tests/unit/controller/InternalControllerTest.php @@ -30,7 +30,7 @@ use PHPUnit_Framework_TestCase; * Class InternalControllerTest * * @package OCA\Passman\Controller - * @coversDefaultClass \OCA\Passman\controller\InternalController + * @coversDefaultClass \OCA\Passman\Controller\InternalController */ class InternalControllerTest extends PHPUnit_Framework_TestCase { diff --git a/tests/unit/controller/PageControllerTest.php b/tests/unit/controller/PageControllerTest.php index 0e441d6a..169d2142 100644 --- a/tests/unit/controller/PageControllerTest.php +++ b/tests/unit/controller/PageControllerTest.php @@ -30,7 +30,7 @@ use PHPUnit_Framework_TestCase; * Class PageControllerTest * * @package OCA\Passman\Controller - * @coversDefaultClass \OCA\Passman\controller\PageController + * @coversDefaultClass \OCA\Passman\Controller\PageController */ class PageControllerTest extends PHPUnit_Framework_TestCase { diff --git a/tests/unit/controller/SettingsControllerTest.php b/tests/unit/controller/SettingsControllerTest.php index 88f3c6c1..2b9b5af0 100644 --- a/tests/unit/controller/SettingsControllerTest.php +++ b/tests/unit/controller/SettingsControllerTest.php @@ -32,7 +32,7 @@ use PHPUnit_Framework_TestCase; * Class SettingsControllerTest * * @package OCA\Passman\Controller - * @coversDefaultClass \OCA\Passman\controller\SettingsController + * @coversDefaultClass \OCA\Passman\Controller\SettingsController */ class SettingsControllerTest extends PHPUnit_Framework_TestCase { diff --git a/tests/unit/controller/TranslationControllerTest.php b/tests/unit/controller/TranslationControllerTest.php index 1e6f5884..1a2f2175 100644 --- a/tests/unit/controller/TranslationControllerTest.php +++ b/tests/unit/controller/TranslationControllerTest.php @@ -31,7 +31,7 @@ use PHPUnit_Framework_TestCase; * Class TranslationControllerTest * * @package OCA\Passman\Controller - * @coversDefaultClass \OCA\Passman\controller\TranslationController + * @coversDefaultClass \OCA\Passman\Controller\TranslationController */ class TranslationControllerTest extends PHPUnit_Framework_TestCase { diff --git a/tests/unit/controller/VaultControllerTest.php b/tests/unit/controller/VaultControllerTest.php index 24e6e406..392e3ec1 100644 --- a/tests/unit/controller/VaultControllerTest.php +++ b/tests/unit/controller/VaultControllerTest.php @@ -34,7 +34,7 @@ use PHPUnit_Framework_TestCase; * Class VaultControllerTest * * @package OCA\Passman\Controller - * @coversDefaultClass \OCA\Passman\controller\VaultController + * @coversDefaultClass \OCA\Passman\Controller\VaultController */ class VaultControllerTest extends PHPUnit_Framework_TestCase { From 3a91a6b84b54c8b20ecb42b8c854f770b962a0d7 Mon Sep 17 00:00:00 2001 From: binsky Date: Thu, 15 Jun 2023 20:40:05 +0200 Subject: [PATCH 06/11] fix middleware location and namespace --- {middleware => lib/Middleware}/APIMiddleware.php | 6 ++++-- {middleware => lib/Middleware}/ShareMiddleware.php | 0 2 files changed, 4 insertions(+), 2 deletions(-) rename {middleware => lib/Middleware}/APIMiddleware.php (82%) rename {middleware => lib/Middleware}/ShareMiddleware.php (100%) diff --git a/middleware/APIMiddleware.php b/lib/Middleware/APIMiddleware.php similarity index 82% rename from middleware/APIMiddleware.php rename to lib/Middleware/APIMiddleware.php index 12deaecd..d099868f 100644 --- a/middleware/APIMiddleware.php +++ b/lib/Middleware/APIMiddleware.php @@ -4,7 +4,7 @@ namespace OCA\Passman\Middleware; use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\Response; -use \OCP\AppFramework\Middleware; +use OCP\AppFramework\Middleware; use OCP\IRequest; class APIMiddleware extends Middleware { @@ -19,7 +19,9 @@ class APIMiddleware extends Middleware { if($response instanceof JSONResponse){ if(isset($this->request->server['HTTP_ORIGIN'])) { $response->addHeader('Access-Control-Allow-Origin', $this->request->server['HTTP_ORIGIN']); - } + } else { + $response->addHeader('Access-Control-Allow-Origin', '*'); + } } return parent::afterController($controller, $methodName, $response); } diff --git a/middleware/ShareMiddleware.php b/lib/Middleware/ShareMiddleware.php similarity index 100% rename from middleware/ShareMiddleware.php rename to lib/Middleware/ShareMiddleware.php From 54cfa4a1b55e4990760e11ebee4f6e2e894742f8 Mon Sep 17 00:00:00 2001 From: binsky Date: Thu, 15 Jun 2023 20:40:49 +0200 Subject: [PATCH 07/11] move navigation entry logic from Application.php to info.xml --- appinfo/info.xml | 8 ++++++++ lib/AppInfo/Application.php | 28 +--------------------------- 2 files changed, 9 insertions(+), 27 deletions(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index a48758db..946f6c76 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -55,6 +55,14 @@ For an demo of this app visit [https://demo.passman.cc](https://demo.passman.cc) + + + Passwords + passman.Page.index + 10 + + + OCA\Passman\Settings\Admin diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index efdda954..ce0697dd 100644 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -46,9 +46,6 @@ use OCP\AppFramework\Bootstrap\IBootstrap; use OCP\AppFramework\Bootstrap\IRegistrationContext; use OCP\IDBConnection; use OCP\IGroupManager; -use OCP\IL10N; -use OCP\INavigationManager; -use OCP\IURLGenerator; use OCP\IUserManager; use OCP\IUserSession; use OCP\Notification\IManager; @@ -127,32 +124,9 @@ class Application extends App implements IBootstrap { public function boot(IBootContext $context): void { /** @var IManager $manager */ - $manager = $context->getAppContainer()->get(IManager::class); + $manager = $context->getAppContainer()->query(IManager::class); $manager->registerNotifierService(Notifier::class); Util::addTranslations(self::APP_ID); - $this->registerNavigationEntry(); - } - - /** - * Register the navigation entry - */ - public function registerNavigationEntry() { - $c = $this->getContainer(); - /** @var INavigationManager $navigationManager */ - $navigationManager = $c->get(INavigationManager::class); - - $navigationEntry = function () use ($c) { - /** @var IURLGenerator $urlGenerator */ - $urlGenerator = $c->get(IURLGenerator::class); - return [ - 'id' => $c->getAppName(), - 'order' => 10, - 'name' => $c->get(IL10N::class)->t('Passwords'), - 'href' => $urlGenerator->linkToRoute('passman.Page.index'), - 'icon' => $urlGenerator->imagePath($c->getAppName(), 'app.svg'), - ]; - }; - $navigationManager->add($navigationEntry); } } From c0f596460d59560e5f136a1fd1d2a656eae50e27 Mon Sep 17 00:00:00 2001 From: binsky Date: Thu, 15 Jun 2023 20:42:30 +0200 Subject: [PATCH 08/11] update deprecated code routing and file loading code --- lib/Controller/PageController.php | 15 ++- lib/Search/Provider.php | 2 +- templates/main.php | 214 +++++++++++++++--------------- 3 files changed, 117 insertions(+), 114 deletions(-) diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php index 5e456ea3..6bb41d40 100644 --- a/lib/Controller/PageController.php +++ b/lib/Controller/PageController.php @@ -11,15 +11,17 @@ namespace OCA\Passman\Controller; +use OCA\Passman\AppInfo\Application; use OCP\AppFramework\Controller; use OCP\AppFramework\Http\TemplateResponse; use OCP\IRequest; +use OCP\Util; class PageController extends Controller { - public function __construct(string $AppName, IRequest $request, private string $userId) { - parent::__construct($AppName, $request); - } + public function __construct(IRequest $request) { + parent::__construct(Application::APP_ID, $request); + } /** * CAUTION: the @Stuff turns off security checks; for this page no admin is @@ -32,8 +34,7 @@ class PageController extends Controller { * @NoCSRFRequired */ public function index() { - $params = ['user' => $this->userId]; - return new TemplateResponse('passman', 'main', $params); // templates/main.php + return new TemplateResponse($this->appName, 'main'); // templates/main.php } @@ -43,7 +44,7 @@ class PageController extends Controller { */ public function bookmarklet($url='', $title='') { $params = array('url' => $url, 'title' => $title); - return new TemplateResponse('passman', 'bookmarklet', $params); + return new TemplateResponse($this->appName, 'bookmarklet', $params); } /** @@ -52,7 +53,7 @@ class PageController extends Controller { * @PublicPage */ public function publicSharePage() { - return new TemplateResponse('passman', 'public_share'); + return new TemplateResponse($this->appName, 'public_share'); } } diff --git a/lib/Search/Provider.php b/lib/Search/Provider.php index 45c13151..de98c4bc 100644 --- a/lib/Search/Provider.php +++ b/lib/Search/Provider.php @@ -90,7 +90,7 @@ class Provider implements IProvider { $this->urlGenerator->imagePath(Application::APP_ID, 'app.svg'), $Credential->getLabel(), \sprintf("Part of Passman vault %s", $Vault->getName()), - $this->urlGenerator->linkToRoute('passman.page.index') . "#/vault/" . $Vault->getGuid() . "?show=" . $Credential->getGuid() + $this->urlGenerator->linkToRoute('passman.Page.index') . "#/vault/" . $Vault->getGuid() . "?show=" . $Credential->getGuid() ); } catch (\Exception $e) { } diff --git a/templates/main.php b/templates/main.php index 09a05723..7ae345c8 100644 --- a/templates/main.php +++ b/templates/main.php @@ -1,122 +1,124 @@ @@ -137,7 +139,7 @@ style('passman', 'app'); {{ 'navigation.tags' | translate }} diff --git a/templates/views/edit_credential.html b/templates/views/edit_credential.html index ad508df9..715b971f 100644 --- a/templates/views/edit_credential.html +++ b/templates/views/edit_credential.html @@ -1,19 +1,19 @@ diff --git a/templates/views/settings.html b/templates/views/settings.html index ea0dae1a..7f96940e 100644 --- a/templates/views/settings.html +++ b/templates/views/settings.html @@ -1,17 +1,17 @@ diff --git a/templates/views/share_credential.html b/templates/views/share_credential.html index f9c2345c..89df856d 100644 --- a/templates/views/share_credential.html +++ b/templates/views/share_credential.html @@ -1,19 +1,19 @@
diff --git a/templates/views/show_vault.html b/templates/views/show_vault.html index 29fda64f..9ed8bc95 100644 --- a/templates/views/show_vault.html +++ b/templates/views/show_vault.html @@ -1,15 +1,15 @@
-
-
+
-
+ +
  • {{active_vault.name}} -
    • -
    + +
    From 28640015811634e2ad9411075c3ac1817edad94b Mon Sep 17 00:00:00 2001 From: binsky Date: Tue, 20 Jun 2023 00:28:11 +0200 Subject: [PATCH 10/11] fix migration namespace --- {migration => lib/Migration}/ServerSideEncryption.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {migration => lib/Migration}/ServerSideEncryption.php (100%) diff --git a/migration/ServerSideEncryption.php b/lib/Migration/ServerSideEncryption.php similarity index 100% rename from migration/ServerSideEncryption.php rename to lib/Migration/ServerSideEncryption.php From a1a695c36fe2f47faf23c8bdfdfa7bc0be682ccd Mon Sep 17 00:00:00 2001 From: binsky Date: Sat, 24 Jun 2023 13:24:20 +0200 Subject: [PATCH 11/11] revert Util::addScript usage in template main.php due missed custom replacement logic during grunt build --- templates/main.php | 210 ++++++++++++++++++++++----------------------- 1 file changed, 104 insertions(+), 106 deletions(-) diff --git a/templates/main.php b/templates/main.php index 7ae345c8..1c2a4ac9 100644 --- a/templates/main.php +++ b/templates/main.php @@ -1,124 +1,122 @@