stormpath-rails 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36d62091eb523ac7ef5e343ca5ba96e62772b321
-  data.tar.gz: 2e7081bb0a9b8790336ff0fd1ebccc34426cfd3d
+  metadata.gz: db78dfe6eb37a717cc63a11079e9ab97b26cb828
+  data.tar.gz: 4d876869b8206cac38f96ef1a472fb1cc8211995
 SHA512:
-  metadata.gz: f08df2b2d8d20d1a7bea7703fea21b4cd1fd118889e8e77874b24463785a2e6693ae1ce3cf537be0316f229c74a123ebad6d631807932e2818e31feb27c9b96d
-  data.tar.gz: 3b30a4518942c3bdec1d1b7787c14cb1957f1fedb5182b6b614674249ee931528bf6568a26bece7bdf0920af8b83bb6237220b6d3fc1cc6265b6d213d6b9bede
+  metadata.gz: d28fbd2472799152d2cf4a24670e88c44efb88f7a448e198e3ebf15ce1f1f52c25d1bb7ebe467eaa1ea10cb0f5c1714c9024924eba9e05450c13f359a958ccf9
+  data.tar.gz: 74a8238f67668fa69c78867997e2acb80b887987bff4d4b9b3f623987402a2d70d2ee7639960258384ded3c4a8d204cd5fcba3437929c37ca42d7f455396458c

data/.travis.yml

@@ -2,26 +2,42 @@ language: ruby
 rvm:
 - 2.1.5
 before_install:
-- openssl aes-256-cbc -K $encrypted_57ed81c5c9ab_key -iv $encrypted_57ed81c5c9ab_iv
+- test -z "$BUILD_DOCS" || openssl aes-256-cbc -K $encrypted_57ed81c5c9ab_key -iv $encrypted_57ed81c5c9ab_iv
   -in keypair.enc -out ~/.ssh/id_rsa -d
-- chmod 600 ~/.ssh/id_rsa
-- git config --global user.email "evangelists@stormpath.com"
-- git config --global user.name "stormpath-rails documentation"
+- test -z "$BUILD_DOCS" || chmod 600 ~/.ssh/id_rsa
 install:
 - gem install bundler
 - bundle install --jobs=3 --retry=3
-- pip install --user sphinx
+- test -z "$BUILD_DOCS" || pip install --user sphinx
 script:
 - travis_retry rake
+- test -z "$BUILD_DOCS" || cd docs
+- test -z "$BUILD_DOCS" || make html
+- test -z "$BUILD_DOCS" || cd ..
 after_success:
-- CURRENT_HASH=`git rev-parse HEAD`
-- RELEASE_VERSION=`git tag | xargs -I@ git log --format=format:"%ai @%n" -1 @ | sort
-  | awk '{print $4}' | tail -n 1`
-- RELEASE_HASH=`git rev-list $RELEASE_VERSION -n 1`
-- if [ "$CURRENT_HASH" = "$RELEASE_HASH" ]; then DEPLOY_DOCS=true; fi
+- test -z "$BUILD_DOCS" || CURRENT_HASH=`git rev-parse HEAD`
+- test -z "$BUILD_DOCS" || RELEASE_VERSION=`git tag | xargs -I@ git log --format=format:"%ai @%n" -1 @ | sort | awk '{print $4}' | tail -n 1`
+- test -z "$BUILD_DOCS" || RELEASE_HASH=`git rev-list $RELEASE_VERSION -n 1`
+- test -z "$BUILD_DOCS" || if [ "$CURRENT_HASH" = "$RELEASE_HASH" ]; then DEPLOY_DOCS=true; fi
+- test -z "$DEPLOY_DOCS" || git config --global user.email "evangelists@stormpath.com"
+- test -z "$DEPLOY_DOCS" || git config --global user.name "stormpath-rails Auto Doc Build"
+- test -z "$DEPLOY_DOCS" || git clone git@github.com:stormpath/stormpath.github.io.git
+- test -z "$DEPLOY_DOCS" || cd stormpath.github.io
+- test -z "$DEPLOY_DOCS" || git fetch origin source:source
+- test -z "$DEPLOY_DOCS" || git checkout source
+- test -z "$DEPLOY_DOCS" || mkdir -p source/ruby/rails/latest
+- test -z "$DEPLOY_DOCS" || rm -rf source/ruby/rails/latest
+- test -z "$DEPLOY_DOCS" || cp -r ../docs/_build/html source/ruby/rails/latest
+- test -z "$DEPLOY_DOCS" || cp -r ../docs/_build/html source/ruby/rails/$RELEASE_VERSION
+- test -z "$DEPLOY_DOCS" || git add --all
+- test -z "$DEPLOY_DOCS" || git commit -m "stormpath-rails release $RELEASE_VERSION"
+- test -z "$DEPLOY_DOCS" || git push origin source
 env:
   global:
