Skip to content
This repository has been archived by the owner on Aug 30, 2021. It is now read-only.

PayPal Authentication #610

Merged
merged 3 commits into from
Jul 15, 2015
Merged

PayPal Authentication #610

merged 3 commits into from
Jul 15, 2015

Conversation

trainerbill
Copy link
Contributor

New PR for PayPal Authentication for 0.4.0 branch

@trainerbill trainerbill mentioned this pull request Jul 2, 2015
@ilanbiala ilanbiala added this to the 0.4.x milestone Jul 2, 2015
@lirantal
Copy link
Member

@trainerbill looks like some conflicts exist there, can you look into it?

@trainerbill
Copy link
Contributor Author

@lirantal What conflicts? I merged the PayPalAuth4 branch with 0.4.0 successfully.

@lirantal
Copy link
Member

@trainerbill I don't know what conflicts but take a look at the merge notice:
image

It says clearly "we can't automatically merge this pull request"

@trainerbill
Copy link
Contributor Author

@lirantal Ok, I fixed the merge conflicts but it required getting up to date with meanjs/0.4.0 so there are a ton of changes that I didn't make... Not sure if this is the proper way to handle this or not.

@@ -43,6 +43,7 @@
"passport": "~0.2.2",
"passport-facebook": "^2.0.0",
"passport-github": "~0.1.5",
"passport-paypal-openidconnect": "^0.1.1",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indentation

clientID: process.env.PAYPAL_ID || 'CLIENT_ID',
clientSecret: process.env.PAYPAL_SECRET || 'CLIENT_SECRET',
callbackURL: '/api/auth/paypal/callback',
sandbox: false
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does this property mean?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@trainerbill
Copy link
Contributor Author

@ilanbiala Fixed the indentation. Stupid atom. as @jloveland mentioned it is an option to switch between sandbox/testing mode and production mode for Login With PayPal

@lirantal
Copy link
Member

thanks @trainerbill!

lirantal added a commit that referenced this pull request Jul 15, 2015
@lirantal lirantal merged commit 855a399 into meanjs:0.4.0 Jul 15, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants