Update Meteor and OAuth

.gitignore

@@ -2,3 +2,5 @@
 .idea/
 private/config.json
 .sass-cache/
+node_modules/
+

.meteor/.finished-upgraders

@@ -10,3 +10,10 @@ notices-for-facebook-graph-api-2
 1.2.0-meteor-platform-split
 1.2.0-cordova-changes
 1.2.0-breaking-changes
+1.3.0-split-minifiers-package
+1.3.5-remove-old-dev-bundle-link
+1.4.0-remove-old-dev-bundle-link
+1.4.1-add-shell-server-package
+1.4.3-split-account-service-packages
+1.5-add-dynamic-import-package
+1.7-split-underscore-from-meteor-base

.meteor/.gitignore

@@ -1 +1,2 @@
+dev_bundle
 local

.meteor/packages

@@ -3,31 +3,37 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-accounts-github
-service-configuration
+accounts-github@1.4.2
+service-configuration@1.0.11
 iron:router
 
-accounts-facebook
+accounts-facebook@1.3.2
 momentjs:moment
-reactive-var
-underscore
-accounts-password
+reactive-var@1.0.11
+underscore@1.0.10
+accounts-password@1.5.1
 mizzao:user-status
 chart:chart
-fourseven:scss
 semantic:ui
 flemay:less-autoprefixer
-standard-minifiers
-meteor-base
-mobile-experience
-mongo
-blaze-html-templates
-session
-jquery
-tracker
-logging
-reload
-random
-ejson
-spacebars
-check
+meteor-base@1.4.0
+mobile-experience@1.0.5
+mongo@1.6.0
+blaze-html-templates@1.0.4
+session@1.2.0
+jquery@1.11.10
+tracker@1.2.0
+logging@1.1.20
+reload@1.2.0
+random@1.1.0
+ejson@1.1.0
+spacebars@1.0.12
+check@1.3.1
+standard-minifier-css@1.5.2
+standard-minifier-js@2.4.0
+shell-server@0.4.0
+facebook-config-ui@1.0.2
+github-config-ui@1.0.1
+dynamic-import@0.5.0
+fourseven:scss
+accounts-google

.meteor/release

@@ -1 +1 @@
-METEOR@1.2.1
+METEOR@1.8.0.2

.meteor/versions

@@ -1,97 +1,119 @@
-accounts-base@1.2.2
-accounts-facebook@1.0.6
-accounts-github@1.0.6
-accounts-oauth@1.1.8
-accounts-password@1.1.4
-autoupdate@1.2.4
-babel-compiler@5.8.24_1
-babel-runtime@0.1.4
-base64@1.0.4
-binary-heap@1.0.4
-blaze@2.1.3
-blaze-html-templates@1.0.1
-blaze-tools@1.0.4
-boilerplate-generator@1.0.4
-caching-compiler@1.0.0
-caching-html-compiler@1.0.2
-callback-hook@1.0.4
+accounts-base@1.4.3
+accounts-facebook@1.3.2
+accounts-github@1.4.2
+accounts-google@1.3.2
+accounts-oauth@1.1.16
+accounts-password@1.5.1
+allow-deny@1.1.0
+autoupdate@1.5.1
+babel-compiler@7.2.4
+babel-runtime@1.3.0
+base64@1.0.11
+binary-heap@1.0.11
+blaze@2.3.3
+blaze-html-templates@1.1.2
+blaze-tools@1.0.10
+boilerplate-generator@1.6.0
+caching-compiler@1.2.1
+caching-html-compiler@1.1.3
+callback-hook@1.1.0
 chart:chart@1.0.1-beta.4
-check@1.1.0
-coffeescript@1.0.11
-ddp@1.2.2
-ddp-client@1.2.1
-ddp-common@1.2.2
-ddp-rate-limiter@1.0.0
-ddp-server@1.2.2
-deps@1.0.9
-diff-sequence@1.0.1
-ecmascript@0.1.6
-ecmascript-runtime@0.2.6
-ejson@1.0.7
-email@1.0.8
-facebook@1.2.2
-fastclick@1.0.7
+check@1.3.1
+coffeescript@2.3.2_1
+coffeescript-compiler@2.3.2_1
+ddp@1.4.0
+ddp-client@2.3.3
+ddp-common@1.4.0
+ddp-rate-limiter@1.0.7
+ddp-server@2.2.0
+deps@1.0.12
+diff-sequence@1.1.1
+dynamic-import@0.5.1
+ecmascript@0.12.4
+ecmascript-runtime@0.7.0
+ecmascript-runtime-client@0.8.0
+ecmascript-runtime-server@0.7.1
+ejson@1.1.0
+email@1.2.3
+es5-shim@4.8.0
+facebook-config-ui@1.0.2
+facebook-oauth@1.5.0
+fetch@0.1.0
 flemay:less-autoprefixer@1.2.0