-  - STORMPATH_APPLICATION_URL=https://api.stormpath.com/v1/applications/4xz3y2Hrid4aqp5YwbNTvk
-  - secure: VMjIMI42vIPTMPTr0fnzSPiIjzuSAnT7iNWjhAXP9WsdaCmxwHp1vOlry4QuX8DzpKHv2MQubeUN/UA227Nk1xn+CVu9mujWOqvvjmL9m20wMJvwT4ctn7zG+FJK76id9TEyx0mCTlH4ZrRoDMGfM9yzhpsg8FtSebBDdHxePaM=
-  - secure: IhR6H9qxmxCDNbLK0ebYuIXQRsGA/JhD6In4V/hnSMJ8lPi2kwRn6eKclNCHGNjcy6QF1V5vddKIfKOkFFZvIyP26reygTX1g5Mfa8SqTGKh3DAW4WP+T+yaE4z4UBDK1zZpbV0Zbkw/HC0xeD8UPnjRzERX1LVZp1qeEjhQrks=
-  - secure: a5woUmOQPRW6FBQBaxKJATfggUD/BVTBfeRaS07u1SQOpMoGJZLY0m29PVx4fHwRD1E7ho31YIeH8wk1vMMrimIHSdE1B4pm4n8bUTi/gDFwavXq9KgTdH8f6Eli37nAXZum78m4NgL9+OlrKeJKCcROdzniZPvFaLrnOwBGzVs=
+  - STORMPATH_APPLICATION_HREF=https://api.stormpath.com/v1/applications/4xz3y2Hrid4aqp5YwbNTvk
+  - secure: fuZU/DCNpezx1qrhpt/b+eeZRF83AiAwJnUNgA0D2fH4KGleN+BGfz5wEy6oOu5QKDWWAWepHDuwUjTP6QL504QId8+QZbycr52tFM0NXDSzpzhGkoaAEIALjuJ+DBto032yr8hoFjM+P5M1057p2jZKyr5CMkB66j4g3oWwA5k=
+  - secure: F0+m4wWKgqZLWpouKwn3BQB1/DXkbwmKEE6E+XFSEJB3rIsf8J4stP6OslqGmkdOzbx/4Dl/V3EXMmWk6R8hnQ5rmr60FGN6FBXUTA+s/9ZULl1I3+J/PsV5azFUwuP+87hbS9QQTVxbG7S3Gpmuy3JCSjySQ4vfXo8fZPz6Plk=
+matrix:
+  include:
+  - env: BUILD_DOCS=true
+    rvm: 2.1.5

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 Stormpath Rails Changelog
 ============================
 
+Version 2.3.1
+-------------
+Released on Nov 28, 2016
+- Refactored specs and changed environment variable names to match the other SDK's
+
+
 Version 2.3.0
 -------------
 Released on Nov 08, 2016

data/Gemfile

@@ -18,8 +18,6 @@ group :test do
   gem 'webmock'
   gem 'vcr', '3.0.1'
   gem 'ammeter', git: 'https://github.com/alexrothenberg/ammeter'
-  gem 'simplecov', require: false
-  gem 'coveralls', require: false
   gem 'json_matchers'
   gem 'match_json', '0.0.5'
   gem 'capybara'

data/README.md

