Merge branch 'main' into admin-billing

.discourse-compatibility

@@ -1,3 +0,0 @@
-< 3.3.0.beta1-dev: 0dcf17de59bdf82c0233bb630dad0ce407d1ae76
-3.1.999: c4f8220a5572ef9a42a9a71500e001d0df206c43
-2.9.0.beta9: 39b7253c082270e33839f4b0821fbf75abfdd826

.eslintrc

@@ -0,0 +1,6 @@
+{
+  "globals": {
+    "Stripe": true
+  },
+  "extends": "eslint-config-discourse"
+}

.eslintrc.cjs

@@ -1 +0,0 @@
-module.exports = require("@discourse/lint-configs/eslint");

.github/workflows/discourse-plugin.yml

@@ -1,11 +0,0 @@
-name: Discourse Plugin
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-
-jobs:
-  ci:
-    uses: discourse/.github/.github/workflows/discourse-plugin.yml@v1

.github/workflows/plugin-linting.yml

@@ -0,0 +1,57 @@
+name: Linting
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+concurrency:
+  group: plugin-linting-${{ format('{0}-{1}', github.head_ref || github.run_number, github.job) }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+          cache: yarn
+
+      - name: Yarn install
+        run: yarn install
+
+      - name: Set up ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+          bundler-cache: true
+
+      - name: ESLint
+        if: ${{ always() }}
+        run: yarn eslint --ext .js,.js.es6 --no-error-on-unmatched-pattern {test,assets}/javascripts
+
+      - name: Prettier
+        if: ${{ always() }}
+        shell: bash
+        run: |
+          yarn prettier -v
+          if [ 0 -lt $(find assets -type f \( -name "*.scss" -or -name "*.js" -or -name "*.es6" \) 2> /dev/null | wc -l) ]; then
+            yarn prettier --list-different "assets/**/*.{scss,js,es6}"
+          fi
+          if [ 0 -lt $(find test -type f \( -name "*.js" -or -name "*.es6" \) 2> /dev/null | wc -l) ]; then
+            yarn prettier --list-different "test/**/*.{js,es6}"
+          fi
+
+      - name: Ember template lint
+        if: ${{ always() }}
+        run: yarn ember-template-lint --no-error-on-unmatched-pattern assets/javascripts
+
+      - name: Rubocop
+        if: ${{ always() }}
+        run: bundle exec rubocop .

.github/workflows/plugin-tests.yml

@@ -0,0 +1,156 @@
+name: Plugin Tests
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+concurrency:
+  group: plugin-tests-${{ format('{0}-{1}', github.head_ref || github.run_number, github.job) }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: ${{ matrix.build_type }}
+    runs-on: ubuntu-latest
+    container: discourse/discourse_test:slim${{ startsWith(matrix.build_type, 'frontend') && '-browsers' || '' }}
+    timeout-minutes: 30
+
+    env:
+      DISCOURSE_HOSTNAME: www.example.com
+      RUBY_GLOBAL_METHOD_CACHE_SIZE: 131072
+      RAILS_ENV: test
+      PGUSER: discourse
+      PGPASSWORD: discourse
+
+    strategy:
+      fail-fast: false
+
+      matrix:
+        build_type: ["backend", "frontend-legacy", "frontend"]
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          repository: discourse/discourse
+          fetch-depth: 1
+
+      - name: Install plugin
+        uses: actions/checkout@v3
+        with:
+          path: plugins/${{ github.event.repository.name }}
+          fetch-depth: 1
+
+      - name: Setup Git
+        run: |
+          git config --global user.email "[email protected]"
+          git config --global user.name "Discourse CI"
+
+      - name: Start redis
+        run: |
+          redis-server /etc/redis/redis.conf &
+
+      - name: Start Postgres
+        run: |
+          chown -R postgres /var/run/postgresql
+          sudo -E -u postgres script/start_test_db.rb
+          sudo -u postgres psql -c "CREATE ROLE $PGUSER LOGIN SUPERUSER PASSWORD '$PGPASSWORD';"
+
+      - name: Bundler cache
+        uses: actions/cache@v3
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gem-
+
+      - name: Setup gems
+        run: |
+          gem install bundler --conservative -v $(awk '/BUNDLED WITH/ { getline; gsub(/ /,""); print $0 }' Gemfile.lock)
+          bundle config --local path vendor/bundle
+          bundle config --local deployment true
+          bundle config --local without development
+          bundle install --jobs 4
+          bundle clean
+
+      - name: Lint English locale
+        if: matrix.build_type == 'backend'
+        run: bundle exec ruby script/i18n_lint.rb "plugins/${{ github.event.repository.name }}/locales/{client,server}.en.yml"
+
+      - name: Get yarn cache directory
+        id: yarn-cache-dir
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - name: Yarn cache
+        uses: actions/cache@v3
+        id: yarn-cache
+        with:
+          path: ${{ steps.yarn-cache-dir.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: Yarn install
+        run: yarn install
+
+      - name: Fetch app state cache
+        uses: actions/cache@v3
+        id: app-cache
+        with:
+          path: tmp/app-cache
+          key: >-
+            ${{ hashFiles('.github/workflows/tests.yml') }}-
+            ${{ hashFiles('db/**/*', 'plugins/**/db/**/*') }}-
+
+      - name: Restore database from cache
+        if: steps.app-cache.outputs.cache-hit == 'true'
+        run: psql -f tmp/app-cache/cache.sql postgres
+
+      - name: Restore uploads from cache
+        if: steps.app-cache.outputs.cache-hit == 'true'
+        run: rm -rf public/uploads && cp -r tmp/app-cache/uploads public/uploads
+
+      - name: Create and migrate database
+        if: steps.app-cache.outputs.cache-hit != 'true'
+        run: |
+          bin/rake db:create
+          bin/rake db:migrate
+
+      - name: Dump database for cache
+        if: steps.app-cache.outputs.cache-hit != 'true'
+        run: mkdir -p tmp/app-cache && pg_dumpall > tmp/app-cache/cache.sql
+
+      - name: Dump uploads for cache
+        if: steps.app-cache.outputs.cache-hit != 'true'
+        run: rm -rf tmp/app-cache/uploads && cp -r public/uploads tmp/app-cache/uploads
+
+      - name: Check spec existence
+        id: check_spec
+        shell: bash
+        run: |
+          if [ 0 -lt $(find plugins/${{ github.event.repository.name }}/spec -type f -name "*.rb" 2> /dev/null | wc -l) ]; then
+            echo "::set-output name=files_exist::true"
+          fi
+
+      - name: Plugin RSpec
+        if: matrix.build_type == 'backend' && steps.check_spec.outputs.files_exist == 'true'
+        run: bin/rake plugin:spec[${{ github.event.repository.name }}]
+
+      - name: Check qunit existence
+        id: check_qunit
+        shell: bash
+        run: |
+          if [ 0 -lt $(find plugins/${{ github.event.repository.name }}/test/javascripts -type f \( -name "*.js" -or -name "*.es6" \) 2> /dev/null | wc -l) ]; then
+            echo "::set-output name=files_exist::true"
+          fi
+
+      - name: Plugin QUnit
+        if: matrix.build_type == 'frontend-legacy' && steps.check_qunit.outputs.files_exist == 'true'
+        run: QUNIT_EMBER_CLI=0 bundle exec rake plugin:qunit['${{ github.event.repository.name }}','1200000']
+        timeout-minutes: 10
+
+      - name: Plugin QUnit (Ember CLI)
+        if: matrix.build_type == 'frontend' && steps.check_qunit.outputs.files_exist == 'true'
+        run: QUNIT_EMBER_CLI=1 bundle exec rake plugin:qunit['${{ github.event.repository.name }}','1200000']
+        timeout-minutes: 10

.prettierrc

@@ -0,0 +1 @@
+{}

.prettierrc.cjs

@@ -1 +0,0 @@
-module.exports = require("@discourse/lint-configs/prettier");

.rubocop.yml

@@ -1,5 +1,5 @@
 inherit_gem:
-  rubocop-discourse: stree-compat.yml
+  rubocop-discourse: default.yml
 AllCops:
   Exclude:
     - "gems/**/*"

.streerc

@@ -1,2 +0,0 @@
---print-width=100
---plugins=plugin/trailing_comma

.template-lintrc.cjs

@@ -1 +0,0 @@
-module.exports = require("@discourse/lint-configs/template-lint");

.template-lintrc.js

@@ -0,0 +1,4 @@
+module.exports = {
+  plugins: ["ember-template-lint-plugin-discourse"],
+  extends: "discourse:recommended",
+};

Gemfile

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 group :development do
-  gem "translations-manager", git: "https://github.com/discourse/translations-manager.git"
-  gem "rubocop-discourse"
-  gem "syntax_tree"
+  gem 'translations-manager', git: 'https://github.com/discourse/translations-manager.git'
+  gem 'rubocop-discourse'
 end

Gemfile.lock

@@ -7,79 +7,38 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.3.2)
-      base64
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      connection_pool (>= 2.2.5)
-      drb
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
     ast (2.4.2)
-    base64 (0.2.0)
-    bigdecimal (3.1.6)
-    concurrent-ruby (1.2.3)
-    connection_pool (2.4.1)
-    drb (2.2.1)
-    i18n (1.14.3)
-      concurrent-ruby (~> 1.0)
-      racc (~> 1.7)
-    json (2.7.1)
-    language_server-protocol (3.17.0.3)
-    minitest (5.22.2)
-    mutex_m (0.2.0)
-    parallel (1.24.0)
-    parser (3.3.0.5)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
-      racc
-    prettier_print (1.2.1)
-    racc (1.7.3)
     rainbow (3.1.1)
-    regexp_parser (2.9.0)
-    rexml (3.2.6)
-    rubocop (1.62.0)
-      json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+    regexp_parser (2.5.0)
+    rexml (3.2.5)
+    rubocop (1.30.1)
       parallel (~> 1.10)
-      parser (>= 3.3.0.2)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.1)
-      parser (>= 3.3.0.4)
-    rubocop-capybara (2.20.0)
-      rubocop (~> 1.41)
-    rubocop-discourse (3.7.1)
-      activesupport (>= 6.1)
-      rubocop (>= 1.59.0)
-      rubocop-capybara (>= 2.0.0)
-      rubocop-factory_bot (>= 2.0.0)
-      rubocop-rspec (>= 2.25.0)
-    rubocop-factory_bot (2.25.1)
-      rubocop (~> 1.41)
-    rubocop-rspec (2.27.1)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
-    ruby-progressbar (1.13.0)
-    syntax_tree (6.2.0)
-      prettier_print (>= 1.2.0)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.18.0)
+      parser (>= 3.1.1.0)
+    rubocop-discourse (2.5.0)
+      rubocop (>= 1.1.0)
+      rubocop-rspec (>= 2.0.0)
+    rubocop-rspec (2.11.1)
+      rubocop (~> 1.19)
+    ruby-progressbar (1.11.0)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   rubocop-discourse
-  syntax_tree
   translations-manager!
 
 BUNDLED WITH
-   2.5.4
+   2.2.19

app/controllers/concerns/stripe.rb

@@ -9,8 +9,7 @@ module DiscourseSubscriptions
     end
 
     def is_stripe_configured?
-      SiteSetting.discourse_subscriptions_public_key.present? &&
-        SiteSetting.discourse_subscriptions_secret_key.present?
+      SiteSetting.discourse_subscriptions_public_key.present? && SiteSetting.discourse_subscriptions_secret_key.present?
     end
   end
 end

app/controllers/discourse_subscriptions/admin/coupons_controller.rb

@@ -5,9 +5,6 @@ module DiscourseSubscriptions
     class CouponsController < ::Admin::AdminController
       include DiscourseSubscriptions::Stripe
       include DiscourseSubscriptions::Group
-
-      requires_plugin DiscourseSubscriptions::PLUGIN_NAME
-
       before_action :set_api_key
 
       def index
@@ -21,24 +18,23 @@ module DiscourseSubscriptions
       end
 
       def create
-        params.require(%i[promo discount_type discount active])
+        params.require([:promo, :discount_type, :discount, :active])
         begin
-          coupon_params = { duration: "forever" }
+          coupon_params = {
+            duration: 'forever',
+          }
 
           case params[:discount_type]
-          when "amount"
+          when 'amount'
             coupon_params[:amount_off] = params[:discount].to_i * 100
             coupon_params[:currency] = SiteSetting.discourse_subscriptions_currency
-          when "percent"
+          when 'percent'
             coupon_params[:percent_off] = params[:discount]
           end
 
           coupon = ::Stripe::Coupon.create(coupon_params)
 
-          promo_code =
-            ::Stripe::PromotionCode.create(
-              { coupon: coupon[:id], code: params[:promo] },
-            ) if coupon.present?
+          promo_code = ::Stripe::PromotionCode.create({ coupon: coupon[:id], code: params[:promo] }) if coupon.present?
 
           render_json_dump promo_code
         rescue ::Stripe::InvalidRequestError => e
@@ -47,9 +43,14 @@ module DiscourseSubscriptions
       end
 
       def update
-        params.require(%i[id active])
+        params.require([:id, :active])
         begin
-          promo_code = ::Stripe::PromotionCode.update(params[:id], { active: params[:active] })
+          promo_code = ::Stripe::PromotionCode.update(
+            params[:id],
+            {
+              active: params[:active]
+            }
+          )
 
           render_json_dump promo_code
         rescue ::Stripe::InvalidRequestError => e

app/controllers/discourse_subscriptions/admin/plans_controller.rb

@@ -5,8 +5,6 @@ module DiscourseSubscriptions
     class PlansController < ::Admin::AdminController
       include DiscourseSubscriptions::Stripe
 
-      requires_plugin DiscourseSubscriptions::PLUGIN_NAME
-
       before_action :set_api_key
 
       def index
@@ -29,11 +27,15 @@ module DiscourseSubscriptions
             active: params[:active],
             metadata: {
               group_name: params[:metadata][:group_name],
-              trial_period_days: params[:trial_period_days],
-            },
+              trial_period_days: params[:trial_period_days]
+            }
           }
 
