Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Require firebase JWT lib #7372

Merged
merged 1 commit into from
Jun 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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