diff --git a/src/apps.js b/src/apps.js index 05e6dd983..ce6086abb 100644 --- a/src/apps.js +++ b/src/apps.js @@ -1039,7 +1039,7 @@ function purchaseApp(data, callback) { assert.strictEqual(typeof data, 'object'); assert.strictEqual(typeof callback, 'function'); - appstore.purchase(data, function (error) { + appstore.purchaseApp(data, function (error) { if (!error) return callback(); // if purchase failed, rollback the appdb record @@ -1161,7 +1161,7 @@ function uninstall(appId, auditSource, callback) { get(appId, function (error, app) { if (error) return callback(error); - appstore.unpurchase(appId, { appstoreId: app.appStoreId, manifestId: app.manifest.id }, function (error) { + appstore.unpurchaseApp(appId, { appstoreId: app.appStoreId, manifestId: app.manifest.id }, function (error) { if (error && error.reason === AppstoreError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND)); if (error && error.reason === AppstoreError.BILLING_REQUIRED) return callback(new AppsError(AppsError.BILLING_REQUIRED, error.message)); if (error && error.reason === AppstoreError.INVALID_TOKEN) return callback(new AppsError(AppsError.BILLING_REQUIRED, error.message)); diff --git a/src/appstore.js b/src/appstore.js index fb78f0a8c..14976e63e 100644 --- a/src/appstore.js +++ b/src/appstore.js @@ -7,8 +7,8 @@ exports = module.exports = { registerCloudron: registerCloudron, - purchase: purchase, - unpurchase: unpurchase, + purchaseApp: purchaseApp, + unpurchaseApp: unpurchaseApp, getSubscription: getSubscription, isFreePlan: isFreePlan, @@ -146,7 +146,7 @@ function isFreePlan(subscription) { } // See app.js install it will create a db record first but remove it again if appstore purchase fails -function purchase(data, callback) { +function purchaseApp(data, callback) { assert.strictEqual(typeof data, 'object'); // { appstoreId, manifestId, appId } assert(data.appstoreId || data.manifestId); assert.strictEqual(typeof data.appId, 'string'); @@ -170,7 +170,7 @@ function purchase(data, callback) { }); } -function unpurchase(appId, data, callback) { +function unpurchaseApp(appId, data, callback) { assert.strictEqual(typeof appId, 'string'); assert.strictEqual(typeof data, 'object'); // { appstoreId, manifestId } assert(data.appstoreId || data.manifestId); diff --git a/src/test/appstore-test.js b/src/test/appstore-test.js index 6fbd31352..43b3e441b 100644 --- a/src/test/appstore-test.js +++ b/src/test/appstore-test.js @@ -105,7 +105,7 @@ describe('Appstore', function () { .post(`/api/v1/cloudronapps?accessToken=${APPSTORE_TOKEN}`, function () { return true; }) .reply(201, {}); - appstore.purchase({ appId: APP_ID, appstoreId: APPSTORE_APP_ID, manifestId: APPSTORE_APP_ID }, function (error) { + appstore.purchaseApp({ appId: APP_ID, appstoreId: APPSTORE_APP_ID, manifestId: APPSTORE_APP_ID }, function (error) { expect(error).to.not.be.ok(); expect(scope1.isDone()).to.be.ok(); @@ -122,7 +122,7 @@ describe('Appstore', function () { .delete(`/api/v1/cloudronapps/${APP_ID}?accessToken=${APPSTORE_TOKEN}`, function () { return true; }) .reply(204, {}); - appstore.unpurchase(APP_ID, { appstoreId: APPSTORE_APP_ID, manifestId: APPSTORE_APP_ID }, function (error) { + appstore.unpurchaseApp(APP_ID, { appstoreId: APPSTORE_APP_ID, manifestId: APPSTORE_APP_ID }, function (error) { expect(error).to.not.be.ok(); expect(scope1.isDone()).to.be.ok(); expect(scope2.isDone()).to.not.be.ok(); @@ -140,7 +140,7 @@ describe('Appstore', function () { .delete(`/api/v1/cloudronapps/${APP_ID}?accessToken=${APPSTORE_TOKEN}`, function () { return true; }) .reply(204, {}); - appstore.unpurchase(APP_ID, { appstoreId: APPSTORE_APP_ID, manifestId: APPSTORE_APP_ID }, function (error) { + appstore.unpurchaseApp(APP_ID, { appstoreId: APPSTORE_APP_ID, manifestId: APPSTORE_APP_ID }, function (error) { expect(error).to.not.be.ok(); expect(scope1.isDone()).to.be.ok(); expect(scope2.isDone()).to.be.ok();