From 28dae575880e86ca08e18e9fefbfef15a862c4b0 Mon Sep 17 00:00:00 2001 From: jld3103 Date: Sun, 26 Mar 2023 14:55:50 +0200 Subject: [PATCH] Update nextcloud uppush to 1.3.0 --- external/nextcloud-uppush | 2 +- .../nextcloud/lib/src/nextcloud.openapi.dart | 16 +++++++++------- .../nextcloud/lib/src/nextcloud.openapi.json | 15 ++++++++------- specs/uppush.json | 19 ++++++++++--------- tool/Dockerfile.dev | 2 +- 5 files changed, 29 insertions(+), 25 deletions(-) diff --git a/external/nextcloud-uppush b/external/nextcloud-uppush index ea2264cc..7f69d28c 160000 --- a/external/nextcloud-uppush +++ b/external/nextcloud-uppush @@ -1 +1 @@ -Subproject commit ea2264cc05443f295a662030ad13c4a40c744eb9 +Subproject commit 7f69d28c46476e71c9c19ec7ecf8571ac537f560 diff --git a/packages/nextcloud/lib/src/nextcloud.openapi.dart b/packages/nextcloud/lib/src/nextcloud.openapi.dart index 22fe9c91..85305639 100644 --- a/packages/nextcloud/lib/src/nextcloud.openapi.dart +++ b/packages/nextcloud/lib/src/nextcloud.openapi.dart @@ -1268,7 +1268,9 @@ class NextcloudUnifiedPushProviderClient { throw NextcloudApiException.fromResponse(response); // coverage:ignore-line } - /// Set keepalive interval. + /// Set keepalive interval + /// + /// This endpoint requires admin access Future setKeepalive( {required int keepalive}) async { var path = '/index.php/apps/uppush/keepalive'; @@ -1291,7 +1293,7 @@ class NextcloudUnifiedPushProviderClient { throw NextcloudApiException.fromResponse(response); // coverage:ignore-line } - /// Request to create a new deviceId. + /// Request to create a new deviceId Future createDevice( {required String deviceName}) async { var path = '/index.php/apps/uppush/device'; @@ -1314,7 +1316,7 @@ class NextcloudUnifiedPushProviderClient { throw NextcloudApiException.fromResponse(response); // coverage:ignore-line } - /// Request to get push messages. + /// Request to get push messages /// /// This is a public page since it has to be handle by the non-connected app (NextPush app and not Nextcloud-app) Future syncDevice( @@ -1339,7 +1341,7 @@ class NextcloudUnifiedPushProviderClient { throw NextcloudApiException.fromResponse(response); // coverage:ignore-line } - /// Delete a device. + /// Delete a device Future deleteDevice( {required String deviceId}) async { var path = '/index.php/apps/uppush/device/{deviceId}'; @@ -1362,7 +1364,7 @@ class NextcloudUnifiedPushProviderClient { throw NextcloudApiException.fromResponse(response); // coverage:ignore-line } - /// Create an authorization token for a new 3rd party service. + /// Create an authorization token for a new 3rd party service Future createApp({ required String deviceId, required String appName, @@ -1388,7 +1390,7 @@ class NextcloudUnifiedPushProviderClient { throw NextcloudApiException.fromResponse(response); // coverage:ignore-line } - /// Delete an authorization token. + /// Delete an authorization token Future deleteApp({required String token}) async { var path = '/index.php/apps/uppush/app/{token}'; final queryParameters = {}; @@ -1433,7 +1435,7 @@ class NextcloudUnifiedPushProviderClient { throw NextcloudApiException.fromResponse(response); // coverage:ignore-line } - /// Receive notifications from 3rd parties. + /// Receive notifications from 3rd parties Future push({required String token}) async { var path = '/index.php/apps/uppush/push/{token}'; final queryParameters = {}; diff --git a/packages/nextcloud/lib/src/nextcloud.openapi.json b/packages/nextcloud/lib/src/nextcloud.openapi.json index 1c0b8e34..4a6eca5e 100644 --- a/packages/nextcloud/lib/src/nextcloud.openapi.json +++ b/packages/nextcloud/lib/src/nextcloud.openapi.json @@ -3454,7 +3454,8 @@ "tags": [ "unified_push_provider" ], - "summary": "Set keepalive interval.", + "summary": "Set keepalive interval", + "description": "This endpoint requires admin access", "operationId": "unified_push_provider-set-keepalive", "parameters": [ { @@ -3494,7 +3495,7 @@ "tags": [ "unified_push_provider" ], - "summary": "Request to create a new deviceId.", + "summary": "Request to create a new deviceId", "operationId": "unified_push_provider-create-device", "parameters": [ { @@ -3549,7 +3550,7 @@ "tags": [ "unified_push_provider" ], - "summary": "Request to get push messages.", + "summary": "Request to get push messages", "description": "This is a public page since it has to be handle by the non-connected app (NextPush app and not Nextcloud-app)", "operationId": "unified_push_provider-sync-device", "responses": { @@ -3577,7 +3578,7 @@ "tags": [ "unified_push_provider" ], - "summary": "Delete a device.", + "summary": "Delete a device", "operationId": "unified_push_provider-delete-device", "responses": { "200": { @@ -3606,7 +3607,7 @@ "tags": [ "unified_push_provider" ], - "summary": "Create an authorization token for a new 3rd party service.", + "summary": "Create an authorization token for a new 3rd party service", "operationId": "unified_push_provider-create-app", "parameters": [ { @@ -3670,7 +3671,7 @@ "tags": [ "unified_push_provider" ], - "summary": "Delete an authorization token.", + "summary": "Delete an authorization token", "operationId": "unified_push_provider-delete-app", "responses": { "200": { @@ -3710,7 +3711,7 @@ "tags": [ "unified_push_provider" ], - "summary": "Receive notifications from 3rd parties.", + "summary": "Receive notifications from 3rd parties", "operationId": "unified_push_provider-push", "responses": { "201": { diff --git a/specs/uppush.json b/specs/uppush.json index 342424f6..fca67a6d 100644 --- a/specs/uppush.json +++ b/specs/uppush.json @@ -1,12 +1,12 @@ { "openapi": "3.0.3", "info": { - "title": "UnifiedPush Provider", + "title": "uppush", "description": "Use Nextcloud as a push provider for mobile phones' notifications", "license": { "name": "agpl" }, - "version": "1.2.0" + "version": "1.3.0" }, "paths": { "/index.php/apps/uppush": { @@ -43,7 +43,8 @@ "tags": [ "unified_push_provider" ], - "summary": "Set keepalive interval.", + "summary": "Set keepalive interval", + "description": "This endpoint requires admin access", "operationId": "unified_push_provider-set-keepalive", "parameters": [ { @@ -83,7 +84,7 @@ "tags": [ "unified_push_provider" ], - "summary": "Request to create a new deviceId.", + "summary": "Request to create a new deviceId", "operationId": "unified_push_provider-create-device", "parameters": [ { @@ -138,7 +139,7 @@ "tags": [ "unified_push_provider" ], - "summary": "Request to get push messages.", + "summary": "Request to get push messages", "description": "This is a public page since it has to be handle by the non-connected app (NextPush app and not Nextcloud-app)", "operationId": "unified_push_provider-sync-device", "responses": { @@ -166,7 +167,7 @@ "tags": [ "unified_push_provider" ], - "summary": "Delete a device.", + "summary": "Delete a device", "operationId": "unified_push_provider-delete-device", "responses": { "200": { @@ -195,7 +196,7 @@ "tags": [ "unified_push_provider" ], - "summary": "Create an authorization token for a new 3rd party service.", + "summary": "Create an authorization token for a new 3rd party service", "operationId": "unified_push_provider-create-app", "parameters": [ { @@ -259,7 +260,7 @@ "tags": [ "unified_push_provider" ], - "summary": "Delete an authorization token.", + "summary": "Delete an authorization token", "operationId": "unified_push_provider-delete-app", "responses": { "200": { @@ -299,7 +300,7 @@ "tags": [ "unified_push_provider" ], - "summary": "Receive notifications from 3rd parties.", + "summary": "Receive notifications from 3rd parties", "operationId": "unified_push_provider-push", "responses": { "201": { diff --git a/tool/Dockerfile.dev b/tool/Dockerfile.dev index 7b60767c..0a7b9a53 100644 --- a/tool/Dockerfile.dev +++ b/tool/Dockerfile.dev @@ -13,7 +13,7 @@ RUN OC_PASS="user2" ./occ user:add --password-from-env --display-name "User Two" RUN ./occ app:install news # 21.1.0 RUN ./occ app:install notes # 4.7.1 -RUN ./occ app:install uppush # 1.2.0 +RUN ./occ app:install uppush # 1.3.0 RUN ./occ app:enable password_policy # TODO: This stopped working randomly with apache not being able to bind to the port during build. Must be some docker changes?