actionmailbox 0.1.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56440a6cdfeaf77350754266fba5e3e00ab5abf8e05518b22bccd76f69c80f1a
-  data.tar.gz: 1a3e0968725439b1b38f96f5e50c946e5b593f444946e40ed5dea94176d0ef14
+  metadata.gz: d73a94090d155c671b5beee6e20ef185787acb97cfda037847566d969cfaac35
+  data.tar.gz: d8cf0465ec49fb877f65aeaa11b4247f1039644d361da05a9f496207b0fff7f6
 SHA512:
-  metadata.gz: d28565e5cc3851cc5a33fb93d3989f93351b2346e64c737d576b1b4d3cef41b01f92aba573e394e9d66e34ff602c9d99ac302daafa50199f84abda8c9213cb22
-  data.tar.gz: 07ceb50601e8094c74c5217cf9546fb542682e77471161eeab7f73469826cfde43531d6a3e5731e26142eed509f2eea99381f671864337847be4ad14a9bbc1ac
+  metadata.gz: cc61055abaa0d10c34c37a97dcab707a89a87a31e810033832b78aae03a2212b705d1bde9fcdb05a0ad5ccd822e0989ba6fbea748ebe839671dfdacbf8f2c368
+  data.tar.gz: e7a2831fc8273b23ca3daf1048607f32cefc2785ad238cecc74b79379a8b4ec2350d9b73d77f42cf8e26746e57eabe161f6b685a774697f517cda1cc2f53cb83

data/CHANGELOG.md

@@ -0,0 +1,36 @@
+## Rails 6.0.0 (August 16, 2019) ##
+
+*   Fix Bcc header not being included with emails from `create_inbound_email_from` test helpers.
+
+    *jduff*
+
+
+## Rails 6.0.0.rc2 (July 22, 2019) ##
+
+*   No changes.
+
+
+## Rails 6.0.0.rc1 (April 24, 2019) ##
+
+*   No changes.
+
+
+## Rails 6.0.0.beta3 (March 11, 2019) ##
+
+*   No changes.
+
+
+## Rails 6.0.0.beta2 (February 25, 2019) ##
+
+*   Allow skipping incineration of processed emails.
+
+    This can be done by setting `config.action_mailbox.incinerate` to `false`.
+
+    *Pratik Naik*
+
+
+## Rails 6.0.0.beta1 (January 18, 2019) ##
+
+*   Added to Rails.
+
+    *DHH*

data/{LICENSE → MIT-LICENSE}

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Basecamp, LLC
+Copyright (c) 2019 Basecamp, LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,277 +1,12 @@
 # Action Mailbox
 
-Action Mailbox routes incoming emails to controller-like mailboxes for processing in Rails. It ships with ingresses for Amazon SES, Mailgun, Mandrill, and SendGrid. You can also handle inbound mails directly via the built-in Postfix ingress.
+Action Mailbox routes incoming emails to controller-like mailboxes for processing in Rails. It ships with ingresses for Mailgun, Mandrill, Postmark, and SendGrid. You can also handle inbound mails directly via the built-in Exim, Postfix, and Qmail ingresses.
 
 The inbound emails are turned into `InboundEmail` records using Active Record and feature lifecycle tracking, storage of the original email on cloud storage via Active Storage, and responsible data handling with on-by-default incineration.
 
 These inbound emails are routed asynchronously using Active Job to one or several dedicated mailboxes, which are capable of interacting directly with the rest of your domain model.
 