-          price_object[:recurring] = { interval: params[:interval] } if params[:type] == "recurring"
+          if params[:type] == 'recurring'
+            price_object[:recurring] = {
+              interval: params[:interval]
+            }
+          end
 
           plan = ::Stripe::Price.create(price_object)
 
@@ -54,16 +56,14 @@ module DiscourseSubscriptions
           end
 
           interval = nil
-          interval = plan[:recurring][:interval] if plan[:recurring] && plan[:recurring][:interval]
+          if plan[:recurring] && plan[:recurring][:interval]
+            interval = plan[:recurring][:interval]
+          end
 
-          serialized =
-            plan.to_h.merge(
-              trial_period_days: trial_days,
-              currency: plan[:currency].upcase,
-              interval: interval,
-            )
+          serialized = plan.to_h.merge(trial_period_days: trial_days, currency: plan[:currency].upcase, interval: interval)
 
           render_json_dump serialized
+
         rescue ::Stripe::InvalidRequestError => e
           render_json_error e.message
         end
@@ -71,16 +71,15 @@ module DiscourseSubscriptions
 
       def update
         begin
-          plan =
-            ::Stripe::Price.update(
-              params[:id],
-              nickname: params[:nickname],
-              active: params[:active],
-              metadata: {
-                group_name: params[:metadata][:group_name],
-                trial_period_days: params[:trial_period_days],
-              },
-            )
+          plan = ::Stripe::Price.update(
+            params[:id],
+            nickname: params[:nickname],
+            active: params[:active],
+            metadata: {
+              group_name: params[:metadata][:group_name],
+              trial_period_days: params[:trial_period_days]
+            }
+          )
 
           render_json_dump plan
         rescue ::Stripe::InvalidRequestError => e

