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
+[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]
+fourseven:scss
+accounts-google

.meteor/release

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

.meteor/versions

@@ -1,97 +1,119 @@
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]_1
-[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]
 chart:[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]_1
+[email protected]_1
+[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]
 flemay:[email protected]
-fourseven:[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
+fourseven:[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
 iron:[email protected]
 iron:[email protected]
 iron:[email protected]
 iron:[email protected]
 iron:[email protected]
 iron:[email protected]
-iron:[email protected]
-iron:[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-mizzao:[email protected]
-mizzao:[email protected]
-[email protected]
-[email protected]
-momentjs:[email protected]
-[email protected]
-[email protected]
-[email protected]_2
-[email protected]_1
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-semantic:[email protected]
-semantic:[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]
+iron:[email protected]
+iron:[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+mizzao:[email protected]
+mizzao:[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+momentjs:[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]
+semantic:[email protected]
+semantic:[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]

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);
+  }
 
 }