-
-## How does this compare to Action Mailer's inbound processing?
-
-Rails has long had an anemic way of [receiving emails using Action Mailer](https://guides.rubyonrails.org/action_mailer_basics.html#receiving-emails), but it was poorly flushed out, lacked cohesion with the task of sending emails, and offered no help on integrating with popular inbound email processing platforms. Action Mailbox supersedes the receiving part of Action Mailer, which will be deprecated in due course.
-
-
-## Installing
-
-Assumes a Rails 5.2+ application:
-
-1. Install the gem:
-
-    ```ruby
-    # Gemfile
-    gem "actionmailbox", github: "rails/actionmailbox", require: "action_mailbox"
-    ```
-
-1. Install migrations needed for InboundEmail (and ensure Active Storage is setup)
-
-   ```
-   ./bin/rails action_mailbox:install
-   ./bin/rails db:migrate
-   ```
-
-## Configuring
-
-### Amazon SES
-
-1. Install the [`aws-sdk-sns`](https://rubygems.org/gems/aws-sdk-sns) gem:
-
-   ```ruby
-   # Gemfile
-   gem "aws-sdk-sns", ">= 1.9.0", require: false
-   ```
-
-2. Tell Action Mailbox to accept emails from SES:
-
-   ```ruby
-   # config/environments/production.rb
-   config.action_mailbox.ingress = :amazon
-   ```
-
-3. [Configure SES][ses-docs] to deliver emails to your application via POST requests
-   to `/rails/action_mailbox/amazon/inbound_emails`. If your application lived at `https://example.com`, you would specify
-   the fully-qualified URL `https://example.com/rails/action_mailbox/amazon/inbound_emails`.
-
-[ses-docs]: https://docs.aws.amazon.com/ses/latest/DeveloperGuide/receiving-email-notifications.html
-
-### Mailgun
-
-1. Give Action Mailbox your [Mailgun API key][mailgun-api-key] so it can authenticate requests to the Mailgun ingress.
-
-   Use `rails credentials:edit` to add your API key to your application's encrypted credentials under
-   `action_mailbox.mailgun_api_key`, where Action Mailbox will automatically find it:
-
-   ```yaml
-   action_mailbox:
-     mailgun_api_key: ...
-   ```
-
-   Alternatively, provide your API key in the `MAILGUN_INGRESS_API_KEY` environment variable.
-
-2. Tell Action Mailbox to accept emails from Mailgun:
-
-   ```ruby
-   # config/environments/production.rb
-   config.action_mailbox.ingress = :mailgun
-   ```
-
-3. [Configure Mailgun][mailgun-forwarding] to forward inbound emails to `/rails/action_mailbox/mailgun/inbound_emails/mime`.
-   If your application lived at `https://example.com`, you would specify the fully-qualified URL
-   `https://example.com/rails/action_mailbox/mailgun/inbound_emails/mime`.
-
-[mailgun-api-key]: https://help.mailgun.com/hc/en-us/articles/203380100-Where-can-I-find-my-API-key-and-SMTP-credentials-
-[mailgun-forwarding]: https://documentation.mailgun.com/en/latest/user_manual.html#receiving-forwarding-and-storing-messages
-
-### Mandrill
-
-1. Give Action Mailbox your Mandrill API key so it can authenticate requests to the Mandrill ingress.
-
-   Use `rails credentials:edit` to add your API key to your application's encrypted credentials under
-   `action_mailbox.mandrill_api_key`, where Action Mailbox will automatically find it:
-
-   ```yaml
-   action_mailbox:
-     mandrill_api_key: ...
-   ```
-
-   Alternatively, provide your API key in the `MANDRILL_INGRESS_API_KEY` environment variable.
-
-2. Tell Action Mailbox to accept emails from Mandrill:
-
-   ```ruby
-   # config/environments/production.rb
-   config.action_mailbox.ingress = :mandrill
-   ```
-
-3. [Configure Mandrill][mandrill-routing] to route inbound emails to `/rails/action_mailbox/mandrill/inbound_emails`.
-   If your application lived at `https://example.com`, you would specify the fully-qualified URL
-   `https://example.com/rails/action_mailbox/mandrill/inbound_emails`.
-
-[mandrill-routing]: https://mandrill.zendesk.com/hc/en-us/articles/205583197-Inbound-Email-Processing-Overview
-
-### Postfix
-
-1. Tell Action Mailbox to accept emails from Postfix:
-
-   ```ruby
-   # config/environments/production.rb
-   config.action_mailbox.ingress = :postfix
-   ```
-
-2. Generate a strong password that Action Mailbox can use to authenticate requests to the Postfix ingress.
-
-   Use `rails credentials:edit` to add the password to your application's encrypted credentials under
-   `action_mailbox.ingress_password`, where Action Mailbox will automatically find it:
-
-   ```yaml
-   action_mailbox:
-     ingress_password: ...
-   ```
-
-   Alternatively, provide the password in the `RAILS_INBOUND_EMAIL_PASSWORD` environment variable.
-
-3. [Configure Postfix][postfix-config] to pipe inbound emails to `bin/rails action_mailbox:ingress:postfix`, providing
-   the `URL` of the Postfix ingress and the `INGRESS_PASSWORD` you previously generated. If your application lived at
-   `https://example.com`, the full command would look like this:
-
-   ```
-   URL=https://example.com/rails/action_mailbox/postfix/inbound_emails INGRESS_PASSWORD=... bin/rails action_mailbox:ingress:postfix
-   ```
-
-[postfix-config]: https://serverfault.com/questions/258469/how-to-configure-postfix-to-pipe-all-incoming-email-to-a-script
-
-### SendGrid
-
-1. Tell Action Mailbox to accept emails from SendGrid:
-
-   ```ruby
-   # config/environments/production.rb
-   config.action_mailbox.ingress = :sendgrid
-   ```
-
-2. Generate a strong password that Action Mailbox can use to authenticate requests to the SendGrid ingress.
-
-   Use `rails credentials:edit` to add the password to your application's encrypted credentials under
-   `action_mailbox.ingress_password`, where Action Mailbox will automatically find it:
-
-   ```yaml
-   action_mailbox:
-     ingress_password: ...
-   ```
-
-   Alternatively, provide the password in the `RAILS_INBOUND_EMAIL_PASSWORD` environment variable.
-
-3. [Configure SendGrid Inbound Parse][sendgrid-config] to forward inbound emails to
-   `/rails/action_mailbox/sendgrid/inbound_emails` with the username `actionmailbox` and the password you previously
-   generated. If your application lived at `https://example.com`, you would configure SendGrid with the following URL:
-
-   ```
-   https://actionmailbox:PASSWORD@example.com/rails/action_mailbox/sendgrid/inbound_emails
-   ```
-
-   **⚠️ Note:** When configuring your SendGrid Inbound Parse webhook, be sure to check the box labeled **“Post the raw,
-   full MIME message.”** Action Mailbox needs the raw MIME message to work.
-
-[sendgrid-config]: https://sendgrid.com/docs/for-developers/parsing-email/setting-up-the-inbound-parse-webhook/
-
-
-## Examples
-
-Configure basic routing:
-
-```ruby
-# app/models/message.rb
-class ApplicationMailbox < ActionMailbox::Base
-  routing /^save@/i     => :forwards
-  routing /@replies\./i => :replies
-end
-```
-
-Then setup a mailbox:
-
-```ruby
-# app/mailboxes/forwards_mailbox.rb
-class ForwardsMailbox < ApplicationMailbox
-  # Callbacks specify prerequisites to processing
-  before_processing :require_forward
-
-  def process
-    if forwarder.buckets.one?
-      record_forward
-    else
-      stage_forward_and_request_more_details
-    end
-  end
-
-  private
-    def require_forward
-      unless message.forward?
-        # Use Action Mailers to bounce incoming emails back to sender – this halts processing
-        bounce_with Forwards::BounceMailer.missing_forward(
-          inbound_email, forwarder: forwarder
-        )
-      end
-    end
-
-    def forwarder
-      @forwarder ||= Person.where(email_address: mail.from)
-    end
-
-    def record_forward
-      forwarder.buckets.first.record \
-        Forward.new forwarder: forwarder, subject: message.subject, content: mail.content
-    end
-
-    def stage_forward_and_request_more_details
-      Forwards::RoutingMailer.choose_project(mail).deliver_now
-    end
-end
-```
-
-## Incineration of InboundEmails
-
-By default, an InboundEmail that has been successfully processed will be incinerated after 30 days. This ensures you're not holding on to people's data willy-nilly after they may have canceled their accounts or deleted their content. The intention is that after you've processed an email, you should have extracted all the data you needed and turned it into domain models and content on your side of the application. The InboundEmail simply stays in the system for the extra time to provide debugging and forensics options.
-
-The actual incineration is done via the `IncinerationJob` that's scheduled to run after `config.action_mailbox.incinerate_after` time. This value is by default set to `30.days`, but you can change it in your production.rb configuration. (Note that this far-future incineration scheduling relies on your job queue being able to hold jobs for that long.)
-
-
-## Working with Action Mailbox in development
-
-It's helpful to be able to test incoming emails in development without actually sending and receiving real emails. To accomplish this, there's a conductor controller mounted at `/rails/conductor/action_mailbox/inbound_emails`, which gives you an index of all the InboundEmails in the system, their state of processing, and a form to create a new InboundEmail as well.
-
-
-## Testing mailboxes
-
-Example:
-
-```ruby
-class ForwardsMailboxTest < ActionMailbox::TestCase
-  test "directly recording a client forward for a forwarder and forwardee corresponding to one project" do
-    assert_difference -> { people(:david).buckets.first.recordings.count } do
-      receive_inbound_email_from_mail \
-        to: 'save@example.com',
-        from: people(:david).email_address,
-        subject: "Fwd: Status update?",
-        body: <<~BODY
-          --- Begin forwarded message ---
-          From: Frank Holland <frank@microsoft.com>
-
-          What's the status?
-        BODY
-    end
-
-    recording = people(:david).buckets.first.recordings.last
-    assert_equal people(:david), recording.creator
-    assert_equal "Status update?", recording.forward.subject
-    assert_match "What's the status?", recording.forward.content.to_s
-  end
-end
-```
-
-
-## Development road map
-
-Action Mailbox is destined for inclusion in Rails 6, which is due to be released some time in 2019. We will refine the framework in this separate rails/actionmailbox repository until we're ready to promote it via a pull request to rails/rails.
+You can read more about Action Mailbox in the [Action Mailbox Basics](https://edgeguides.rubyonrails.org/action_mailbox_basics.html) guide.
 
 ## License
 

data/app/controllers/action_mailbox/base_controller.rb

@@ -1,43 +1,34 @@
-# The base class for all Active Mailbox ingress controllers.
-class ActionMailbox::BaseController < ActionController::Base
-  skip_forgery_protection
+# frozen_string_literal: true
 
-  def self.prepare
-    # Override in concrete controllers to run code on load.
-  end
+module ActionMailbox
+  # The base class for all Action Mailbox ingress controllers.
+  class BaseController < ActionController::Base
+    skip_forgery_protection if default_protect_from_forgery
 
-  before_action :ensure_configured
+    before_action :ensure_configured
 
-  private
-    def ensure_configured
-      unless ActionMailbox.ingress == ingress_name
-        head :not_found
+    private
+      def ensure_configured
+        unless ActionMailbox.ingress == ingress_name
+          head :not_found
+        end
       end
-    end
-
-    def ingress_name
-      self.class.name.remove(/\AActionMailbox::Ingresses::/, /::InboundEmailsController\z/).underscore.to_sym
-    end
-
 
-    def authenticate_by_password
-      if password.present?
-        http_basic_authenticate_or_request_with username: "actionmailbox", password: password, realm: "Action Mailbox"
-      else
-        raise ArgumentError, "Missing required ingress credentials"
+      def ingress_name
+        self.class.name.remove(/\AActionMailbox::Ingresses::/, /::InboundEmailsController\z/).underscore.to_sym
       end
-    end
 
-    def password
-      Rails.application.credentials.dig(:action_mailbox, :ingress_password) || ENV["RAILS_INBOUND_EMAIL_PASSWORD"]
-    end
 
+      def authenticate_by_password
+        if password.present?
+          http_basic_authenticate_or_request_with name: "actionmailbox", password: password, realm: "Action Mailbox"
+        else
+          raise ArgumentError, "Missing required ingress credentials"
+        end
+      end
 
-    # TODO: Extract to ActionController::HttpAuthentication
-    def http_basic_authenticate_or_request_with(username:, password:, realm: nil)
-      authenticate_or_request_with_http_basic(realm || "Application") do |given_username, given_password|
-        ActiveSupport::SecurityUtils.secure_compare(given_username, username) &
-          ActiveSupport::SecurityUtils.secure_compare(given_password, password)
+      def password
+        Rails.application.credentials.dig(:action_mailbox, :ingress_password) || ENV["RAILS_INBOUND_EMAIL_PASSWORD"]
       end
-    end
+  end
 end

data/app/controllers/action_mailbox/ingresses/mailgun/inbound_emails_controller.rb

@@ -1,99 +1,103 @@
-# Ingests inbound emails from Mailgun. Requires the following parameters:
-#
-# - +body-mime+: The full RFC 822 message
-# - +timestamp+: The current time according to Mailgun as the number of seconds passed since the UNIX epoch
-# - +token+: A randomly-generated, 50-character string
-# - +signature+: A hexadecimal HMAC-SHA256 of the timestamp concatenated with the token, generated using the Mailgun API key
-#
-# Authenticates requests by validating their signatures.
-#
-# Returns:
-#
-# - <tt>204 No Content</tt> if an inbound email is successfully recorded and enqueued for routing to the appropriate mailbox
-# - <tt>401 Unauthorized</tt> if the request's signature could not be validated, or if its timestamp is more than 2 minutes old
-# - <tt>404 Not Found</tt> if Action Mailbox is not configured to accept inbound emails from Mailgun
-# - <tt>422 Unprocessable Entity</tt> if the request is missing required parameters
-# - <tt>500 Server Error</tt> if the Mailgun API key is missing, or one of the Active Record database,
-#   the Active Storage service, or the Active Job backend is misconfigured or unavailable
-#
-# == Usage
-#
-# 1. Give Action Mailbox your {Mailgun API key}[https://help.mailgun.com/hc/en-us/articles/203380100-Where-can-I-find-my-API-key-and-SMTP-credentials-]
-#    so it can authenticate requests to the Mailgun ingress.
-#
-#    Use <tt>rails credentials:edit</tt> to add your API key to your application's encrypted credentials under
-#    +action_mailbox.mailgun_api_key+, where Action Mailbox will automatically find it:
-#
-#        action_mailbox:
-#          mailgun_api_key: ...
-#
-#    Alternatively, provide your API key in the +MAILGUN_INGRESS_API_KEY+ environment variable.
-#
-# 2. Tell Action Mailbox to accept emails from Mailgun:
-#
-#        # config/environments/production.rb
-#        config.action_mailbox.ingress = :mailgun
-#
-# 3. {Configure Mailgun}[https://documentation.mailgun.com/en/latest/user_manual.html#receiving-forwarding-and-storing-messages]
-#    to forward inbound emails to `/rails/action_mailbox/mailgun/inbound_emails/mime`.
-#
-#    If your application lived at <tt>https://example.com</tt>, you would specify the fully-qualified URL
-#    <tt>https://example.com/rails/action_mailbox/mailgun/inbound_emails/mime</tt>.
-class ActionMailbox::Ingresses::Mailgun::InboundEmailsController < ActionMailbox::BaseController
-  before_action :authenticate
+# frozen_string_literal: true
 
-  def create
-    ActionMailbox::InboundEmail.create_and_extract_message_id! params.require("body-mime")
-  end
+module ActionMailbox
+  # Ingests inbound emails from Mailgun. Requires the following parameters:
+  #
+  # - +body-mime+: The full RFC 822 message
+  # - +timestamp+: The current time according to Mailgun as the number of seconds passed since the UNIX epoch
+  # - +token+: A randomly-generated, 50-character string
+  # - +signature+: A hexadecimal HMAC-SHA256 of the timestamp concatenated with the token, generated using the Mailgun API key
+  #
+  # Authenticates requests by validating their signatures.
+  #
+  # Returns:
+  #
+  # - <tt>204 No Content</tt> if an inbound email is successfully recorded and enqueued for routing to the appropriate mailbox
+  # - <tt>401 Unauthorized</tt> if the request's signature could not be validated, or if its timestamp is more than 2 minutes old
+  # - <tt>404 Not Found</tt> if Action Mailbox is not configured to accept inbound emails from Mailgun
+  # - <tt>422 Unprocessable Entity</tt> if the request is missing required parameters
+  # - <tt>500 Server Error</tt> if the Mailgun API key is missing, or one of the Active Record database,
+  #   the Active Storage service, or the Active Job backend is misconfigured or unavailable
+  #
+  # == Usage
+  #
+  # 1. Give Action Mailbox your {Mailgun API key}[https://help.mailgun.com/hc/en-us/articles/203380100-Where-can-I-find-my-API-key-and-SMTP-credentials-]
+  #    so it can authenticate requests to the Mailgun ingress.
+  #
+  #    Use <tt>rails credentials:edit</tt> to add your API key to your application's encrypted credentials under
+  #    +action_mailbox.mailgun_api_key+, where Action Mailbox will automatically find it:
+  #
+  #        action_mailbox:
+  #          mailgun_api_key: ...
+  #
+  #    Alternatively, provide your API key in the +MAILGUN_INGRESS_API_KEY+ environment variable.
+  #
+  # 2. Tell Action Mailbox to accept emails from Mailgun:
+  #
+  #        # config/environments/production.rb
+  #        config.action_mailbox.ingress = :mailgun
+  #
+  # 3. {Configure Mailgun}[https://documentation.mailgun.com/en/latest/user_manual.html#receiving-forwarding-and-storing-messages]
+  #    to forward inbound emails to +/rails/action_mailbox/mailgun/inbound_emails/mime+.
+  #
+  #    If your application lived at <tt>https://example.com</tt>, you would specify the fully-qualified URL
+  #    <tt>https://example.com/rails/action_mailbox/mailgun/inbound_emails/mime</tt>.
+  class Ingresses::Mailgun::InboundEmailsController < ActionMailbox::BaseController
+    before_action :authenticate
 
-  private
-    def authenticate
-      head :unauthorized unless authenticated?
+    def create
+      ActionMailbox::InboundEmail.create_and_extract_message_id! params.require("body-mime")
     end
 
-    def authenticated?
-      if key.present?
-        Authenticator.new(
-          key:       key,
-          timestamp: params.require(:timestamp),
-          token:     params.require(:token),
-          signature: params.require(:signature)
-        ).authenticated?
-      else
-        raise ArgumentError, <<~MESSAGE.squish
-          Missing required Mailgun API key. Set action_mailbox.mailgun_api_key in your application's
-          encrypted credentials or provide the MAILGUN_INGRESS_API_KEY environment variable.
-        MESSAGE
+    private
+      def authenticate
+        head :unauthorized unless authenticated?
       end
-    end
-
-    def key
-      Rails.application.credentials.dig(:action_mailbox, :mailgun_api_key) || ENV["MAILGUN_INGRESS_API_KEY"]
-    end
 
-    class Authenticator
-      attr_reader :key, :timestamp, :token, :signature
-
-      def initialize(key:, timestamp:, token:, signature:)
-        @key, @timestamp, @token, @signature = key, Integer(timestamp), token, signature
+      def authenticated?
+        if key.present?
+          Authenticator.new(
+            key:       key,
+            timestamp: params.require(:timestamp),
+            token:     params.require(:token),
+            signature: params.require(:signature)
+          ).authenticated?
+        else
+          raise ArgumentError, <<~MESSAGE.squish
+            Missing required Mailgun API key. Set action_mailbox.mailgun_api_key in your application's
+            encrypted credentials or provide the MAILGUN_INGRESS_API_KEY environment variable.
+          MESSAGE
+        end
       end
 
-      def authenticated?
-        signed? && recent?
+      def key
+        Rails.application.credentials.dig(:action_mailbox, :mailgun_api_key) || ENV["MAILGUN_INGRESS_API_KEY"]
       end
 
-      private
-        def signed?
-          ActiveSupport::SecurityUtils.secure_compare signature, expected_signature
-        end
+      class Authenticator
+        attr_reader :key, :timestamp, :token, :signature
 
-        # Allow for 2 minutes of drift between Mailgun time and local server time.
-        def recent?
-          Time.at(timestamp) >= 2.minutes.ago
+        def initialize(key:, timestamp:, token:, signature:)
+          @key, @timestamp, @token, @signature = key, Integer(timestamp), token, signature
         end
 
-        def expected_signature
-          OpenSSL::HMAC.hexdigest OpenSSL::Digest::SHA256.new, key, "#{timestamp}#{token}"
+        def authenticated?
+          signed? && recent?
         end
-    end
+
+        private
+          def signed?
+            ActiveSupport::SecurityUtils.secure_compare signature, expected_signature
+          end
+
+          # Allow for 2 minutes of drift between Mailgun time and local server time.
+          def recent?
+            Time.at(timestamp) >= 2.minutes.ago
+          end
+
+          def expected_signature
+            OpenSSL::HMAC.hexdigest OpenSSL::Digest::SHA256.new, key, "#{timestamp}#{token}"
+          end
+      end
+  end
 end