app/controllers/discourse_subscriptions/admin/products_controller.rb

@@ -5,8 +5,6 @@ module DiscourseSubscriptions
     class ProductsController < ::Admin::AdminController
       include DiscourseSubscriptions::Stripe
 
-      requires_plugin DiscourseSubscriptions::PLUGIN_NAME
-
       before_action :set_api_key
 
       def index
@@ -29,15 +27,20 @@ module DiscourseSubscriptions
 
       def create
         begin
-          create_params = product_params.merge!(type: "service")
+          create_params = product_params.merge!(type: 'service')
 
-          create_params.except!(:statement_descriptor) if params[:statement_descriptor].blank?
+          if params[:statement_descriptor].blank?
+            create_params.except!(:statement_descriptor)
+          end
 
           product = ::Stripe::Product.create(create_params)
 
-          Product.create(external_id: product[:id])
+          Product.create(
+            external_id: product[:id]
+          )
 
           render_json_dump product
+
         rescue ::Stripe::InvalidRequestError => e
           render_json_error e.message
         end
@@ -48,6 +51,7 @@ module DiscourseSubscriptions
           product = ::Stripe::Product.retrieve(params[:id])
 
           render_json_dump product
+
         rescue ::Stripe::InvalidRequestError => e
           render_json_error e.message
         end
@@ -55,9 +59,13 @@ module DiscourseSubscriptions
 
       def update
         begin
-          product = ::Stripe::Product.update(params[:id], product_params)
+          product = ::Stripe::Product.update(
+            params[:id],
+            product_params
+          )
 
           render_json_dump product
+
         rescue ::Stripe::InvalidRequestError => e
           render_json_error e.message
         end
@@ -70,6 +78,7 @@ module DiscourseSubscriptions
           Product.delete_by(external_id: params[:id])
 
           render_json_dump product
+
         rescue ::Stripe::InvalidRequestError => e
           render_json_error e.message
         end
@@ -86,8 +95,8 @@ module DiscourseSubscriptions
           statement_descriptor: params[:statement_descriptor],
           metadata: {
             description: params.dig(:metadata, :description),
-            repurchaseable: params.dig(:metadata, :repurchaseable),
-          },
+            repurchaseable: params.dig(:metadata, :repurchaseable)
+          }
         }
       end
     end

app/controllers/discourse_subscriptions/admin/subscriptions_controller.rb

@@ -3,8 +3,6 @@
 module DiscourseSubscriptions
   module Admin
     class SubscriptionsController < ::Admin::AdminController
-      requires_plugin DiscourseSubscriptions::PLUGIN_NAME
-
       include DiscourseSubscriptions::Stripe
       include DiscourseSubscriptions::Group
       before_action :set_api_key
@@ -18,23 +16,20 @@ module DiscourseSubscriptions
             has_more: false,
             data: [],
             length: 0,
-            last_record: params[:last_record],
+            last_record: params[:last_record]
           }
 
           if subscription_ids.present? && is_stripe_configured?
             while subscriptions[:length] < PAGE_LIMIT
               current_set = get_subscriptions(subscriptions[:last_record])
 
