Merge pull request #115 from Meteor-Community-Packages/release/3.0

Meteor 3.0
Meteor-Community-Packages · Jul 16, 2024 · abb940b · abb940b
2 parents 4fb7c25 + 0ce638c
commit abb940b
Show file tree

Hide file tree

Showing 11 changed files with 4,030 additions and 1,719 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -31,6 +31,15 @@
         "doc",
         "maintenance"
       ]
+    },
+    {
+      "login": "jankapunkt",
+      "name": "Jan Küster",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1135285?v=4",
+      "profile": "https://jankuester.com/",
+      "contributions": [
+        "maintenance"
+      ]
     }
   ],
   "contributorsPerLine": 7

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -11,10 +11,10 @@ jobs:
     name: "Lint checking app"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: '14'
+          node-version: '20'
       - name: Install dependencies
         run: npm ci
       - name: Run lint

diff --git a/.versions b/.versions
@@ -1,57 +1,59 @@
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-bozhao:[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+bozhao:[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+
+## v.3.0.0
+* Removed deprecated providers
+* Minimum support version is Meteor 3.0
+
 ## v. 2.9.0
 * Added `storyteller:accounts-seznam`
 

diff --git a/README.md b/README.md
@@ -57,10 +57,10 @@ Called after user is unlinking the service. The hook will receive object with th
 1. Piggyback on existing Meteor oauth login system. Use login handler.
 
 2. We do not allow link different account from same service for now. For example, you
-   could not link with 2 different github accounts.
+   could not link with 2 different Github accounts.
 
 3. Save the linked service info on user.services, instead of creating new field
-   on user object.  This allow user logins the application from linked services.
+   on user object. This allows user logins the application from linked services.
 
 4. Don't create a temporary user account and then merge it.
 
@@ -81,7 +81,7 @@ Called after user is unlinking the service. The hook will receive object with th
 * mrt:accounts-vk
 * mikepol:accounts-ok
 * mikepol:accounts-mailru
-* jonperl:accounts-linkedin (depracated) / pauli:linkedin-oauth
+* pauli:linkedin-oauth
 * garbolino:accounts-soundcloud
 * alexbeauchemin:accounts-twitch
 * nicolaiwadstrom:meteor-angellist
@@ -95,7 +95,27 @@ Called after user is unlinking the service. The hook will receive object with th
 * lindoelio:accounts-office365 / ermlab:accounts-office365
 * quave:accounts-apple / bigowl:accounts-apple
 * freedombase:web3-login
-* lichthagel:accounts-discord / storyteller:accounts-discord
+* storyteller:accounts-discord
 
 ## License
 MIT
+
+## Contributors
+
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/yubozhao"><img src="https://avatars1.githubusercontent.com/u/670949?s=460&v=4?s=100" width="100px;" alt="Yu Bozhao"/><br /><sub><b>Yu Bozhao</b></sub></a><br /><a href="https://github.com/Meteor-Community-Packages/template-package/commits?author=yubozhao" title="Code">💻</a> <a href="https://github.com/Meteor-Community-Packages/template-package/commits?author=yubozhao" title="Documentation">📖</a> <a href="#maintenance-yubozhao" title="Maintenance">🚧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/StorytellerCZ"><img src="https://avatars2.githubusercontent.com/u/1715235?v=4?s=100" width="100px;" alt="Jan Dvorak"/><br /><sub><b>Jan Dvorak</b></sub></a><br /><a href="https://github.com/Meteor-Community-Packages/template-package/commits?author=StorytellerCZ" title="Code">💻</a> <a href="https://github.com/Meteor-Community-Packages/template-package/commits?author=StorytellerCZ" title="Documentation">📖</a> <a href="#maintenance-StorytellerCZ" title="Maintenance">🚧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://jankuester.com/"><img src="https://avatars.githubusercontent.com/u/1135285?v=4?s=100" width="100px;" alt="Jan Küster"/><br /><sub><b>Jan Küster</b></sub></a><br /><a href="#maintenance-jankapunkt" title="Maintenance">🚧</a></td>
+    </tr>
+  </tbody>
+</table>
+
+<!-- markdownlint-restore -->
+<!-- prettier-ignore-end -->
+
+<!-- ALL-CONTRIBUTORS-LIST:END -->
diff --git a/community-services/discord.js b/community-services/discord.js
@@ -5,12 +5,8 @@ Meteor.linkWithDiscord = function (options, callback) {
   if (!Meteor.userId()) {
     throw new Meteor.Error(402, 'Please login to an existing account before link.')
   }
-  if (!Package['lichthagel:accounts-discord'] && !Package['storyteller:accounts-discord']) {
-    throw new Meteor.Error(403, 'Please include lichthagel:accounts-discord or storyteller:accounts-discord package')
-  }
-  // TODO deprecate lichthagel:accounts-discord as it has not been updated in years and is not ready for Meteor 3
-  if (Package['lichthagel:accounts-discord']) {
-    console.warn('lichthagel:accounts-discord has not been updated in years and has been deprecated in bozhao:link-accounts, please upgrade to storyteller:accounts-discord.')
+  if (!Package['storyteller:accounts-discord']) {
+    throw new Meteor.Error(403, 'Please include storyteller:accounts-discord package')
   }
 
   if (!callback && typeof options === 'function') {
@@ -19,9 +15,7 @@ Meteor.linkWithDiscord = function (options, callback) {
   }
 
   const credentialRequestCompleteCallback = Accounts.oauth.linkCredentialRequestCompleteHandler(callback)
-  if (Package['lichthagel:discord-oauth']) {
-    Package['lichthagel:discord-oauth'].Discord.requestCredential(options, credentialRequestCompleteCallback)
-  }
+
   if (Package['storyteller:discord-oauth']) {
     Package['storyteller:discord-oauth'].Discord.requestCredential(options, credentialRequestCompleteCallback)
   }

diff --git a/community-services/linkedin.js b/community-services/linkedin.js
@@ -10,15 +10,6 @@ Meteor.linkWithLinkedIn = function (options, callback) {
     throw new Meteor.Error(403, 'Please include pauli:linkedin-oauth package')
   }
 
-  // Deprecation of jonperl:linkedin
-  if (Package['jonperl:linkedin']) {
-    console.warn('jonperl:linkedin has been deprecated in meteor linked accounts in favor of pauli:linkedin-oauth to keep up with linkedin api changes')
-  }
-  if (!Package['jonperl:linkedin'] && !Package['pauli:linkedin-oauth']) {
-    throw new Meteor.Error(403, 'Please include pauli:linkedin-oauth package')
-  }
-  // End of deprecation messages
-
   if (!callback && typeof options === 'function') {
     callback = options
     options = null
@@ -27,7 +18,5 @@ Meteor.linkWithLinkedIn = function (options, callback) {
   const credentialRequestCompleteCallback = Accounts.oauth.linkCredentialRequestCompleteHandler(callback)
   if (Package['pauli:linkedin-oauth']) {
     Package['pauli:linkedin-oauth'].Linkedin.requestCredential(options, credentialRequestCompleteCallback)
-  } else if (Package['jonperl:linkedin']) {
-    Package['jonperl:linkedin'].LinkedIn.requestCredential(options, credentialRequestCompleteCallback)
   }
 }
diff --git a/link_accounts_server.js b/link_accounts_server.js
@@ -38,7 +38,7 @@ Accounts.registerLoginHandler(async function (options) {
     credentialSecret: Match.OneOf(null, String)
   })
 
-  const result = OAuth.retrieveCredential(
+  const result = await OAuth.retrieveCredential(
     options.link.credentialToken,
     options.link.credentialSecret
   )
@@ -71,7 +71,7 @@ Meteor.methods({
   },
   'bozhao:linkAccountsWeb3': async function (address) {
     check(address, String)
-    const user = Meteor.users.findOne({ 'services.web3.address': address })
+    const user = await Meteor.users.findOneAsync({ 'services.web3.address': address })
     if (user) throw new Meteor.Error('500', 'This address is already assigned!')
     return await Accounts.LinkUserFromExternalService(
       'web3',
@@ -105,7 +105,7 @@ Accounts.LinkUserFromExternalService = async function (
     throw new Meteor.Error("'id' missing from service data for: " + serviceName)
   }
 
-  const user = Meteor.user()
+  const user = await Meteor.userAsync()
 
   if (!user) {
     return new Meteor.Error('User not found for LinkUserFromExternalService')
@@ -168,12 +168,14 @@ Accounts.LinkUserFromExternalService = async function (
     }
 
     // On link hook
-    Accounts._onLink.forEach((callback) => {
+    Accounts._onLink.forEachAsync(async (callback) => {
+      const user = await Meteor.userAsync()
+
       // eslint-disable-next-line n/no-callback-literal
       callback({
         type: serviceName,
         serviceData,
-        user: Meteor.user(),
+        user,
         serviceOptions: options
       })
       return true
@@ -191,7 +193,7 @@ Accounts.unlinkService = async function (userId, serviceName, cb) {
   if (typeof serviceName !== 'string') {
     throw new Meteor.Error('Service name must be string')
   }
-  const user = Meteor.users.findOne({ _id: userId })
+  const user = await Meteor.users.findOneAsync({ _id: userId })
   if (serviceName === 'resume' || serviceName === 'password') {
     throw new Meteor.Error(
       'Internal services cannot be unlinked: ' + serviceName
@@ -211,9 +213,10 @@ Accounts.unlinkService = async function (userId, serviceName, cb) {
       }
     )
     // On unlink hook
-    Accounts._onUnlink.forEach((callback) => {
+    Accounts._onUnlink.forEachAsync(async (callback) => {
+      const user = await Meteor.userAsync()
       // eslint-disable-next-line n/no-callback-literal
-      callback({ type: serviceName, user: Meteor.user() })
+      callback({ type: serviceName, user })
       return true
     })
   } else {