Skip to content

[stable25] app type extended_authentication #37690

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

Merged
blizzz merged 1 commit into from
Apr 12, 2023
Merged

[stable25] app type extended_authentication #37690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
app type extended_authentication 
Signed-off-by: Maxence Lange <[email protected]>
  • Loading branch information
@ArtificialOwl @backportbot-nextcloud
ArtificialOwl authored and backportbot-nextcloud[bot] committed Apr 12, 2023
commit 20a45eb8df68196bc771b01c3b6d43ed24b46a69
1 change: 1 addition & 0 deletions lib/base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1018,6 +1018,7 @@ public static function handleRequest() {

// Always load authentication apps
OC_App::loadApps(['authentication']);
OC_App::loadApps(['extended_authentication']);

// Load minimum set of apps
if (!\OCP\Util::needUpgrade()
Expand Down
2 changes: 1 addition & 1 deletion lib/private/Updater.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ protected function doCoreUpgrade(): void {
*/
protected function doAppUpgrade(): void {
$apps = \OC_App::getEnabledApps();
$priorityTypes = ['authentication', 'filesystem', 'logging'];
$priorityTypes = ['authentication', 'extended_authentication', 'filesystem', 'logging'];
$pseudoOtherType = 'other';
$stacks = [$pseudoOtherType => []];

Expand Down
1 change: 1 addition & 0 deletions ocs/v1.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
try {
OC_App::loadApps(['session']);
OC_App::loadApps(['authentication']);
OC_App::loadApps(['extended_authentication']);

// load all apps to get all api routes properly setup
// FIXME: this should ideally appear after handleLogin but will cause
Expand Down
1 change: 1 addition & 0 deletions public.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
// Load all required applications
\OC::$REQUESTEDAPP = $app;
OC_App::loadApps(['authentication']);
OC_App::loadApps(['extended_authentication']);
OC_App::loadApps(['filesystem', 'logging']);

if (!\OC::$server->getAppManager()->isInstalled($app)) {
Expand Down
1 change: 1 addition & 0 deletions remote.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ function resolveService($service) {
// Load all required applications
\OC::$REQUESTEDAPP = $app;
OC_App::loadApps(['authentication']);
OC_App::loadApps(['extended_authentication']);
OC_App::loadApps(['filesystem', 'logging']);

switch ($app) {
Expand Down
1 change: 1 addition & 0 deletions resources/app-info-shipped.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,7 @@
<xs:element name="prelogin" minOccurs="0" maxOccurs="1"/>
<xs:element name="filesystem" minOccurs="0" maxOccurs="1"/>
<xs:element name="authentication" minOccurs="0" maxOccurs="1"/>
<xs:element name="extended_authentication" minOccurs="0" maxOccurs="1"/>
<xs:element name="logging" minOccurs="0" maxOccurs="1"/>
<xs:element name="dav" minOccurs="0" maxOccurs="1"/>
<xs:element name="prevent_group_restriction" minOccurs="0"
Expand Down
1 change: 1 addition & 0 deletions resources/app-info.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@
<xs:element name="prelogin" minOccurs="0" maxOccurs="1"/>
<xs:element name="filesystem" minOccurs="0" maxOccurs="1"/>
<xs:element name="authentication" minOccurs="0" maxOccurs="1"/>
<xs:element name="extended_authentication" minOccurs="0" maxOccurs="1"/>
<xs:element name="logging" minOccurs="0" maxOccurs="1"/>
<xs:element name="dav" minOccurs="0" maxOccurs="1"/>
<xs:element name="prevent_group_restriction" minOccurs="0"
Expand Down