-              until valid_subscriptions =
-                      find_valid_subscriptions(current_set[:data], subscription_ids)
+              until valid_subscriptions = find_valid_subscriptions(current_set[:data], subscription_ids) do
                 current_set = get_subscriptions(current_set[:data].last)
                 break if current_set[:has_more] == false
               end
 
               subscriptions[:data] = subscriptions[:data].concat(valid_subscriptions.to_a)
-              subscriptions[:last_record] = current_set[:data].last[:id] if current_set[
-                :data
-              ].present?
+              subscriptions[:last_record] = current_set[:data].last[:id] if current_set[:data].present?
               subscriptions[:length] = subscriptions[:data].length
               subscriptions[:has_more] = current_set[:has_more]
               break if subscriptions[:has_more] == false
@@ -55,11 +50,10 @@ module DiscourseSubscriptions
           refund_subscription(params[:id]) if params[:refund]
           subscription = ::Stripe::Subscription.delete(params[:id])
 
-          customer =
-            Customer.find_by(
-              product_id: subscription[:plan][:product],
-              customer_id: subscription[:customer],
-            )
+          customer = Customer.find_by(
+            product_id: subscription[:plan][:product],
+            customer_id: subscription[:customer]
+          )
 
           Subscription.delete_by(external_id: params[:id])
 
@@ -71,6 +65,7 @@ module DiscourseSubscriptions
           end
 
           render_json_dump subscription
+
         rescue ::Stripe::InvalidRequestError => e
           render_json_error e.message
         end
@@ -79,11 +74,7 @@ module DiscourseSubscriptions
       private
 
       def get_subscriptions(start)
-        ::Stripe::Subscription.list(
-          expand: ["data.plan.product"],
-          limit: PAGE_LIMIT,
-          starting_after: start,
-        )
+        ::Stripe::Subscription.list(expand: ['data.plan.product'], limit: PAGE_LIMIT, starting_after: start)
       end
 
       def find_valid_subscriptions(data, ids)
@@ -94,11 +85,11 @@ module DiscourseSubscriptions
       # this will only refund the most recent subscription payment
       def refund_subscription(subscription_id)
         subscription = ::Stripe::Subscription.retrieve(subscription_id)
-        invoice = ::Stripe::Invoice.retrieve(subscription[:latest_invoice]) if subscription[
-          :latest_invoice
-        ]
+        invoice = ::Stripe::Invoice.retrieve(subscription[:latest_invoice]) if subscription[:latest_invoice]
         payment_intent = invoice[:payment_intent] if invoice[:payment_intent]
-        refund = ::Stripe::Refund.create({ payment_intent: payment_intent })
+        refund = ::Stripe::Refund.create({
+          payment_intent: payment_intent,
+        })
       end
     end
   end

app/controllers/discourse_subscriptions/admin_controller.rb

@@ -2,8 +2,6 @@
 
 module DiscourseSubscriptions
   class AdminController < ::Admin::AdminController
-    requires_plugin DiscourseSubscriptions::PLUGIN_NAME
-
     def index
       head 200
     end

app/controllers/discourse_subscriptions/hooks_controller.rb

@@ -4,11 +4,7 @@ module DiscourseSubscriptions
   class HooksController < ::ApplicationController
     include DiscourseSubscriptions::Group
     include DiscourseSubscriptions::Stripe
-
-    requires_plugin DiscourseSubscriptions::PLUGIN_NAME
-
     layout false
-
     skip_before_action :check_xhr
     skip_before_action :redirect_to_login_if_required
     skip_before_action :verify_authenticity_token, only: [:create]
@@ -16,59 +12,71 @@ module DiscourseSubscriptions
     def create
       begin
         payload = request.body.read
-        sig_header = request.env["HTTP_STRIPE_SIGNATURE"]
+        sig_header = request.env['HTTP_STRIPE_SIGNATURE']
         webhook_secret = SiteSetting.discourse_subscriptions_webhook_secret
 
         event = ::Stripe::Webhook.construct_event(payload, sig_header, webhook_secret)
       rescue JSON::ParserError => e
-        return render_json_error e.message
+        render_json_error e.message
+        return
       rescue ::Stripe::SignatureVerificationError => e
-        return render_json_error e.message
+        render_json_error e.message
+        return
       end
 
       case event[:type]
-      when "customer.subscription.created"
-      when "customer.subscription.updated"
-        customer =
-          Customer.find_by(
-            customer_id: event[:data][:object][:customer],
-            product_id: event[:data][:object][:plan][:product],
-          )
+      when 'customer.subscription.updated'
+        customer = Customer.find_by(
+          customer_id: event[:data][:object][:customer],
+          product_id: event[:data][:object][:plan][:product]
+        )
 
-        return render_json_error "customer not found" if !customer
-        return head 200 if event[:data][:object][:status] != "complete"
-
-        user = ::User.find_by(id: customer.user_id)
-        return render_json_error "user not found" if !user
-
-        if group = plan_group(event[:data][:object][:plan])
-          group.add(user)
-        end
-      when "customer.subscription.deleted"
-        customer =
-          Customer.find_by(
-            customer_id: event[:data][:object][:customer],
-            product_id: event[:data][:object][:plan][:product],
-          )
-
-        return render_json_error "customer not found" if !customer
-
-        Subscription.find_by(
-          customer_id: customer.id,
-          external_id: event[:data][:object][:id],
-        )&.destroy!
-
-        user = ::User.find(customer.user_id)
-        return render_json_error "user not found" if !user
-
-        if group = plan_group(event[:data][:object][:plan])
-          group.remove(user)
+        if customer && subscription_completion?(event)
+          user = ::User.find(customer.user_id)
+          group = plan_group(event[:data][:object][:plan])
+          group.add(user) if group
         end
 
-        customer.destroy!
+      when 'customer.subscription.deleted'
+        delete_subscription(event)
       end
 
       head 200
     end
+
+    private
+
+    def subscription_completion?(event)
+      subscription_complete?(event) && previously_incomplete?(event)
+    end
+
+    def subscription_complete?(event)
+      event && event[:data] && event[:data][:object] && event[:data][:object][:status] && event[:data][:object][:status] == 'complete'
+    end
+
+    def previously_incomplete?(event)
+      event && event[:data] && event[:data][:previous_attributes] && event[:data][:previous_attributes][:status] && event[:data][:previous_attributes][:status] == 'incomplete'
+    end
+
+    def delete_subscription(event)
+      customer = Customer.find_by(
+        customer_id: event[:data][:object][:customer],
+        product_id: event[:data][:object][:plan][:product]
+      )
+
+      if customer
+        sub_model = Subscription.find_by(
+          customer_id: customer.id,
+          external_id: [:id]
+        )
+
+        sub_model.delete if sub_model
+
+        user = ::User.find(customer.user_id)
+        customer.delete
+        group = plan_group(event[:data][:object][:plan])
+        group.remove(user) if group
+      end
+    end
   end
 end

