Skip to content

Commit

Permalink
Merge pull request #7372 from nextcloud/feature/7336/JWT-for-HPB-auth…
Browse files Browse the repository at this point in the history
…entication

Require firebase JWT lib
  • Loading branch information
nickvergessen authored Jun 14, 2022
2 parents 2f16ea5 + f0edd9c commit 3ea410d
Show file tree
Hide file tree
Showing 4 changed files with 84 additions and 7 deletions.
18 changes: 13 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,22 @@ package_name=$(app_name)
cert_dir=$(HOME)/.nextcloud/certificates
version+=master

all: dev-setup build-js-production
all: dev-setup build-production

dev-setup: clean-dev npm-init

dependabot: dev-setup npm-update build-js-production
dev-setup: clean-dev composer-install-dev npm-init

release: appstore create-tag

build-dev: composer-install-dev build-js

build-production: composer-install-production build-js-production

composer-install-dev:
composer install

composer-install-production:
composer install --no-dev

build-js:
npm run dev

Expand Down Expand Up @@ -49,6 +57,7 @@ clean:

clean-dev: clean
rm -rf node_modules
rm -rf vendor

create-tag:
git tag -a v$(version) -m "Tagging the $(version) release."
Expand Down Expand Up @@ -89,7 +98,6 @@ appstore:
--exclude=stylelint.config.js \
--exclude=.tx \
--exclude=tests \
--exclude=vendor \
--exclude=webpack.js \
$(project_dir)/ $(sign_dir)/$(app_name)
@if [ -f $(cert_dir)/$(app_name).key ]; then \
Expand Down
3 changes: 3 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,8 @@
"vimeo/psalm": "^4.22",
"christophwurst/nextcloud": "dev-master",
"phpunit/phpunit": "^9.5"
},
"require": {
"firebase/php-jwt": "^6.2"
}
}
67 changes: 65 additions & 2 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions lib/AppInfo/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@ public function __construct(array $urlParams = []) {
}

public function register(IRegistrationContext $context): void {
// Register the composer autoloader for packages shipped by this app
include_once __DIR__ . '/../../vendor/autoload.php';

$context->registerMiddleWare(CanUseTalkMiddleware::class);
$context->registerMiddleWare(InjectionMiddleware::class);
$context->registerCapability(Capabilities::class);
Expand Down

0 comments on commit 3ea410d

Please sign in to comment.