[stable27] fix: show ToS on non-files public pages (calendar/collectives/talk), Files on Nextcloud 31 and Login-flow

lib/AppInfo/Application.php

@@ -103,6 +103,39 @@ public function registerFrontend(IRequest $request, IConfig $config, IUserSessio
 				Util::addScript('terms_of_service', 'terms_of_service-public');
 			}
 		}
+
+		// Skip login-related pages
+		// TODO: Add a universal way to specify skipped pages instead of hardcoding
+		$skipPatterns = [
+			// Login
+			'#^/login$#',
+			// Login Flow Grant must have the terms of service
+			// so that the user can accept them before using the app
+			// TODO: add a checkbox on the login instead, like on the Registration app
+			'#^/login/(?!flow/grant|v2/grant)#',
+			// SAML
+			'#^/apps/user_saml/saml$#',
+			'#^/apps/user_saml/saml/#',
+			// user_oidc
+			'#^/apps/user_oidc/code$#',
+			'#^/apps/user_oidc/sls$#',
+			'#^/apps/user_oidc/id4me$#',
+			'#^/apps/user_oidc/id4me/code$#',
+			// registration
+			'#^/apps/registration(?:$|/)#',
+		];
+		if (array_filter($skipPatterns, fn($pattern) => preg_match($pattern, $request->getPathInfo()))) {
+			return;
+		}
+
+		if ($userSession->getUser() instanceof IUser) {
+			// Logged-in user
+			Util::addScript('terms_of_service', 'terms_of_service-user');
+		} else if ($config->getAppValue(self::APPNAME, 'tos_on_public_shares', '0') === '1') {
+			// Guests on public pages
+			Util::addScript('terms_of_service', 'terms_of_service-public');
+		}
+
 	}
 
 	public function addStorageWrapper(): void {

package.json

@@ -15,6 +15,7 @@
 		"stylelint:fix": "stylelint **/*.css **/*.scss **/*.vue --fix"
 	},
 	"dependencies": {
+		"@nextcloud/auth": "^2.4.0",
 		"@nextcloud/axios": "^2.3.0",
 		"@nextcloud/dialogs": "^4.2.0",
 		"@nextcloud/router": "^2.1.1",

src/public.js

@@ -24,17 +24,18 @@
  */
 
 import Vue from 'vue'
+import { getCurrentUser } from '@nextcloud/auth'
 import UserApp from './UserApp.vue'
 
 Vue.prototype.t = t
 Vue.prototype.n = n
 Vue.prototype.OC = OC
 Vue.prototype.OCA = OCA
 
-const hasToken = (document.getElementById('sharingToken') !== null)
+const isNotLoggedIn = getCurrentUser() === null
 const isPasswordProtected = (document.getElementById('password-submit') !== null)
 
-if (hasToken && !isPasswordProtected) {
+if (isNotLoggedIn && !isPasswordProtected) {
 	const tofc = document.createElement('div')
 	tofc.id = 'terms_of_service_confirm'
 	document.body.insertAdjacentElement('afterbegin', tofc)