app/controllers/discourse_subscriptions/subscribe_controller.rb

@@ -4,14 +4,31 @@ module DiscourseSubscriptions
   class SubscribeController < ::ApplicationController
     include DiscourseSubscriptions::Stripe
     include DiscourseSubscriptions::Group
-
-    requires_plugin DiscourseSubscriptions::PLUGIN_NAME
-
     before_action :set_api_key
-    requires_login except: %i[index contributors show]
+    requires_login except: [:index, :contributors, :show]
 
     def index
-      head 200
+      begin
+        product_ids = Product.all.pluck(:external_id)
+        products = []
+
+        if product_ids.present? && is_stripe_configured?
+          response = ::Stripe::Product.list({
+            ids: product_ids,
+            active: true
+          })
+
+          products = response[:data].map do |p|
+            serialize_product(p)
+          end
+
+        end
+
+        render_json_dump products
+
+      rescue ::Stripe::InvalidRequestError => e
+        render_json_error e.message
+      end
     end
 
     def contributors
@@ -19,11 +36,7 @@ module DiscourseSubscriptions
       contributor_ids = Set.new
 
       campaign_product = SiteSetting.discourse_subscriptions_campaign_product
-      if campaign_product.present?
-        contributor_ids.merge(Customer.where(product_id: campaign_product).last(5).pluck(:user_id))
-      else
-        contributor_ids.merge(Customer.last(5).pluck(:user_id))
-      end
+      campaign_product.present? ? contributor_ids.merge(Customer.where(product_id: campaign_product).last(5).pluck(:user_id)) : contributor_ids.merge(Customer.last(5).pluck(:user_id))
 
       contributors = ::User.where(id: contributor_ids)
 
@@ -36,7 +49,10 @@ module DiscourseSubscriptions
         product = ::Stripe::Product.retrieve(params[:id])
         plans = ::Stripe::Price.list(active: true, product: params[:id])
 
-        response = { product: serialize_product(product), plans: serialize_plans(plans) }
+        response = {
+          product: serialize_product(product),
+          plans: serialize_plans(plans)
+        }
 
         render_json_dump response
       rescue ::Stripe::InvalidRequestError => e
@@ -45,60 +61,47 @@ module DiscourseSubscriptions
     end
 
     def create
-      params.require(%i[source plan])
+      params.require([:source, :plan])
       begin
-        customer =
-          find_or_create_customer(
-            params[:source],
-            params[:cardholder_name],
-            params[:cardholder_address],
-          )
+        customer = find_or_create_customer(params[:source])
         plan = ::Stripe::Price.retrieve(params[:plan])
 
         if params[:promo].present?
           promo_code = ::Stripe::PromotionCode.list({ code: params[:promo] })
           promo_code = promo_code[:data][0] # we assume promo codes have a unique name
 
-          if promo_code.blank?
-            return render_json_error I18n.t("js.discourse_subscriptions.subscribe.invalid_coupon")
-          end
+          return render_json_error I18n.t("js.discourse_subscriptions.subscribe.invalid_coupon") if promo_code.blank?
         end
 
-        recurring_plan = plan[:type] == "recurring"
+        recurring_plan = plan[:type] == 'recurring'
 
         if recurring_plan
-          trial_days = plan[:metadata][:trial_period_days] if plan[:metadata] &&
-            plan[:metadata][:trial_period_days]
+          trial_days = plan[:metadata][:trial_period_days] if plan[:metadata] && plan[:metadata][:trial_period_days]
 
           promo_code_id = promo_code[:id] if promo_code
 
-          transaction =
-            ::Stripe::Subscription.create(
-              customer: customer[:id],
-              items: [{ price: params[:plan] }],
-              metadata: metadata_user,
-              trial_period_days: trial_days,
-              promotion_code: promo_code_id,
-            )
+          transaction = ::Stripe::Subscription.create(
+            customer: customer[:id],
+            items: [{ price: params[:plan] }],
+            metadata: metadata_user,
+            trial_period_days: trial_days,
+            promotion_code: promo_code_id
+          )
 
-          payment_intent = retrieve_payment_intent(transaction[:latest_invoice]) if transaction[
-            :status
-          ] == "incomplete"
+          payment_intent = retrieve_payment_intent(transaction[:latest_invoice]) if transaction[:status] == 'incomplete'
         else
-          coupon_id = promo_code[:coupon][:id] if promo_code && promo_code[:coupon] &&
-            promo_code[:coupon][:id]
-          invoice_item =
-            ::Stripe::InvoiceItem.create(
-              customer: customer[:id],
-              price: params[:plan],
-              discounts: [{ coupon: coupon_id }],
-            )
-          invoice = ::Stripe::Invoice.create(customer: customer[:id])
+          coupon_id = promo_code[:coupon][:id] if promo_code && promo_code[:coupon] && promo_code[:coupon][:id]
+          invoice_item = ::Stripe::InvoiceItem.create(
+            customer: customer[:id],
+            price: params[:plan],
+            discounts: [{ coupon: coupon_id }]
+          )
+          invoice = ::Stripe::Invoice.create(
+            customer: customer[:id]
+          )
           transaction = ::Stripe::Invoice.finalize_invoice(invoice[:id])
-          payment_intent = retrieve_payment_intent(transaction[:id]) if transaction[:status] ==
-            "open"
-          transaction = ::Stripe::Invoice.pay(invoice[:id]) if payment_intent[:status] ==
-            "successful"
+          payment_intent = retrieve_payment_intent(transaction[:id]) if transaction[:status] == 'open'
+          transaction = ::Stripe::Invoice.pay(invoice[:id]) if payment_intent[:status] == 'successful'
         end
 
         finalize_transaction(transaction, plan) if transaction_ok(transaction)
@@ -112,7 +115,7 @@ module DiscourseSubscriptions
     end
 
     def finalize
-      params.require(%i[plan transaction])
+      params.require([:plan, :transaction])
       begin
         price = ::Stripe::Price.retrieve(params[:plan])
         transaction = retrieve_transaction(params[:transaction])
