Apply suggestions from code review

Co-authored-by: Joas Schilling <[email protected]>
Signed-off-by: S1m <[email protected]>

Author: p1gp1g

lib/Controller/WebPushController.php

@@ -104,7 +104,7 @@ public function registerWP(string $endpoint, string $uaPublicKey, string $auth,
 		if (
 			!filter_var($endpoint, FILTER_VALIDATE_URL)
 			|| \strlen($endpoint) > 765
-			|| !preg_match('/^https\:\/\//', $endpoint)
+			|| !str_starts_with($endpoint, 'https://')
 		) {
 			return new DataResponse(['message' => 'INVALID_ENDPOINT'], Http::STATUS_BAD_REQUEST);
 		}
@@ -233,7 +233,7 @@ protected function saveSubscription(IUser $user, IToken $token, string $endpoint
 		$result->closeCursor();
 
 		if (!$row) {
-			// In case the user has already a subscription, but inactive or with a different enpoint, pubkey or auth secret
+			// In case the user has already a subscription, but inactive or with a different endpoint, pubkey or auth secret
 			$this->deleteSubscription($user, $token);
 			$activationToken = Uuid::v4()->toRfc4122();
 			if ($this->insertSubscription($user, $token, $endpoint, $uaPublicKey, $auth, $activationToken, $appTypes)) {

lib/Migration/Version6000Date20251112110000.php

@@ -17,13 +17,9 @@
 use OCP\Migration\SimpleMigrationStep;
 
 /**
- * Recreate notifications_pushtoken(s) with a primary key for cluster support
+ * Create database table to webpush support
  */
 class Version6000Date20251112110000 extends SimpleMigrationStep {
-	public function __construct(
-		protected IDBConnection $connection,
-	) {
-	}
 
 	/**
 	 * @param IOutput $output
@@ -38,7 +34,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 
 		if (!$schema->hasTable('notifications_webpush')) {
 			$table = $schema->createTable('notifications_webpush');
-			$table->addColumn('id', Types::INTEGER, [
+			$table->addColumn('id', Types::BIGINT, [
 				'autoincrement' => true,
 				'notnull' => true,
 				'length' => 4,
@@ -48,9 +44,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 				'notnull' => true,
 				'length' => 64,
 			]);
-			$table->addColumn('token', Types::INTEGER, [
-				'notnull' => true,
-				'length' => 4,
+			$table->addColumn('token', Types::BIGINT, [
 				'default' => 0,
 			]);
 			$table->addColumn('endpoint', Types::STRING, [
@@ -80,10 +74,11 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 
 			$table->setPrimaryKey(['id']);
 			// Allow a single push subscription per device
-			$table->addUniqueIndex(['uid', 'token'], 'oc_npushwp_uid');
+			$table->addUniqueIndex(['uid', 'token'], 'notifwebpush_uid_token');
 			// If the push endpoint is removed, we will delete the row based on the endpoint
-			$table->addIndex(['endpoint'], 'oc_npushwp_endpoint');
+			$table->addIndex(['endpoint'], 'notifwebpush_endpoint');
+			return $schema;
 		}
-		return $schema;
+		return null;
 	}
 }