Merge pull request #42459 from nextcloud/fix/dav/fallback-realm

skjnldsv · web-flow · commit db9fd9439e92 · 2024-02-23T19:42:41.000+01:00
diff --git a/apps/dav/lib/Connector/LegacyPublicAuth.php b/apps/dav/lib/Connector/LegacyPublicAuth.php
@@ -63,7 +63,7 @@ public function __construct(IRequest $request,
 
 		// setup realm
 		$defaults = new \OCP\Defaults();
-		$this->realm = $defaults->getName();
+		$this->realm = $defaults->getName() ?: 'Nextcloud';
 	}
 
 	/**
diff --git a/apps/dav/lib/Connector/Sabre/Auth.php b/apps/dav/lib/Connector/Sabre/Auth.php
@@ -75,7 +75,7 @@ public function __construct(ISession $session,
 
 		// setup realm
 		$defaults = new \OCP\Defaults();
-		$this->realm = $defaults->getName();
+		$this->realm = $defaults->getName() ?: 'Nextcloud';
 	}
 
 	/**
diff --git a/apps/dav/lib/Connector/Sabre/BearerAuth.php b/apps/dav/lib/Connector/Sabre/BearerAuth.php
@@ -47,7 +47,7 @@ public function __construct(IUserSession $userSession,
 
 		// setup realm
 		$defaults = new \OCP\Defaults();
-		$this->realm = $defaults->getName();
+		$this->realm = $defaults->getName() ?: 'Nextcloud';
 	}
 
 	private function setupUserFs($userId) {

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function __construct(IRequest $request,`
`63`	`63`
`64`	`64`	`// setup realm`
`65`	`65`	`$defaults = new \OCP\Defaults();`
`66`		`- $this->realm = $defaults->getName();`
	`66`	`+ $this->realm = $defaults->getName() ?: 'Nextcloud';`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public function __construct(ISession $session,`
`75`	`75`
`76`	`76`	`// setup realm`
`77`	`77`	`$defaults = new \OCP\Defaults();`
`78`		`- $this->realm = $defaults->getName();`
	`78`	`+ $this->realm = $defaults->getName() ?: 'Nextcloud';`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function __construct(IUserSession $userSession,`
`47`	`47`
`48`	`48`	`// setup realm`
`49`	`49`	`$defaults = new \OCP\Defaults();`
`50`		`- $this->realm = $defaults->getName();`
	`50`	`+ $this->realm = $defaults->getName() ?: 'Nextcloud';`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`private function setupUserFs($userId) {`