-fourseven:scss@3.4.1
-geojson-utils@1.0.4
-github@1.1.4
-hot-code-push@1.0.0
-html-tools@1.0.5
-htmljs@1.0.5
-http@1.1.1
-id-map@1.0.4
+fourseven:scss@4.10.0
+geojson-utils@1.0.10
+github-config-ui@1.0.1
+github-oauth@1.2.2
+google-oauth@1.2.6
+hot-code-push@1.0.4
+html-tools@1.0.11
+htmljs@1.0.11
+http@1.4.2
+id-map@1.1.0
+inter-process-messaging@0.1.0
 iron:controller@1.0.12
 iron:core@1.0.11
 iron:dynamic-template@1.0.12
 iron:layout@1.0.12
 iron:location@1.0.11
 iron:middleware-stack@1.1.0
-iron:router@1.0.12
-iron:url@1.0.11
-jquery@1.11.4
-launch-screen@1.0.4
-livedata@1.0.15
-localstorage@1.0.5
-logging@1.0.8
-meteor@1.1.10
-meteor-base@1.0.1
-minifiers@1.1.7
-minimongo@1.0.10
-mizzao:timesync@0.3.4
-mizzao:user-status@0.6.6
-mobile-experience@1.0.1
-mobile-status-bar@1.0.6
-momentjs:moment@2.10.6
-mongo@1.1.3
-mongo-id@1.0.1
-npm-bcrypt@0.7.8_2
-npm-mongo@1.4.39_1
-oauth@1.1.6
-oauth2@1.1.5
-observe-sequence@1.0.7
-ordered-dict@1.0.4
-promise@0.5.1
-random@1.0.5
-rate-limit@1.0.0
-reactive-dict@1.1.3
-reactive-var@1.0.6
-reload@1.1.4
-retry@1.0.4
-routepolicy@1.0.6
-semantic:ui@2.1.6
-semantic:ui-data@2.1.6
-service-configuration@1.0.5
-session@1.1.1
-sha@1.0.4
-spacebars@1.0.7
-spacebars-compiler@1.0.7
-srp@1.0.4
-standard-minifiers@1.0.2
-templating@1.1.5
-templating-tools@1.0.0
-tracker@1.0.9
-ui@1.0.8
-underscore@1.0.4
-url@1.0.5
-webapp@1.2.3
-webapp-hashing@1.0.5
+iron:router@1.1.2
+iron:url@1.1.0
+jquery@1.11.11
+launch-screen@1.1.1
+livedata@1.0.18
+localstorage@1.2.0
+logging@1.1.20
+meteor@1.9.2
+meteor-base@1.4.0
+minifier-css@1.4.1
+minifier-js@2.4.0
+minimongo@1.4.5
+mizzao:timesync@0.5.0
+mizzao:user-status@0.6.8
+mobile-experience@1.0.5
+mobile-status-bar@1.0.14
+modern-browsers@0.1.3
+modules@0.13.0
+modules-runtime@0.10.3
+momentjs:moment@2.24.0
+mongo@1.6.0
+mongo-decimal@0.1.1
+mongo-dev-server@1.1.0
+mongo-id@1.0.7
+npm-bcrypt@0.9.3
+npm-mongo@3.1.1
+oauth@1.2.7
+oauth2@1.2.1
+observe-sequence@1.0.16
+ordered-dict@1.1.0
+promise@0.11.2
+random@1.1.0
+rate-limit@1.0.9
+reactive-dict@1.2.1
+reactive-var@1.0.11
+reload@1.2.0
+retry@1.1.0
+routepolicy@1.1.0
+semantic:ui@2.3.1
+semantic:ui-data@2.3.1
+service-configuration@1.0.11
+session@1.2.0
+sha@1.0.9
+shell-server@0.4.0
+socket-stream-client@0.2.2
+spacebars@1.0.15
+spacebars-compiler@1.1.3
+srp@1.0.12
+standard-minifier-css@1.5.2
+standard-minifier-js@2.4.0
+templating@1.3.2
+templating-compiler@1.3.3
+templating-runtime@1.3.2
+templating-tools@1.1.2
+tracker@1.2.0
+ui@1.0.13
+underscore@1.0.10
+url@1.2.0
+webapp@1.7.2
+webapp-hashing@1.0.9

