From 9007a9f56601ea16092f9f377b7fb7571cd58400 Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Thu, 24 Jun 2021 13:42:47 +0200 Subject: [PATCH] Compatibility with Meteor 2.3 --- accounts-line/.versions | 4 ++-- accounts-line/CHANGELOG.md | 2 ++ line-config-ui/.versions | 29 ++++++++++++++--------------- line-config-ui/CHANGELOG.md | 4 ++++ line-config-ui/package.js | 2 +- line-oauth/.versions | 2 +- line-oauth/CHANGELOG.md | 2 ++ line-oauth/line_server.js | 5 ++++- 8 files changed, 30 insertions(+), 20 deletions(-) diff --git a/accounts-line/.versions b/accounts-line/.versions index acdf88e..64af08d 100644 --- a/accounts-line/.versions +++ b/accounts-line/.versions @@ -49,8 +49,8 @@ retry@1.1.0 routepolicy@1.1.0 service-configuration@1.0.11 socket-stream-client@0.3.1 -storyteller:accounts-line@1.2.2 -storyteller:line-oauth@1.2.1 +storyteller:accounts-line@1.2.3 +storyteller:line-oauth@1.2.2 tracker@1.2.0 underscore@1.0.10 url@1.3.1 diff --git a/accounts-line/CHANGELOG.md b/accounts-line/CHANGELOG.md index 0f7c1ea..0a8ba44 100755 --- a/accounts-line/CHANGELOG.md +++ b/accounts-line/CHANGELOG.md @@ -1,4 +1,6 @@ # Changelog +## 1.2.3 - 2021-06-24 +* Compatibility fix for Meteor 2.3 ## 1.2.2 - 2021-05-07 * Updated `line-oauth@1.2.1` diff --git a/line-config-ui/.versions b/line-config-ui/.versions index 012bffc..f957c96 100644 --- a/line-config-ui/.versions +++ b/line-config-ui/.versions @@ -1,22 +1,21 @@ -babel-compiler@7.6.0 +babel-compiler@7.6.1 babel-runtime@1.5.0 base64@1.0.12 -blaze@2.3.4 -blaze-tools@1.0.10 +blaze@2.5.0 +blaze-tools@1.1.0 caching-compiler@1.2.2 -caching-html-compiler@1.1.3 +caching-html-compiler@1.2.0 check@1.3.1 -deps@1.0.12 diff-sequence@1.1.1 dynamic-import@0.6.0 -ecmascript@0.15.0 +ecmascript@0.15.1 ecmascript-runtime@0.7.0 ecmascript-runtime-client@0.11.0 ecmascript-runtime-server@0.10.0 ejson@1.1.1 fetch@0.1.1 -html-tools@1.0.11 -htmljs@1.0.11 +html-tools@1.1.0 +htmljs@1.1.0 id-map@1.1.0 inter-process-messaging@0.1.1 meteor@1.9.3 @@ -30,12 +29,12 @@ promise@0.11.2 random@1.2.0 react-fast-refresh@0.1.0 reactive-var@1.0.11 -spacebars@1.0.15 -spacebars-compiler@1.1.3 -storyteller:line-config-ui@1.1.1 -templating@1.3.2 -templating-compiler@1.3.3 -templating-runtime@1.3.2 -templating-tools@1.1.2 +spacebars@1.2.0 +spacebars-compiler@1.2.0 +storyteller:line-config-ui@1.1.2 +templating@1.4.1 +templating-compiler@1.4.1 +templating-runtime@1.5.0 +templating-tools@1.2.0 tracker@1.2.0 underscore@1.0.10 diff --git a/line-config-ui/CHANGELOG.md b/line-config-ui/CHANGELOG.md index 08b30a8..34c1d1c 100755 --- a/line-config-ui/CHANGELOG.md +++ b/line-config-ui/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 1.1.2 - 2021-06-24 +* Update dependencies +* Minimum Meteor version bumped to 1.12 + ## 1.1.1 - 2021-02-16 * Added links to LINE documentation diff --git a/line-config-ui/package.js b/line-config-ui/package.js index e6ede1a..40412c5 100755 --- a/line-config-ui/package.js +++ b/line-config-ui/package.js @@ -8,7 +8,7 @@ Package.describe({ Package.onUse(api => { api.versionsFrom('1.12'); api.use('ecmascript', 'client'); - api.use('templating@1.4.0', 'client'); + api.use('templating@1.4.1', 'client'); api.addFiles('line_login_button.css', 'client'); api.addFiles(['line_configure.html', 'line_configure.js'], 'client'); diff --git a/line-oauth/.versions b/line-oauth/.versions index 53b2544..ec7d367 100644 --- a/line-oauth/.versions +++ b/line-oauth/.versions @@ -48,7 +48,7 @@ retry@1.1.0 routepolicy@1.1.0 service-configuration@1.0.11 socket-stream-client@0.3.1 -storyteller:line-oauth@1.2.1 +storyteller:line-oauth@1.2.2 tracker@1.2.0 underscore@1.0.10 url@1.3.1 diff --git a/line-oauth/CHANGELOG.md b/line-oauth/CHANGELOG.md index 99d3da4..b683447 100755 --- a/line-oauth/CHANGELOG.md +++ b/line-oauth/CHANGELOG.md @@ -1,4 +1,6 @@ # Changelog +## 1.2.2 - 2021-06-24 +* Made compatible with Meteor 2.3 ## 1.2.1 - 2021-05-07 * Removed lost console log diff --git a/line-oauth/line_server.js b/line-oauth/line_server.js index c7095ab..674aa12 100644 --- a/line-oauth/line_server.js +++ b/line-oauth/line_server.js @@ -1,4 +1,5 @@ -// import { OAuthEncryption } from 'meteor/oauth-encryption'; +import { Meteor } from 'meteor/meteor'; +import { ServiceConfiguration } from 'meteor/service-configuration'; const jsonwebtoken = Npm.require('jsonwebtoken'); Line = {}; @@ -68,6 +69,8 @@ const getIdentity = token => { let secret = config.secret; if (typeof secret === 'object' && Package['oauth-encryption']) { + import { OAuthEncryption } from 'meteor/oauth-encryption'; + secret = OAuthEncryption.open(secret); }