Merge pull request #23095 from nextcloud/backport/23043/stable20

[stable20] Avoid crash when unauthenticated users make weather-related requests

apps/weather_status/lib/Controller/WeatherStatusController.php

@@ -46,7 +46,7 @@ class WeatherStatusController extends OCSController {
 								IRequest $request,
 								ILogger $logger,
 								WeatherStatusService $service,
-								string $userId) {
+								?string $userId) {
 		parent::__construct($appName, $request);
 		$this->userId = $userId;
 		$this->logger = $logger;

apps/weather_status/lib/Service/WeatherStatusService.php

@@ -105,7 +105,7 @@ class WeatherStatusService {
 								IUserManager $userManager,
 								IAppManager $appManager,
 								ICacheFactory $cacheFactory,
-								string $userId) {
+								?string $userId) {
 		$this->config = $config;
 		$this->userId = $userId;
 		$this->l10n = $l10n;

apps/weather_status/src/App.vue

@@ -240,7 +240,11 @@ export default {
 					console.info('The weather status request was cancelled because the user navigates.')
 					return
 				}
+				if (err.response && err.response.status === 401) {
+					showError(t('weather_status', 'You are not logged in.'))
+				} else {
 					showError(t('weather_status', 'There was an error getting the weather status information.'))
+				}
 				console.error(err)
 			}
 		},
@@ -309,8 +313,11 @@ export default {
 					this.loading = false
 				}
 			} catch (err) {
+				if (err.response && err.response.status === 401) {
+					showError(t('weather_status', 'You are not logged in.'))
+				} else {
 					showError(t('weather_status', 'There was an error setting the location address.'))
-				console.debug(err)
+				}
 				this.loading = false
 			}
 		},
@@ -320,7 +327,11 @@ export default {
 				this.address = loc.address
 				this.startLoop()
 			} catch (err) {
+				if (err.response && err.response.status === 401) {
+					showError(t('weather_status', 'You are not logged in.'))
+				} else {
 					showError(t('weather_status', 'There was an error setting the location.'))
+				}
 				console.debug(err)
 			}
 		},
@@ -328,7 +339,11 @@ export default {
 			try {
 				await network.setMode(mode)
 			} catch (err) {
+				if (err.response && err.response.status === 401) {
+					showError(t('weather_status', 'You are not logged in.'))
+				} else {
 					showError(t('weather_status', 'There was an error saving the mode.'))
+				}
 				console.debug(err)
 			}
 		},
@@ -345,7 +360,11 @@ export default {
 				this.mode = MODE_MANUAL_LOCATION
 				this.startLoop()
 			} catch (err) {
+				if (err.response && err.response.status === 401) {
+					showError(t('weather_status', 'You are not logged in.'))
+				} else {
 					showError(t('weather_status', 'There was an error using personal address.'))
+				}
 				console.debug(err)
 				this.loading = false
 			}