README.md

@@ -191,6 +191,34 @@ To configure login, edit `private/config.json`. Alternatively, you can configure
 
 In `private/config.json` (or the corresponding environment variables), provide the appropriate application id/secret combinations for either Facebook or Github authentication, or choose to disable them.
 
+##### GitHub OAuth
+1. Navigate to settings page of GitHub user/organization
+1. Click "OAuth Apps"
+1. Click "New OAuth App" and fill out the information (name, email, logo)
+  * For Authorization callback URL, put `{YOUR URL}/_oauth/github`, and `localhost:3000/_oauth/github` for debugging
+1. Copy the `client id` and `secret` to `private/config.json`
+
+##### Facebook OAuth
+1. Go to the [Facebook App Dashboard](https://developers.facebook.com/apps)
+1. Click "Add a New App"
+  * For scenario, choose "Integrate Facebook login"
+1. Put your info (event name, email, logo)
+1. On the sidebar, select "Facebook login" > "Settings"
+1. Put `{YOUR URL}/_oauth/facebook?close` and `{YOUR URL}/_oauth/facebook` in "Valid OAuth Redirect URLs"
+1. From "Settings" > "Basic", copy the `app ID` and `secret` to `private/config.json`
+1. Unclear if necessary, but you can use this [privacy policy generator](https://termsfeed.com/privacy-policy/generator/) to generate a policy for your app, before making the app "live" (you can only test from localhost if the app is in "development")
+
+##### Google OAuth
+1. Go to [Google Sign-In](https://developers.google.com/identity/sign-in/web/sign-in)
+1. Click on "Configure a project"
+1. Create a new project for HelpQ
+  * For "Where are you calling from?", select "Web Server"
+  * Put `{YOUR URL}/_oauth/google?close` and `{YOUR URL}/_oauth/google` in "Valid OAuth Redirect URLs"
+    * Add localhost for testing, if needed
+1. Click the link to go to the GCP console once you're done
+1. Put your info (event name, email, logo) on the "OAuth Consent Screen" tab
+1. Copy `client id` and `secret` to `private/config.json`
+
 #### Branding
 
 For front end branding, edit `client/stylesheets/scss/_branding.scss`

client/app.html

@@ -7,8 +7,8 @@
         type="image/png"
         href="assets/images/favicon.png">
 
-  <link href='http://fonts.googleapis.com/css?family=Montserrat:700' rel='stylesheet' type='text/css'>
-  <link href='http://fonts.googleapis.com/css?family=Lato:300,400' rel='stylesheet' type='text/css'>
+  <link href='https://fonts.googleapis.com/css?family=Montserrat:700' rel='stylesheet' type='text/css'>
+  <link href='https://fonts.googleapis.com/css?family=Lato:300,400' rel='stylesheet' type='text/css'>
 
   <!-- iOS Web Clip -->
   <link rel="apple-touch-icon" href="assets/images/favicon.png">

client/components/login/login.html

@@ -29,5 +29,10 @@
     <br>
     <button id="login-facebook" class="fluid facebook push button"> Login with Facebook</button>
     {{/if}}
+
+    {{#if enabled.google}}
+    <br>
+    <button id="login-google" class="fluid google push button"> Login with Google</button>
+    {{/if}}
   </div>
 </template>

client/components/login/login.js

@@ -13,6 +13,11 @@ Template.login.events({
       loginStyle: 'redirect'
     });
   },
+  'click #login-google': function(){
+    Meteor.loginWithGoogle({
+      loginStyle: 'redirect',
+    });
+  },
   'click #login-password': function(e, t){
     loginPassword(t);
   },

client/stylesheets/scss/_branding.scss

@@ -32,6 +32,9 @@ $facebook-blue: #3b5998;
 // Github Gray
 $github-gray: #e4e4e4;
 
+// Google Red
+$google-red: #DB3236;
+
 // ===============================================================================
 
 //------------------------------

client/stylesheets/scss/elements/_pushbuttons.scss

@@ -73,5 +73,9 @@ button.push {
     border-bottom-color: lighten($facebook-blue, 10);
   }
 
+  &.google {
+    background: $google-red;
+    border-bottom-color: lighten($google-red, 10);
+  }
 
 }