diff --git a/.gitignore b/.gitignore index 5b5e6f87bd..1717063857 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,3 @@ test/*.js test/*.map public/docs *.sublime-workspace -keys diff --git a/config.json.example b/config.json.example index 196ceb369f..74e2f0822c 100644 --- a/config.json.example +++ b/config.json.example @@ -42,7 +42,7 @@ "client_id":"client_id", "client_secret":"client_secret" }, - "GOOGLE_IAB_PUBLICKEY_LIVE": "GOOGLE_IAB_PUBLICKEY_LIVE", + "IAP_GOOGLE_KEYDIR": "/path/to/google/public/key/dir/", "LOGGLY": { "enabled": false, "subdomain": "subdomain", diff --git a/keys/google/iap-live b/keys/google/iap-live new file mode 100644 index 0000000000..69dc38136b --- /dev/null +++ b/keys/google/iap-live @@ -0,0 +1 @@ +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk6EVccD7D6y5vLmsUxUXVYTMyByq+NjfTzjMBaKCk93fq8Ahn6Ipha1K4oBIvArUj3CsP5Tb/Yf6c6SrEsSnE3eqgKQgeq+fYyfIm+Fb+tFGTttLonZ2Sqemqeyx2PjOG2CVZBXj1+Zr7jb0ocMNYraYUTvklWnpcK6/5ZaZLLent1PGiU9l5jIfRAsxmJH/UpssgpFPnCs+8PRKUALkJATTfVCCF+PJef6mcKAafAArKUEo0lR2/NeaE62Wpii33DLuKDPfMqL3g4EHZTEVE1ezFl/3WPeLlxuQm38hZLpEfEYKp17qzplU+GmWIfjZt6OdtVdonlYxIxNAZLnWEQIDAQAB \ No newline at end of file diff --git a/package.json b/package.json index 84fd5bccfc..6f14a60e51 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "grunt-nodemon": "~0.3.0", "habitrpg-shared": "git://github.com/HabitRPG/habitrpg-shared#develop", "icalendar": "git://github.com/lefnire/node-icalendar#master", - "in-app-purchase": "^0.3.0", + "in-app-purchase": "^0.2.0", "jade": "~1.7.0", "js2xmlparser": "~0.1.2", "lodash": "~2.4.1", diff --git a/src/controllers/payments/iap.js b/src/controllers/payments/iap.js index 9dcef12efc..29b03fedfb 100644 --- a/src/controllers/payments/iap.js +++ b/src/controllers/payments/iap.js @@ -3,6 +3,12 @@ var async = require('async'); var payments = require('./index'); var nconf = require('nconf'); +var inAppPurchase = require('in-app-purchase'); +inAppPurchase.config({ + // this is the path to the directory containing iap-sanbox/iap-live files + googlePublicKeyPath: nconf.get("IAP_GOOGLE_KEYDIR") +}); + // Validation ERROR Codes var INVALID_PAYLOAD = 6778001; var CONNECTION_FAILED = 6778002;