Merge branch 'devel' into feature/docs

History.md

@@ -21,6 +21,9 @@
 * `accounts-ui-unstyled@1.5.1`
   - Update compatibility range with `less` from 3.0.2 to 4.0.0
 
+* `google-config-ui@1.0.3`
+  - Deliver siteUrl in the same way as other config-ui packages
+
 * `ecmascript-runtime-client@0.12.1`
   - Revert `core-js` to v3.15.2 due to issues in legacy build with arrays, [see issue for more details](https://github.com/meteor/meteor/issues/11662)
 

packages/google-config-ui/google_configure.html

@@ -22,7 +22,7 @@
      Set Authorized Javascript Origins to: <span class="url">{{siteUrl}}</span>
     </li>
     <li>
-      Set Authorized Redirect URI to: <span class="url">{{siteUrl}}/_oauth/google?close</span>
+      Set Authorized Redirect URI to: <span class="url">{{siteUrl}}_oauth/google?close</span>
     </li>
     <li>
       Finish by clicking "Create".

packages/google-config-ui/google_configure.js

@@ -1,14 +1,8 @@
 Template.configureLoginServiceDialogForGoogle.helpers({
-  siteUrl: () => {
-    let url = Meteor.absoluteUrl();
-    if (url.slice(-1) === "/") {
-      url = url.slice(0,-1)
-    }
-    return url;
-  }
+  siteUrl: () => Meteor.absoluteUrl(),
 });
 
 Template.configureLoginServiceDialogForGoogle.fields = () => [
-  {property: 'clientId', label: 'Client ID'},
-  {property: 'secret', label: 'Client secret'}
+  { property: 'clientId', label: 'Client ID' },
+  { property: 'secret', label: 'Client secret' },
 ];

packages/google-config-ui/package.js

@@ -1,14 +1,12 @@
 Package.describe({
-  summary: "Blaze configuration templates for Google OAuth.",
-  version: "1.0.2",
+  summary: 'Blaze configuration templates for Google OAuth.',
+  version: '1.0.3',
 });
 
 Package.onUse(api => {
   api.use('ecmascript', 'client');
-  api.use('templating@1.4.0', 'client');
+  api.use('templating@1.4.1', 'client');
 
   api.addFiles('google_login_button.css', 'client');
-  api.addFiles(
-    ['google_configure.html', 'google_configure.js'],
-    'client');
+  api.addFiles(['google_configure.html', 'google_configure.js'], 'client');
 });