Skip to content

Commit

Permalink
Compatibility with Meteor 2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
StorytellerCZ committed Jun 24, 2021
1 parent d85ae9d commit 9007a9f
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 20 deletions.
4 changes: 2 additions & 2 deletions accounts-line/.versions
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions accounts-line/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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`
Expand Down
29 changes: 14 additions & 15 deletions line-config-ui/.versions
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
4 changes: 4 additions & 0 deletions line-config-ui/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion line-config-ui/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion line-oauth/.versions
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions line-oauth/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 4 additions & 1 deletion line-oauth/line_server.js
Original file line number Diff line number Diff line change
@@ -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 = {};

Expand Down Expand Up @@ -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);
}

Expand Down

0 comments on commit 9007a9f

Please sign in to comment.