Skip to content

feat!: migrate Template return types to ITemplate #746

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.

Sign up for GitHub

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

Closed
st3iny wants to merge 2 commits into from
Closed

feat!: migrate Template return types to ITemplate #746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b07724
feat!: migrate Template return types to ITemplate
st3iny Mar 21, 2025
6cdbd42
feat!: drop support for nextcloud 31 and below
st3iny Mar 21, 2025
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
17 changes: 4 additions & 13 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@ jobs:
strategy:
matrix:
php-version: ['8.1', '8.2', '8.3', '8.4']
nextcloud-version: ['master', 'stable31', 'stable30']
exclude:
- php-version: '8.4'
nextcloud-version: 'stable30'
nextcloud-version: ['master']
name: Nextcloud ${{ matrix.nextcloud-version }} php${{ matrix.php-version }} unit tests
steps:
- name: Set up Nextcloud env
Expand Down Expand Up @@ -51,14 +48,11 @@ jobs:
- php-version: '8.1'
nextcloud-version: master
db: 'oci'
- php-version: '8.1'
- php-version: '8.2'
nextcloud-version: master
db: 'pgsql'
- php-version: '8.3'
nextcloud-version: stable31
db: 'mysql'
- php-version: '8.2'
nextcloud-version: stable30
nextcloud-version: master
db: 'mysql'
name: Nextcloud ${{ matrix.nextcloud-version }} php${{ matrix.php-version }}-${{ matrix.db }} integration tests
services:
Expand Down Expand Up @@ -152,11 +146,8 @@ jobs:
strategy:
matrix:
php-version: [ '8.1', '8.2', '8.3', '8.4' ]
nextcloud-version: [ 'master', 'stable31', 'stable30' ]
nextcloud-version: [ 'master' ]
node-version: [ '20' ]
exclude:
- php-version: '8.4'
nextcloud-version: 'stable30'
steps:
- name: Set up Nextcloud env
uses: ChristophWurst/setup-nextcloud@fc0790385c175d97e88a7cb0933490de6e990374 # v0.3.2
Expand Down
4 changes: 2 additions & 2 deletions appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<name>Two-Factor WebAuthn</name>
<summary>WebAuthn two-factor provider</summary>
<description>A two-factor provider for WebAuthn devices</description>
<version>2.2.0-dev.0</version>
<version>3.0.0-dev.0</version>
<licence>agpl</licence>
<author>Christoph Wurst</author>
<author>Michael Blumenstein</author>
Expand All @@ -25,7 +25,7 @@
<dependencies>
<php min-version="8.1" max-version="8.4"/>
<lib>gmp</lib>
<nextcloud min-version="30" max-version="32" />
<nextcloud min-version="32" max-version="32" />
</dependencies>

<repair-steps>
Expand Down
7 changes: 2 additions & 5 deletions lib/Provider/WebAuthnLoginProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,10 @@
use OCA\TwoFactorWebauthn\AppInfo\Application;
use OCP\Authentication\TwoFactorAuth\ILoginSetupProvider;
use OCP\Template;
use OCP\Template\ITemplate;

class WebAuthnLoginProvider implements ILoginSetupProvider {

/**
* @return Template
*/
public function getBody(): Template {
public function getBody(): ITemplate {
return new Template(Application::APP_ID, 'login-setup');
}
}
3 changes: 2 additions & 1 deletion lib/Provider/WebAuthnProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
use OCP\IURLGenerator;
use OCP\IUser;
use OCP\Template;
use OCP\Template\ITemplate;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\ContainerInterface;
use Psr\Container\NotFoundExceptionInterface;
Expand Down Expand Up @@ -87,7 +88,7 @@ public function getDescription(): string {
/**
* Get the template for rending the 2FA provider view
*/
public function getTemplate(IUser $user): Template {
public function getTemplate(IUser $user): ITemplate {
$publicKey = $this->manager->startAuthenticate($user, $this->request->getServerHost());
$this->initialState->provideInitialState('credential-request-options', $publicKey);
return new Template('twofactor_webauthn', 'challenge');
Expand Down
3 changes: 2 additions & 1 deletion lib/Settings/Personal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@

use OCP\Authentication\TwoFactorAuth\IPersonalProviderSettings;
use OCP\Template;
use OCP\Template\ITemplate;

class Personal implements IPersonalProviderSettings {
public function getBody(): Template {
public function getBody(): ITemplate {
return new Template('twofactor_webauthn', 'personal');
}
}
Loading