From d8703148f0fe1e2cc2aa5755887e2389085ec154 Mon Sep 17 00:00:00 2001 From: Zhiyuan Zheng Date: Wed, 15 Dec 2021 22:48:59 +0100 Subject: [PATCH] Updates push public key --- .envrc.example | 2 +- .github/workflows/build.yml | 2 +- Gemfile.lock | 41 +++++++++++---------- app.config.ts | 2 +- src/utils/slices/instances/push/register.ts | 3 +- 5 files changed, 26 insertions(+), 24 deletions(-) diff --git a/.envrc.example b/.envrc.example index ef1c1556..a45f2cc7 100644 --- a/.envrc.example +++ b/.envrc.example @@ -5,7 +5,7 @@ export SENTRY_PROJECT="" export SENTRY_AUTH_TOKEN="" export SENTRY_DSN="" -export TOOOT_API_KEY="" +export TOOOT_PUSH_KEY_PUBLIC="" # Fastlane start export LC_ALL="" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 94f53d66..89c58145 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,7 +41,7 @@ jobs: SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }} SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_DSN: ${{ secrets.SENTRY_DSN }} - TOOOT_API_KEY: ${{ secrets.TOOOT_API_KEY }} + TOOOT_PUSH_KEY_PUBLIC: ${{ secrets.TOOOT_PUSH_KEY_PUBLIC }} FASTLANE_USER: ${{ secrets.FASTLANE_USER }} MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} MATCH_GIT_URL: ${{ secrets.MATCH_GIT_URL }} diff --git a/Gemfile.lock b/Gemfile.lock index 02b6ed5b..ffd2baba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.4) + CFPropertyList (3.0.5) rexml activesupport (6.1.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) @@ -17,17 +17,17 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.518.0) - aws-sdk-core (3.121.3) + aws-partitions (1.541.0) + aws-sdk-core (3.124.0) aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.239.0) + aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.50.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-kms (1.52.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.104.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-s3 (1.109.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) aws-sigv4 (1.4.0) @@ -86,7 +86,7 @@ GEM escape (0.0.4) ethon (0.15.0) ffi (>= 1.15.0) - excon (0.87.0) + excon (0.89.0) faraday (1.8.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -112,7 +112,7 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.2.5) - fastlane (2.197.0) + fastlane (2.199.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -152,14 +152,14 @@ GEM xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) fastlane-plugin-json (1.0.0) - fastlane-plugin-sentry (1.10.1) + fastlane-plugin-sentry (1.11.0) fastlane-plugin-versioning_android (0.1.0) fastlane-plugin-yarn (1.2) ffi (1.15.4) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.12.0) + google-apis-androidpublisher_v3 (0.14.0) google-apis-core (>= 0.4, < 2.a) google-apis-core (0.4.1) addressable (~> 2.5, >= 2.5.1) @@ -170,11 +170,11 @@ GEM retriable (>= 2.0, < 4.a) rexml webrick - google-apis-iamcredentials_v1 (0.7.0) + google-apis-iamcredentials_v1 (0.9.0) google-apis-core (>= 0.4, < 2.a) - google-apis-playcustomapp_v1 (0.5.0) + google-apis-playcustomapp_v1 (0.6.0) google-apis-core (>= 0.4, < 2.a) - google-apis-storage_v1 (0.8.0) + google-apis-storage_v1 (0.10.0) google-apis-core (>= 0.4, < 2.a) google-cloud-core (1.6.0) google-cloud-env (~> 1.0) @@ -182,15 +182,15 @@ GEM google-cloud-env (1.5.0) faraday (>= 0.17.3, < 2.0) google-cloud-errors (1.2.0) - google-cloud-storage (1.34.1) - addressable (~> 2.5) + google-cloud-storage (1.35.0) + addressable (~> 2.8) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) google-apis-storage_v1 (~> 0.1) google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (1.0.0) + googleauth (1.1.0) faraday (>= 0.17.3, < 2.0) jwt (>= 1.4, < 3.0) memoist (~> 0.16) @@ -218,7 +218,7 @@ GEM naturally (2.2.1) netrc (0.11.0) optparse (0.1.1) - os (1.1.1) + os (1.1.4) plist (3.6.0) public_suffix (4.0.6) rake (13.0.6) @@ -244,7 +244,7 @@ GEM terminal-notifier (2.0.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - trailblazer-option (0.1.1) + trailblazer-option (0.1.2) tty-cursor (0.7.1) tty-screen (0.8.1) tty-spinner (0.9.3) @@ -275,6 +275,7 @@ GEM PLATFORMS universal-darwin-20 + universal-darwin-21 DEPENDENCIES cocoapods diff --git a/app.config.ts b/app.config.ts index 26c758be..7bf2ad1f 100644 --- a/app.config.ts +++ b/app.config.ts @@ -13,7 +13,7 @@ export default (): ExpoConfig => ({ assetBundlePatterns: ['assets/*'], extra: { sentryDSN: process.env.SENTRY_DSN, - toootApiKey: process.env.TOOOT_API_KEY + toootPushKeyPublic: process.env.TOOOT_PUSH_KEY_PUBLIC }, hooks: { postPublish: [ diff --git a/src/utils/slices/instances/push/register.ts b/src/utils/slices/instances/push/register.ts index c91a9279..c34a5ba0 100644 --- a/src/utils/slices/instances/push/register.ts +++ b/src/utils/slices/instances/push/register.ts @@ -3,6 +3,7 @@ import apiTooot, { TOOOT_API_DOMAIN } from '@api/tooot' import i18n from '@root/i18n/i18n' import { RootState } from '@root/store' import { getInstance, Instance } from '@utils/slices/instancesSlice' +import Constants from 'expo-constants' import * as Notifications from 'expo-notifications' import * as Random from 'expo-random' import { Platform } from 'react-native' @@ -57,7 +58,7 @@ const pushRegister = async ( formData.append('subscription[endpoint]', endpoint) formData.append( 'subscription[keys][p256dh]', - 'BO3P7Fe/FxPNijeXayVYViCoLicnnACc+a55wzcS0qIjYU++dtAl2XltgEfU5qPuXrFg5rnxBzbwQG4cAmdNLK4=' + Constants.manifest?.extra?.toootPushKeyPublic ) formData.append('subscription[keys][auth]', auth) Object.keys(alerts).map(key =>