@@ -1,5 +1,4 @@
 [![Build Status](https://travis-ci.org/stormpath/stormpath-rails.svg?branch=master)](https://travis-ci.org/stormpath/stormpath-rails)
-[![Coverage Status](https://coveralls.io/repos/stormpath/stormpath-rails/badge.svg?branch=master&service=github)](https://coveralls.io/github/stormpath/stormpath-rails?branch=master)
 [![Code Climate](https://codeclimate.com/github/stormpath/stormpath-rails/badges/gpa.svg)](https://codeclimate.com/github/stormpath/stormpath-rails)
 
 # Stormpath Rails
@@ -17,7 +16,7 @@ Add the stormpath-rails integration gem to your Gemfile.
 Stormpath is currently in beta so it is necessary to include the gem version:
 
 ```ruby
-gem 'stormpath-rails', '~> 2.3.0'
+gem 'stormpath-rails', '~> 2.3.1'
 ```
 
 Bundle the Gemfile
@@ -38,16 +37,16 @@ rails generate stormpath:install
 
 Create a Stormpath account if you haven't already, and be sure to set up the following environment variables:
 
- - STORMPATH_API_KEY_ID
- - STORMPATH_API_KEY_SECRET
+ - STORMPATH_CLIENT_APIKEY_ID
+ - STORMPATH_CLIENT_APIKEY_SECRET
 
 Environment variables should be set up in you .bashrc file (or .zshrc if you use myzsh).
 
 Example setup:
 
 ```sh
-export STORMPATH_API_KEY_ID=6U4HZMHGVHN0U765BGW
-export STORMPATH_API_KEY_SECRET=0e0TuVZKYiPiLTDLNnswEwpPpa5nPv
+export STORMPATH_CLIENT_APIKEY_ID=6U4HZMHGVHN0U765BGW
+export STORMPATH_CLIENT_APIKEY_SECRET=0e0TuVZKYiPiLTDLNnswEwpPpa5nPv
 ```
 
 Alternatively you can use gems such as [Dotenv](https://github.com/bkeepers/dotenv) or [Figaro](https://github.com/laserlemon/figaro) to preload environment variables.
@@ -91,7 +90,7 @@ You can use embedded ruby (ERB) in the configuration file:
 ```yaml
 stormpath:
   application:
-    href: <%= ENV['STORMPATH_APPLICATION_URL'] %>
+    href: <%= ENV['STORMPATH_APPLICATION_HREF'] %>
 ```
 
 ## Usage
@@ -298,12 +297,9 @@ If you wish to contribute to the gem, please follow these steps:
 
 1. Create a Stormpath Application.
 2. Export the following env variables:
-  - STORMPATH_API_KEY_ID
-  - STORMPATH_API_KEY_SECRET
+  - STORMPATH_CLIENT_APIKEY_ID
+  - STORMPATH_CLIENT_APIKEY_SECRET
 3. Create a Directory and associate it to the app. Make it the default account and group store for the app.
-4. Create a Directory With a Verification Workflow and associate it to the app.
-5. Export the following env variable:
-  - STORMPATH_SDK_TEST_DIRECTORY_WITH_VERIFICATION_URL
 
 ### Specs
 

data/app/services/stormpath/rails/account_from_access_token.rb

@@ -8,22 +8,22 @@ module Stormpath
       DifferentIssuerError = Class.new(ArgumentError)
 
       def initialize(access_token)
-        raise(NoAccessToken) if access_token.nil?
+        raise(NoAccessToken) if access_token.blank?
         @access_token = access_token
       end
 
       def account
-        @account ||= resolution_class.new(access_token).account
+        @account ||= resolution_instance.verify(access_token).account
       end
 
       private
 
-      def resolution_class
+      def resolution_instance
         case Stormpath::Rails.config.web.oauth2.password.validation_strategy.to_sym
         when :local
-          LocalAccountResolution
+          Stormpath::Oauth::VerifyAccessToken.new(Client.application, local: true)
         when :stormpath
-          StormpathAccountResolution
+          Stormpath::Oauth::VerifyAccessToken.new(Client.application)
         else
           raise ArgumentError, 'Invalid validation strategy'
         end

data/app/services/stormpath/rails/controller_authentication.rb

@@ -18,9 +18,16 @@ module Stormpath
         if any_auth_cookie_present?
           FromCookies.new(cookies).authenticate!
         elsif bearer_authorization_header?
-          FromBearerAuth.new(authorization_header).authenticate!
+          Stormpath::Authentication::HttpBearerAuthentication.new(
+            Stormpath::Rails::Client.application,
+            authorization_header,
+            local: validation_strategy
+          ).authenticate!.account
         elsif basic_authorization_header?
-          FromBasicAuth.new(authorization_header).authenticate!
+          Stormpath::Authentication::HttpBasicAuthentication.new(
+            Stormpath::Rails::Client.application,
+            authorization_header
+          ).authenticate!.account
         else
           raise UnauthenticatedRequest
         end
@@ -39,6 +46,14 @@ module Stormpath
       def basic_authorization_header?
         authorization_header =~ BASIC_PATTERN
       end
+
+      def validation_strategy
+        if Stormpath::Rails.config.web.oauth2.password.validation_strategy == 'stormpath'
+          true
+        else
+          false
+        end
+      end
     end
   end
 end

data/app/services/stormpath/rails/token_cookie_setter.rb

@@ -58,7 +58,7 @@ class SingleTokenCookieSetter
   end
 
   def expires
-    Time.zone.at(JWT.decode(token, ENV['STORMPATH_API_KEY_SECRET']).first['exp'])
+    Time.zone.at(JWT.decode(token, Stormpath::Rails::Client.client.data_store.api_key.secret).first['exp'])
   end
 
   def http_only

data/docs/changelog.rst

@@ -6,6 +6,12 @@ Change Log
 
 Gem changes until version 2.0.1, in descending order.
 
+Version 2.3.1
+-------------
+Released on Nov 28, 2016
+- Refactored specs and changed environment variable names to match the other SDK's
+
+
 Version 2.3.0
 -------------
 Released on Nov 08, 2016

data/docs/configuration.rst

@@ -23,9 +23,9 @@ by running the following commands in the shell:
 
 .. code-block:: bash
 
-    export STORMPATH_API_KEY_ID=YOUR_ID_HERE
-    export STORMPATH_API_KEY_SECRET=YOUR_SECRET_HERE
-    export STORMPATH_APPLICATION_URL=YOUR_APP_HREF
+    export STORMPATH_CLIENT_APIKEY_ID=YOUR_ID_HERE
+    export STORMPATH_CLIENT_APIKEY_SECRET=YOUR_SECRET_HERE
+    export STORMPATH_APPLICATION_HREF=YOUR_APP_HREF
 
 or by using any text editor and adding the environment variables to .bashrc (or .zshrc if you're using ohmyzsh)
 
@@ -35,9 +35,9 @@ or by using any text editor and adding the environment variables to .bashrc (or
 
     .. code-block:: bash
 
-        set STORMPATH_API_KEY_ID=YOUR_ID_HERE
-        set STORMPATH_API_KEY_SECRET=YOUR_SECRET_HERE
-        set STORMPATH_APPLICATION_URL=YOUR_APP_HREF
+        set STORMPATH_CLIENT_APIKEY_ID=YOUR_ID_HERE
+        set STORMPATH_CLIENT_APIKEY_SECRET=YOUR_SECRET_HERE
+        set STORMPATH_APPLICATION_HREF=YOUR_APP_HREF
 
 The examples above show you the 3 mandatory settings you need to configure to
 make stormpath-rails work.  These settings can be configured via environment

data/docs/quickstart.rst

@@ -30,8 +30,8 @@ prompt you to download your key pair.
 
 Once you've downloaded your `apiKey.properties` file, save it and be sure to set up the following environment variables:
 
- - STORMPATH_API_KEY_ID
- - STORMPATH_API_KEY_SECRET
+ - STORMPATH_CLIENT_APIKEY_ID
+ - STORMPATH_CLIENT_APIKEY_SECRET
 
 Environment variables should be set up in you .bashrc file (or .zshrc if you use myzsh).
 
@@ -39,8 +39,8 @@ Example setup:
 
 .. code-block:: sh
 
-    export STORMPATH_API_KEY_ID=6U4HZMHGVHN0U765BGW
-    export STORMPATH_API_KEY_SECRET=0e0TuVZKYiPiLTDLNnswEwpPpa5nPv
+    export STORMPATH_CLIENT_APIKEY_ID=6U4HZMHGVHN0U765BGW
+    export STORMPATH_CLIENT_APIKEY_SECRET=0e0TuVZKYiPiLTDLNnswEwpPpa5nPv
 
 Find Your Stormpath Application
 -------------------------------
@@ -73,7 +73,7 @@ Now that you have your application HREF, make sure to set up another environment
 
 .. code-block:: sh
 
-    export STORMPATH_APPLICATION_URL=https://api.stormpath.com/v1/applications/24kkU5XOz4tQlZ7sBtPUN6
+    export STORMPATH_APPLICATION_HREF=https://api.stormpath.com/v1/applications/24kkU5XOz4tQlZ7sBtPUN6
 
 
 You're ready to bundle Stormpath Rails gem into your project!

data/lib/stormpath/rails/api_key.rb

@@ -0,0 +1,87 @@
+module Stormpath
+  module Rails
+    class ApiKey
+      TEST_ENV_VARS = {
+        required: {
+          STORMPATH_CLIENT_APIKEY_ID: 'The id from your Stormpath API Key',
+          STORMPATH_CLIENT_APIKEY_SECRET: 'The secret from your Stormpath API Key',
+          STORMPATH_APPLICATION_HREF: 'The href to your application'
+        },
+        deprecated: {
+          STORMPATH_API_KEY_ID: 'The id from your Stormpath API Key',
+          STORMPATH_API_KEY_SECRET: 'The secret from your Stormpath API Key',
+          STORMPATH_APPLICATION_URL: 'The url to your application'
+        }
+      }.freeze
+
+      def credentials
+        check_env_variable_names
+        credentials_from_env_variables
+      end
+
+      private
+
+      def check_env_variable_names
+        unless test_missing_required_env_vars.empty?
+          show_deprecation_warning unless env_vars_not_set?
+        end
+
+        raise set_up_message if env_vars_not_set?
+      end
+
+      def credentials_from_env_variables
+        {
+          id: ENV['STORMPATH_CLIENT_APIKEY_ID'] || ENV['STORMPATH_API_KEY_ID'],
+          secret: ENV['STORMPATH_CLIENT_APIKEY_SECRET'] || ENV['STORMPATH_API_KEY_SECRET']
+        }
+      end
+
+      def test_missing_deprecated_env_vars
+        TEST_ENV_VARS[:deprecated].reject do |var, _|
+          ENV[var.to_s]
+        end
+      end
+
+      def test_missing_required_env_vars
+        TEST_ENV_VARS[:required].reject do |var, _|
+          ENV[var.to_s]
+        end
+      end
+
+      def env_vars_not_set?
+        !test_missing_deprecated_env_vars.empty? && !test_missing_required_env_vars.empty?
+      end
+
+      def show_deprecation_warning
+        warn deprecation_warning
+      end
+
+      def deprecation_warning
+        warn_message = "\n\n"
+        40.times { warn_message << '*' }
+        warn_message << 'STORMPATH RAILS'
+        52.times { warn_message << '*' }
+        warn_message << "\n\n"
+        warn_message << TEST_ENV_VARS[:deprecated].map do |var, _|
+          "\t#{var} is deprecated since the new version of the gem."
+        end.join("\n")
+        warn_message << "\n\tPlease update your environment variables to use the new names:\n"
+        warn_message << "\n\t\texport STORMPATH_CLIENT_APIKEY_ID=your_api_key_id"
+        warn_message << "\n\t\texport STORMPATH_CLIENT_APIKEY_SECRET=your_api_key_secret"
+        warn_message << "\n\t\texport STORMPATH_APPLICATION_HREF=href_to_application\n\n"
+        110.times { warn_message << '*' }
+        warn_message << "\n\n"
+        warn_message
+      end
+
+      def set_up_message
+        set_up_message = "In order to use the stormpath-rails gem you need to set the following environment variables:\n\t"
+        set_up_message << test_missing_required_env_vars.map do |var, message|
+          "#{var} : #{message}"
+        end.join("\n\t")
+        set_up_message << "\nBe sure to configure these before trying to run your application.\n\n"
+        set_up_message
+      end
+    end
+  end
+end

data/lib/stormpath/rails/client.rb

@@ -24,12 +24,11 @@ module Stormpath
       end
 
       def self.client
-        self.connection ||= Stormpath::Client.new(
-          api_key: {
-            id: ENV['STORMPATH_API_KEY_ID'],
-            secret: ENV['STORMPATH_API_KEY_SECRET']
-          }
-        )
+        self.connection ||= Stormpath::Client.new(api_key: api_key.credentials)
+      end
+
+      def self.api_key
+        Stormpath::Rails::ApiKey.new
       end
     end
   end

data/lib/stormpath/rails/controller.rb

@@ -15,7 +15,7 @@ module Stormpath
       def current_account
         @current_account ||= begin
           ControllerAuthentication.new(cookies, request.headers['Authorization']).authenticate!
-        rescue ControllerAuthentication::UnauthenticatedRequest
+        rescue ControllerAuthentication::UnauthenticatedRequest, Stormpath::Error, JWT::DecodeError
           nil
         end
       end

data/lib/stormpath/rails/env_names_warning.rb

@@ -0,0 +1,62 @@
+module Stormpath
+  module Rails
+    module EnvNamesWarning
+      TEST_ENV_VARS = {
+        required: {
+          STORMPATH_CLIENT_APIKEY_ID: 'The id from your Stormpath API Key',
+          STORMPATH_CLIENT_APIKEY_SECRET: 'The secret from your Stormpath API Key',
+          STORMPATH_APPLICATION_HREF: 'The href to your application'
+        },
+        deprecated: {
+          STORMPATH_API_KEY_ID: 'The id from your Stormpath API Key',
+          STORMPATH_API_KEY_SECRET: 'The secret from your Stormpath API Key',
+          STORMPATH_APPLICATION_URL: 'The url to your application'
+        }
+      }.freeze
+
+      def self.test_missing_deprecated_env_vars
+        TEST_ENV_VARS[:deprecated].reject do |var, _|
+          ENV[var.to_s]
+        end
+      end
+
+      def self.test_missing_required_env_vars
+        TEST_ENV_VARS[:required].reject do |var, _|
+          ENV[var.to_s]
+        end
+      end
+
+      def self.env_vars_not_set?
+        !test_missing_deprecated_env_vars.empty? && !test_missing_required_env_vars.empty?
+      end
+
+      def self.check_env_variable_names
+        unless Stormpath::Rails::EnvNamesWarning.test_missing_required_env_vars.empty?
+          warn_message = "\n\n"
+          40.times { warn_message << '*' }
+          warn_message << 'STORMPATH RAILS'
+          52.times { warn_message << '*' }
+          warn_message << "\n\n"
+          warn_message << TEST_ENV_VARS[:deprecated].map do |var, _|
+            "\t#{var} is deprecated since the new version of the gem."
+          end.join("\n")
+          warn_message << "\n\tPlease update your environment variables to use the new names:\n"
+          warn_message << "\n\t\texport STORMPATH_CLIENT_APIKEY_ID=your_api_key_id"
+          warn_message << "\n\t\texport STORMPATH_CLIENT_APIKEY_SECRET=your_api_key_secret"
+          warn_message << "\n\t\texport STORMPATH_APPLICATION_HREF=href_to_application\n\n"
+          110.times { warn_message << '*' }
+          warn "#{warn_message}\n\n" unless Stormpath::Rails::EnvNamesWarning.env_vars_not_set?
+        end
+
+        if Stormpath::Rails::EnvNamesWarning.env_vars_not_set?
+          set_up_message = "In order to use the stormpath-rails gem you need to set the following environment variables:\n\t"
+          set_up_message << Stormpath::Rails::EnvNamesWarning.test_missing_required_env_vars.map do |var, message|
+            "#{var} : #{message}"
+          end.join("\n\t")
+          set_up_message << "\nBe sure to configure these before trying to run your application.\n\n"
+          raise set_up_message
+        end
+      end
+    end
+  end
+end

data/lib/stormpath/rails/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Stormpath
   module Rails
-    VERSION = '2.3.0'.freeze
+    VERSION = '2.3.1'.freeze
   end
 end

data/lib/stormpath/rails.rb

@@ -15,6 +15,7 @@ module Stormpath
     autoload :Controller, 'stormpath/rails/controller'
     autoload :Version, 'stormpath/rails/version'
     autoload :Social, 'stormpath/rails/social'
+    autoload :ApiKey, 'stormpath/rails/api_key'
     autoload :ContentTypeNegotiator, 'stormpath/rails/content_type_negotiator'
     autoload :RoutingConstraint, 'stormpath/rails/routing_constraint'
     autoload :InvalidSptokenError, 'stormpath/rails/errors/invalid_sptoken_error'
@@ -23,5 +24,6 @@ module Stormpath
     autoload :NoGithubAuthorizationError, 'stormpath/rails/errors/no_github_authorization_error'
     autoload :FacebookAuthCodeExchange, 'stormpath/rails/facebook_auth_code_exchange'
     autoload :GithubAuthCodeExchange, 'stormpath/rails/github_auth_code_exchange'
+    autoload :EnvNamesWarning, 'stormpath/rails/env_names_warning'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stormpath-rails
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Nenad Nikolic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stormpath-sdk
@@ -144,14 +144,10 @@ files:
 - app/serializers/stormpath/rails/profile_serializer.rb
 - app/serializers/stormpath/rails/registration_form_serializer.rb
 - app/services/stormpath/rails/account_from_access_token.rb
-- app/services/stormpath/rails/account_from_access_token/local_account_resolution.rb
-- app/services/stormpath/rails/account_from_access_token/stormpath_account_resolution.rb
 - app/services/stormpath/rails/account_login.rb
 - app/services/stormpath/rails/account_login_with_stormpath_token.rb
 - app/services/stormpath/rails/client_credentials_authentication.rb
 - app/services/stormpath/rails/controller_authentication.rb
-- app/services/stormpath/rails/controller_authentication/from_basic_auth.rb
-- app/services/stormpath/rails/controller_authentication/from_bearer_auth.rb
 - app/services/stormpath/rails/controller_authentication/from_cookies.rb
 - app/services/stormpath/rails/delete_access_token.rb
 - app/services/stormpath/rails/delete_refresh_token.rb
@@ -240,6 +236,7 @@ files:
 - lib/generators/stormpath/views/views_generator.rb
 - lib/stormpath-rails.rb
 - lib/stormpath/rails.rb
+- lib/stormpath/rails/api_key.rb
 - lib/stormpath/rails/client.rb
 - lib/stormpath/rails/config/account_store_verification.rb
 - lib/stormpath/rails/config/application_resolution.rb
@@ -250,6 +247,7 @@ files:
 - lib/stormpath/rails/content_type_negotiator.rb
 - lib/stormpath/rails/controller.rb
 - lib/stormpath/rails/engine.rb
+- lib/stormpath/rails/env_names_warning.rb
 - lib/stormpath/rails/errors/invalid_sptoken_error.rb
 - lib/stormpath/rails/errors/no_facebook_authorization_error.rb
 - lib/stormpath/rails/errors/no_github_authorization_error.rb

data/app/services/stormpath/rails/account_from_access_token/local_account_resolution.rb

@@ -1,48 +0,0 @@
-module Stormpath
-  module Rails
-    class AccountFromAccessToken
-      class LocalAccountResolution
-        attr_reader :access_token
-
-        def initialize(access_token)
-          @access_token = access_token
-          @application = Client.application
-          validate_jwt
-        end
-
-        def account
-          Stormpath::Rails::Client.client.accounts.get(account_href)
-        end
-
-        private
-
-        def account_href
-          jwt_data.first['sub']
-        end
-
-        def jwt_data
-          begin
-            @jwt_data ||= JWT.decode(access_token, ENV['STORMPATH_API_KEY_SECRET'])
-          rescue JWT::ExpiredSignature
-            raise Stormpath::Oauth::Error, :jwt_expired
-          end
-        end
-
-        def validate_jwt
-          validate_jwt_is_an_access_token
-          validate_jwt_has_a_valid_issuer
-        end
-
-        def validate_jwt_has_a_valid_issuer
-          return if jwt_data.first['iss'] == Stormpath::Rails::Client.application.href
-          raise DifferentIssuerError
-        end
-
-        def validate_jwt_is_an_access_token
-          return if jwt_data.second['stt'] == 'access'
-          raise AuthenticationWithRefreshTokenAttemptError
-        end
-      end
-    end
-  end
-end

data/app/services/stormpath/rails/account_from_access_token/stormpath_account_resolution.rb

@@ -1,27 +0,0 @@
-module Stormpath
-  module Rails
-    class AccountFromAccessToken
-      class StormpathAccountResolution
-        attr_reader :access_token, :application
-
-        def initialize(access_token)
-          @access_token = access_token
-          @application = Client.application
-          validate_jwt_is_access_token
-        end
-
-        def account
-          Stormpath::Oauth::VerifyAccessToken.new(application).verify(access_token).account
-        end
-
-        def validate_jwt_is_access_token
-          raise AuthenticationWithRefreshTokenAttemptError if jwt_data.second['stt'] != 'access'
-        end
-
-        def jwt_data
-          @jwt_data ||= JWT.decode(access_token, ENV['STORMPATH_API_KEY_SECRET'])
-        end
-      end
-    end
-  end
-end

data/app/services/stormpath/rails/controller_authentication/from_basic_auth.rb

@@ -1,45 +0,0 @@
-module Stormpath
-  module Rails
-    class ControllerAuthentication
-      class FromBasicAuth
-        attr_reader :authorization_header
-
-        def initialize(authorization_header)
-          @authorization_header = authorization_header
-        end
-
-        def authenticate!
-          raise UnauthenticatedRequest if fetched_api_key.nil?
-          raise UnauthenticatedRequest if fetched_api_key.secret != api_key_secret
-          fetched_api_key.account
-        end
-
-        private
-
-        def fetched_api_key
-          @fetched_api_key ||= Client.application.api_keys.search(id: api_key_id).first
-        end
-
-        def api_key_id
-          decoded_authorization_header.first
-        end
-
-        def api_key_secret
-          decoded_authorization_header.last
-        end
-
-        def decoded_authorization_header
-          @decoded_authorization_header ||= begin
-            api_key_and_secret = Base64.decode64(basic_authorization_header).split(':')
-            raise UnauthenticatedRequest if api_key_and_secret.count != 2
-            api_key_and_secret
-          end
-        end
-
-        def basic_authorization_header
-          authorization_header.gsub(BASIC_PATTERN, '')
-        end
-      end
-    end
-  end
-end

data/app/services/stormpath/rails/controller_authentication/from_bearer_auth.rb

@@ -1,34 +0,0 @@
-module Stormpath
-  module Rails
-    class ControllerAuthentication
-      class FromBearerAuth
-        attr_reader :authorization_header
-
-        RESCUE_CLASSES = [
-          Stormpath::Oauth::Error,
-          JWT::DecodeError,
-          AccountFromAccessToken::AuthenticationWithRefreshTokenAttemptError,
-          AccountFromAccessToken::DifferentIssuerError
-        ].freeze
-
-        def initialize(authorization_header)
-          @authorization_header = authorization_header
-        end
-
-        def authenticate!
-          begin
-            AccountFromAccessToken.new(bearer_access_token).account
-          rescue *RESCUE_CLASSES
-            raise UnauthenticatedRequest
-          end
-        end
-
-        private
-
-        def bearer_access_token
-          authorization_header.gsub(BEARER_PATTERN, '')
-        end
-      end
-    end
-  end
-end