@@ -129,15 +132,17 @@ module DiscourseSubscriptions
 
       group.add(current_user) if group
 
-      customer =
-        Customer.create(
-          user_id: current_user.id,
-          customer_id: transaction[:customer],
-          product_id: plan[:product],
-        )
+      customer = Customer.create(
+        user_id: current_user.id,
+        customer_id: transaction[:customer],
+        product_id: plan[:product]
+      )
 
-      if transaction[:object] == "subscription"
-        Subscription.create(customer_id: customer.id, external_id: transaction[:id])
+      if transaction[:object] == 'subscription'
+        Subscription.create(
+          customer_id: customer.id,
+          external_id: transaction[:id]
+        )
       end
     end
 
@@ -149,47 +154,34 @@ module DiscourseSubscriptions
         name: product[:name],
         description: PrettyText.cook(product[:metadata][:description]),
         subscribed: current_user_products.include?(product[:id]),
-        repurchaseable: product[:metadata][:repurchaseable],
+        repurchaseable: product[:metadata][:repurchaseable]
       }
     end
 
     def current_user_products
       return [] if current_user.nil?
 
-      Customer.select(:product_id).where(user_id: current_user.id).map { |c| c.product_id }.compact
+      Customer
+        .select(:product_id)
+        .where(user_id: current_user.id)
+        .map { |c| c.product_id }.compact
     end
 
     def serialize_plans(plans)
-      plans[:data]
-        .map { |plan| plan.to_h.slice(:id, :unit_amount, :currency, :type, :recurring) }
-        .sort_by { |plan| plan[:amount] }
+      plans[:data].map do |plan|
+        plan.to_h.slice(:id, :unit_amount, :currency, :type, :recurring)
+      end.sort_by { |plan| plan[:amount] }
     end
 
-    def find_or_create_customer(source, cardholder_name = nil, cardholder_address = nil)
+    def find_or_create_customer(source)
       customer = Customer.find_by_user_id(current_user.id)
-      cardholder_address =
-        (
-          if cardholder_address.present?
-            {
-              line1: cardholder_address[:line1],
-              city: cardholder_address[:city],
-              state: cardholder_address[:state],
-              country: cardholder_address[:country],
-              postal_code: cardholder_address[:postalCode],
-            }
-          else
-            nil
-          end
-        )
 
       if customer.present?
         ::Stripe::Customer.retrieve(customer.customer_id)
       else
         ::Stripe::Customer.create(
           email: current_user.email,
-          source: source,
-          name: cardholder_name,
-          address: cardholder_address,
+          source: source
         )
       end
     end

app/controllers/discourse_subscriptions/user/payments_controller.rb

@@ -4,9 +4,6 @@ module DiscourseSubscriptions
   module User
     class PaymentsController < ::ApplicationController
       include DiscourseSubscriptions::Stripe
-
-      requires_plugin DiscourseSubscriptions::PLUGIN_NAME
-
       before_action :set_api_key
       requires_login
 
@@ -25,8 +22,7 @@ module DiscourseSubscriptions
               invoices_with_products = parse_invoices(all_invoices, product_ids)
               invoice_ids = invoices_with_products.map { |invoice| invoice[:id] }
               payments = ::Stripe::PaymentIntent.list(customer: customer_id)
-              payments_from_invoices =
-                payments[:data].select { |payment| invoice_ids.include?(payment[:invoice]) }
+              payments_from_invoices = payments[:data].select { |payment| invoice_ids.include?(payment[:invoice]) }
               data = data | payments_from_invoices
             end
           end
@@ -34,6 +30,7 @@ module DiscourseSubscriptions
           data = data.sort_by { |pmt| pmt[:created] }.reverse
 
           render_json_dump data
+
         rescue ::Stripe::InvalidRequestError => e
           render_json_error e.message
         end
@@ -42,19 +39,16 @@ module DiscourseSubscriptions
       private
 
       def parse_invoices(all_invoices, product_ids)
-        invoices_with_products =
-          all_invoices[:data].select do |invoice|
-            invoice_lines = invoice[:lines][:data][0] if invoice[:lines] && invoice[:lines][:data]
-            invoice_product_id = parse_invoice_lines(invoice_lines)
-            product_ids.include?(invoice_product_id)
-          end
+        invoices_with_products = all_invoices[:data].select do |invoice|
+          invoice_lines = invoice[:lines][:data][0] if invoice[:lines] && invoice[:lines][:data]
+          invoice_product_id = parse_invoice_lines(invoice_lines)
+          product_ids.include?(invoice_product_id)
+        end
       end
 
       def parse_invoice_lines(invoice_lines)
-        invoice_product_id = invoice_lines[:price][:product] if invoice_lines[:price] &&
-          invoice_lines[:price][:product]
-        invoice_product_id = invoice_lines[:plan][:product] if invoice_lines[:plan] &&
-          invoice_lines[:plan][:product]
+        invoice_product_id = invoice_lines[:price][:product] if invoice_lines[:price] && invoice_lines[:price][:product]
+        invoice_product_id = invoice_lines[:plan][:product] if invoice_lines[:plan] && invoice_lines[:plan][:product]
         invoice_product_id
       end
     end

app/controllers/discourse_subscriptions/user/subscriptions_controller.rb

@@ -5,9 +5,6 @@ module DiscourseSubscriptions
     class SubscriptionsController < ::ApplicationController
       include DiscourseSubscriptions::Stripe
       include DiscourseSubscriptions::Group
-
-      requires_plugin DiscourseSubscriptions::PLUGIN_NAME
-
       before_action :set_api_key
       requires_login
 
@@ -15,21 +12,24 @@ module DiscourseSubscriptions
         begin
           customer = Customer.where(user_id: current_user.id)
           customer_ids = customer.map { |c| c.id } if customer
-          subscription_ids =
-            Subscription.where("customer_id in (?)", customer_ids).pluck(
-              :external_id,
-            ) if customer_ids
+          subscription_ids = Subscription.where("customer_id in (?)", customer_ids).pluck(:external_id) if customer_ids
 
           subscriptions = []
 
           if subscription_ids
-            plans = ::Stripe::Price.list(expand: ["data.product"], limit: 100)
+            plans = ::Stripe::Price.list(
+              expand: ['data.product'],
+              limit: 100
+            )
 
-            customers =
-              ::Stripe::Customer.list(email: current_user.email, expand: ["data.subscriptions"])
+            customers = ::Stripe::Customer.list(
+              email: current_user.email,
+              expand: ['data.subscriptions']
+            )
 
-            subscriptions =
-              customers[:data].map { |sub_customer| sub_customer[:subscriptions][:data] }.flatten(1)
+            subscriptions = customers[:data].map do |sub_customer|
+              sub_customer[:subscriptions][:data]
+            end.flatten(1)
 
             subscriptions = subscriptions.select { |sub| subscription_ids.include?(sub[:id]) }
 
@@ -41,6 +41,7 @@ module DiscourseSubscriptions
           end
 
           render_json_dump subscriptions
+
         rescue ::Stripe::InvalidRequestError => e
           render_json_error e.message
         end
@@ -50,41 +51,18 @@ module DiscourseSubscriptions
         # we cancel but don't remove until the end of the period
         # full removal is done via webhooks
         begin
-          subscription = ::Stripe::Subscription.update(params[:id], { cancel_at_period_end: true })
+          subscription = ::Stripe::Subscription.update(params[:id], { cancel_at_period_end: true, })
 
           if subscription
             render_json_dump subscription
           else
-            render_json_error I18n.t("discourse_subscriptions.customer_not_found")
+            render_json_error I18n.t('discourse_subscriptions.customer_not_found')
           end
+
         rescue ::Stripe::InvalidRequestError => e
           render_json_error e.message
         end
       end
-
-      def update
-        params.require(:payment_method)
-
-        subscription = Subscription.where(external_id: params[:id]).first
-        begin
-          attach_method_to_customer(subscription.customer_id, params[:payment_method])
-          subscription =
-            ::Stripe::Subscription.update(
-              params[:id],
-              { default_payment_method: params[:payment_method] },
-            )
-          render json: success_json
-        rescue ::Stripe::InvalidRequestError
-          render_json_error I18n.t("discourse_subscriptions.card.invalid")
-        end
-      end
-
-      private
-
-      def attach_method_to_customer(customer_id, method)
-        customer = Customer.find(customer_id)
-        ::Stripe::PaymentMethod.attach(method, { customer: customer.customer_id })
-      end
     end
   end
 end

app/jobs/regular/manually_update_campaign_data.rb

@@ -2,6 +2,7 @@
 
 module ::Jobs
   class ManuallyUpdateCampaignData < ::Jobs::Base
+
     def execute(args)
       return unless SiteSetting.discourse_subscriptions_campaign_enabled
       DiscourseSubscriptions::Campaign.new.refresh_data

app/serializers/discourse_subscriptions/payment_serializer.rb

@@ -2,14 +2,14 @@
 
 module DiscourseSubscriptions
   class PaymentSerializer < ApplicationSerializer
-    attributes :payment_intent_id,
-               :receipt_email,
-               :url,
-               :created_at_age,
-               :amount,
-               :amount_currency,
-               :username,
-               :user_id
+    attributes  :payment_intent_id,
+                :receipt_email,
+                :url,
+                :created_at_age,
+                :amount,
+                :amount_currency,
+                :username,
+                :user_id
 
     def created_at_age
       Time.now - object.created_at
@@ -19,7 +19,7 @@ module DiscourseSubscriptions
       ActiveSupport::NumberHelper.number_to_currency(
         object.amount / 100,
         precision: 2,
-        unit: currency_unit,
+        unit: currency_unit
       )
     end
 
@@ -32,7 +32,7 @@ module DiscourseSubscriptions
     def user
       begin
         User.find(object.user_id)
-      rescue StandardError
+      rescue
         nil
       end
     end
@@ -51,8 +51,6 @@ module DiscourseSubscriptions
         "KR"
       when "sgd"
         "S$"
-      when "zar"
-        "R"
       else
         "$"
       end

app/services/discourse_subscriptions/campaign.rb

@@ -23,7 +23,9 @@ module DiscourseSubscriptions
 
       # Fetch product purchases
       one_time_payments = get_one_time_payments(product_ids)
-      one_time_payments.each { |c| amount += c[:price].to_f / 100.00 }
+      one_time_payments.each do |c|
+        amount += c[:price].to_f / 100.00
+      end
 
       # get number of subscribers
       SiteSetting.discourse_subscriptions_campaign_subscribers = subscriptions&.length.to_i
@@ -55,7 +57,7 @@ module DiscourseSubscriptions
     protected
 
     def goal_met_date_key
-      "subscriptions_goal_met_date"
+      'subscriptions_goal_met_date'
     end
 
     def check_goal_status
@@ -89,9 +91,9 @@ module DiscourseSubscriptions
         SiteSetting.discourse_subscriptions_campaign_group = group[:id]
 
         params = {
-          full_name: I18n.t("js.discourse_subscriptions.campaign.supporters"),
-          title: I18n.t("js.discourse_subscriptions.campaign.supporter"),
-          flair_icon: "donate",
+          full_name: I18n.t('js.discourse_subscriptions.campaign.supporters'),
+          title: I18n.t('js.discourse_subscriptions.campaign.supporter'),
+          flair_icon: "donate"
         }
 
         group.update(params)
@@ -102,11 +104,11 @@ module DiscourseSubscriptions
 
     def create_campaign_product
       product_params = {
-        name: I18n.t("js.discourse_subscriptions.campaign.title"),
+        name: I18n.t('js.discourse_subscriptions.campaign.title'),
         active: true,
         metadata: {
-          description: I18n.t("js.discourse_subscriptions.campaign.body"),
-        },
+          description: I18n.t('js.discourse_subscriptions.campaign.body'),
+        }
       }
 
       product = ::Stripe::Product.create(product_params)
@@ -121,9 +123,13 @@ module DiscourseSubscriptions
       monthly_prices = [3, 5, 10, 25]
       yearly_prices = [50, 100]
 
-      monthly_prices.each { |price| create_price(product[:id], group, price, "month") }
+      monthly_prices.each do |price|
+        create_price(product[:id], group, price, "month")
+      end
 
-      yearly_prices.each { |price| create_price(product[:id], group, price, "year") }
+      yearly_prices.each do |price|
+        create_price(product[:id], group, price, "year")
+      end
     end
 
     def create_price(product_id, group_name, amount, recurrence)
@@ -134,11 +140,11 @@ module DiscourseSubscriptions
         currency: SiteSetting.discourse_subscriptions_currency,
         active: true,
         recurring: {
-          interval: recurrence,
+          interval: recurrence
         },
         metadata: {
-          group_name: group_name,
-        },
+          group_name: group_name
+        }
       }
 
       plan = ::Stripe::Price.create(price_object)
@@ -146,13 +152,18 @@ module DiscourseSubscriptions
 
     def get_one_time_payments(product_ids)
       one_time_payments = []
-      current_set = { has_more: true, last_record: nil }
+      current_set = {
+        has_more: true,
+        last_record: nil
+      }
 
       if product_ids.present?
         # lots of matching because the Stripe API doesn't make it easy to match products => payments except from invoices
         until current_set[:has_more] == false
-          all_invoices =
-            ::Stripe::Invoice.list(limit: 100, starting_after: current_set[:last_record])
+          all_invoices = ::Stripe::Invoice.list(
+            limit: 100,
+            starting_after: current_set[:last_record]
+          )
 
           current_set[:last_record] = all_invoices[:data].last[:id] if all_invoices[:data].present?
           current_set[:has_more] = all_invoices[:has_more]
@@ -162,8 +173,11 @@ module DiscourseSubscriptions
             next if invoice[:paid] != true
             line_item = invoice[:lines][:data][0] if invoice[:lines] && invoice[:lines][:data] # Discourse only makes single-line item charges
             # check if non-subscription and that the plan is active
-            if line_item[:plan] == nil && line_item[:price] &&
-                 line_item[:price][:recurring] == nil && line_item[:price][:active] == true
+            if line_item[:plan] == nil &&
+               line_item[:price] &&
+               line_item[:price][:recurring] == nil &&
+               line_item[:price][:active] == true
+
               product_id = line_item[:price][:product]
               if product_ids.include? product_id
                 line_data = {
@@ -183,15 +197,17 @@ module DiscourseSubscriptions
 
     def get_subscription_data
       subscriptions = []
-      current_set = { has_more: true, last_record: nil }
+      current_set = {
+        has_more: true,
+        last_record: nil
+      }
 
       until current_set[:has_more] == false
-        current_set =
-          ::Stripe::Subscription.list(
-            expand: ["data.plan.product"],
-            limit: 100,
-            starting_after: current_set[:last_record],
-          )
+        current_set = ::Stripe::Subscription.list(
+          expand: ['data.plan.product'],
+          limit: 100,
+          starting_after: current_set[:last_record]
+        )
 
         current_set[:last_record] = current_set[:data].last[:id] if current_set[:data].present?
         subscriptions.concat(current_set[:data].to_a)
@@ -201,14 +217,13 @@ module DiscourseSubscriptions
     end
 
     def filter_to_subscriptions_products(data, ids)
-      valid =
-        data.select do |sub|
-          # cannot .dig stripe objects
-          items = sub[:items][:data][0] if sub[:items] && sub[:items][:data]
-          product = items[:price][:product] if items[:price] && items[:price][:product]
+      valid = data.select do |sub|
+        # cannot .dig stripe objects
+        items = sub[:items][:data][0] if sub[:items] && sub[:items][:data]
+        product = items[:price][:product] if items[:price] && items[:price][:product]
 
-          ids.include?(product)
-        end
+        ids.include?(product)
+      end
       valid.empty? ? nil : valid
     end
 

assets/javascripts/discourse/components/campaign-banner.js

@@ -1,11 +1,11 @@
-import Component from "@ember/component";
 import { action } from "@ember/object";
+import { ajax } from "discourse/lib/ajax";
 import { equal } from "@ember/object/computed";
+import { setting } from "discourse/lib/computed";
+import Component from "@ember/component";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { later } from "@ember/runloop";
 import { inject as service } from "@ember/service";
-import { ajax } from "discourse/lib/ajax";
-import { setting } from "discourse/lib/computed";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
 
 const SIDEBAR_BODY_CLASS = "subscription-campaign-sidebar";
 
@@ -58,14 +58,12 @@ export default Component.extend({
     }
 
     if (this.currentUser && this.showContributors) {
-      return ajax("/subscriptions/contributors", { method: "get" }).then(
-        (result) => {
-          this.setProperties({
-            contributors: result,
-            loading: false,
-          });
-        }
-      );
+      return ajax("/s/contributors", { method: "get" }).then((result) => {
+        this.setProperties({
+          contributors: result,
+          loading: false,
+        });
+      });
     }
   },
 
@@ -98,7 +96,6 @@ export default Component.extend({
   },
 
   willDestroyElement() {
-    this._super(...arguments);
     document.body.classList.remove(SIDEBAR_BODY_CLASS);
   },
 

assets/javascripts/discourse/components/create-coupon-form.hbs

@@ -1,50 +0,0 @@
-<div class="create-coupon-form">
-  <form class="form-horizontal">
-    <p>
-      <label for="promo_code">
-        {{i18n "discourse_subscriptions.admin.coupons.promo_code"}}
-      </label>
-      <Input @type="text" name="promo_code" @value={{promoCode}} />
-    </p>
-
-    <p>
-      <label for="amount">
-        {{i18n "discourse_subscriptions.admin.coupons.discount"}}
-      </label>
-      <ComboBox
-        @content={{discountTypes}}
-        @value={{discountType}}
-        @onChange={{action (mut discountType)}}
-      />
-      <Input
-        class="discount-amount"
-        @type="text"
-        name="amount"
-        @value={{discount}}
-      />
-    </p>
-
-    <p>
-      <label for="active">
-        {{i18n "discourse_subscriptions.admin.coupons.active"}}
-      </label>
-      <Input @type="checkbox" name="active" @checked={{active}} />
-    </p>
-  </form>
-
-  <DButton
-    @action={{action "createNewCoupon"}}
-    @label="discourse_subscriptions.admin.coupons.create"
-    @title="discourse_subscriptions.admin.coupons.create"
-    @icon="plus"
-    class="btn-primary btn btn-icon"
-  />
-
-  <DButton
-    @action={{action "cancelCreate"}}
-    label="cancel"
-    @title="cancel"
-    @icon="times"
-    class="btn btn-icon"
-  />
-</div>

assets/javascripts/discourse/components/ds-button.js

@@ -0,0 +1,12 @@
+import Button from "discourse/components/d-button";
+
+export default Button.extend({
+  seleted: false,
+
+  init() {
+    this._super(...arguments);
+    this.classNameBindings = this.classNameBindings.concat(
+      "selected:btn-primary"
+    );
+  },
+});