add-to-org 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d40b774139a77ec0fcb88a4419bbae34b3d8f45
-  data.tar.gz: f9f0935c12fe775108b1b0cc1f0b0822ea7599b7
+  metadata.gz: 2780fa01cfb6f6cf5bf218c6c015d98ecbc2e045
+  data.tar.gz: ada99c96ee50a764e09ccbe33738fe0d6a47bb52
 SHA512:
-  metadata.gz: a7a56a2d899068be257af5c25d2b33f6d3e8c1fd3f3a9bc0dab4c5f6bb5d22f87ffc6efce70f1881cf5bb320fdee4d6f5cecb2a42c563def621ac09c78cf4c6e
-  data.tar.gz: a34c518d7f822033d18471a59feff3f3a7eb5a2947a1bb70564b2d057b93d53e98275535335700346fb60c4e3cfd2fe6aeac3275334d2804038f855ac6461e53
+  metadata.gz: b61f4a36252610297738ff296d7e95bdb2f056a751378eeb882f19d31f56faa43ace43efe385b84b9ba02246ddf63000c31fb184a677884d452637f73567e939
+  data.tar.gz: d7603d3c1c37d09b497cdfba1283b086b6cf27ab0f8fbf1b84e12485e9a84b17946acd66521e4677e36748b20d7efb5d296c1050c058a686c0e5c8bb4c36796e

data/.gitignore

@@ -0,0 +1,4 @@
+.env
+.bundle
+*.gem
+Gemfile.lock

data/.ruby-version

@@ -0,0 +1 @@
+2.1.0

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+script: "./script/cibuild"
+rvm:
+  - 2.1
+  
+sudo: false
+cache: bundler
+
+env:
+  global:
+    - GITHUB_CLIENT_ID=FOO
+    - GITHUB_CLIENT_SECRET=BAR

data/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gemspec

data/LICENSE.md

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Ben Balter
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -0,0 +1,70 @@
+# Add to Org
+
+*A simple Oauth App to automatically add users to an organization*
+
+[![Gem Version](https://badge.fury.io/rb/add-to-org.svg)](http://badge.fury.io/rb/add-to-org) [![Build Status](https://travis-ci.org/benbalter/add-to-org.svg)](https://travis-ci.org/benbalter/add-to-org)
+
+## Usage
+
+Once set up, simply swap out your app's domain for any GitHub URL. E.g., `github.com/government/best-practices/issues/1` becomes `government-community.githubapp.com/government/best-practices/1`. The user will be authenticated, added to the organization, and redirected to the requested GitHub URL.
+
+## Setup
+
+1. Create [an oauth app](github.com/settings/applications/new)
+2. Create a personal access token for a user with admin rights to the organization
+3. Add `gem 'add-to-org' to your project's Gemfile
+4. Add the following to a `config.ru` file:
+
+```ruby
+require 'add-to-org'
+run AddToOrg::App
+```
+
+## Configuration
+
+The following environmental values should be set:
+
+* `GITHUB_ORG_ID` - The name of the org to add users to
+* `GITHUB_TEAM_ID` - The ID of the team to add users to. Get this from the team page's URL
+* `GITHUB_CLIENT_ID` - Your OAuth app's client ID
+* `GITHUB_CLIENT_SECRET` - Your Oauth app's client secret
+* `GITHUB_TOKEN` - A personal access token for a user with admin rights to the organization
+* `CONTACT_EMAIL` - Point of contact to point users to if something goes wrong
+
+You'll also need to monkey patch a validation method to determine if a user should be added, e.g.:
+
+```ruby
+require 'add-to-org'
+
+module AddToOrg
+  class App < Sinatra::Base
+    def valid?
+      verified_emails.any? { |email| email[:email] =~ /@github\.com$/}
+    end
+  end
+end  
+```
+
+## Customizing Views
+
+There are three views, `success`, `forbidden`, and `error`. They're pretty boring by default, so you may want to swap them out for something a bit my snazzy. There are two ways to do that:
+
+```ruby
+module AddToOrg
+  class App < Sinatra::Base
+    set :views, "path/to/your/views"
+  end
+end  
+```
+
+or by overwriting the `success`, `forbidden`, and `error` methods entirely:
+
+```ruby
+module AddToOrg
+  class App < Sinatra::Base  
+    def success(locals={})
+      halt erb :some_template, :locals => locals
+    end
+  end
+end
+```

data/Rakefile

@@ -0,0 +1,12 @@
+require 'rubygems/package_task'
+require 'rubygems/specification'
+require 'bundler'
+
+task :default => [:spec]
+
+require 'rspec/core/rake_task'
+desc "Run specs"
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = 'spec/**/*_spec.rb'
+  t.rspec_opts = ["--order", "rand", "--color"]
+end

data/add-to-org.gemspec

@@ -0,0 +1,29 @@
+require File.expand_path('../lib/add-to-org/version', __FILE__)
+
+Gem::Specification.new do |s|
+  s.name = "add-to-org"
+  s.summary = "A simple Oauth App to automatically add users to an organization"
+  s.description = "A simple Oauth App to automatically add users to an organization."
+  s.version = AddToOrg::VERSION
+  s.authors = ["Ben Balter"]
+  s.email = "ben.balter@github.com"
+  s.homepage = "https://github.com/benbalter/add-to-org"
+  s.licenses = ["MIT"]
+
+  s.files                 = `git ls-files`.split("\n")
+  s.test_files            = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables           = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths         = ["lib"]
+
+  s.require_paths = ["lib"]
+  s.add_dependency "warden-github", "~> 1.1"
+  s.add_dependency "sinatra_auth_github", "~> 1.1"
+  s.add_dependency "octokit", "~> 3.3"
+  s.add_dependency "rack-ssl-enforcer", "~> 0.2"
+  s.add_dependency "dotenv", "~> 1.0"
+  s.add_dependency "rake", "~> 10.3"
+  s.add_development_dependency "rspec", "~> 3.1"
+  s.add_development_dependency "rack-test", "~> 0.6"
+  s.add_development_dependency "webmock", "~> 1.2 "
+  s.add_development_dependency "pry", "~> 0.10"
+end

data/lib/add-to-org/helpers.rb

@@ -0,0 +1,42 @@
+module AddToOrg
+  module Helpers
+
+    # user client
+    def client
+      @client ||= Octokit::Client.new :access_token => github_user.token
+    end
+
+    # new org admin client
+    def sudo_client
+      @sudo_client ||= Octokit::Client.new :access_token => ENV['GITHUB_TOKEN']
+    end
+
+    # query api for the user's verified emails
+    def verified_emails
+      emails = client.emails :accept => 'application/vnd.github.v3'
+      emails.select { |email| email.verified }
+    end
+
+    # true if user is already a member of the org
+    def member?
+      client.organization_member? org_id, github_user.login
+    end
+
+    def valid?
+      raise "You must define a custom valid? method to determine eligibility"
+    end
+
+    def team_id
+      ENV['GITHUB_TEAM_ID']
+    end
+
+    def org_id
+      ENV['GITHUB_ORG_ID']
+    end
+
+    # the main event...
+    def add
+      sudo_client.add_team_membership team_id, github_user.login
+    end
+  end
+end

data/lib/add-to-org/version.rb

@@ -1,3 +1,3 @@
 module AddToOrg
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
 end

data/lib/add-to-org/views/success.erb

@@ -7,6 +7,6 @@
   <body>
     <h1>You're all set</h1>
     <p>You should have recieved an email inviting you to join the organization.</p>
-    <p>Once confirmed, you will have access to <a href="<%= ERB::Util.html_escape(redirect) %>"></a>, the requested URL.</h1>
+    <p>Once confirmed, you will have access to <a href="<%= ERB::Util.html_escape(redirect) %>"><%= ERB::Util.html_escape(redirect) %></a>, the requested URL.</h1>
   </body>
 </html>

data/lib/add-to-org.rb

@@ -1,60 +1,67 @@
 require 'octokit'
 require 'sinatra_auth_github'
 require 'dotenv'
-require_relative 'add-to-org/server'
+require_relative 'add-to-org/helpers'
 
 Dotenv.load
 
 module AddToOrg
   class App < Sinatra::Base
 
+    include AddToOrg::Helpers
+
     set :github_options, {
-      :scopes    => "user,user:email",
-      :secret    => ENV['GITHUB_CLIENT_SECRET'],
-      :client_id => ENV['GITHUB_CLIENT_ID']
+      :scopes => "user,user:email"
     }
 
-    def user
-      env['warden'].user
-    end
+    use Rack::Session::Cookie, {
+      :http_only => true,
+      :secret => ENV['SESSION_SECRET'] || SecureRandom.hex
+    }
 
-   # user client
-    def client
-      @client ||= Octokit::Client.new :access_token => user.token
-    end
+    ENV['WARDEN_GITHUB_VERIFIER_SECRET'] ||= SecureRandom.hex
+    register Sinatra::Auth::Github
 
-     # new org admin client
-    def sudo_client
-      @sudo_client ||= Octokit::Client.new :access_token => ENV['GITHUB_TOKEN']
-    end
+    set :views, File.expand_path("add-to-org/views", File.dirname(__FILE__))
 
-    # query api for the user's verified emails
-    def verified_emails
-      emails = client.emails :accept => 'application/vnd.github.v3'
-      emails.select { |email| email.verified }
+    # require ssl
+    configure :production do
+      require 'rack-ssl-enforcer'
+      use Rack::SslEnforcer
     end
 
-     # true if user is already a member of the org
-    def member?
-      client.organization_member? org_id, user.login
+    # dat auth
+    before do
+      session[:return_to] = request.url #store requested URL for post-auth redirect
+      authenticate!
     end
 
-    def valid?
-      raise "You must define a custom valid? method to determine eligibility"
+    def success(locals={})
+      halt erb :success, :locals => locals
     end
 
-    def team_id
-      ENV['GITHUB_TEAM_ID']
+    def forbidden
+      status 403
+      halt erb :forbidden
     end
 
-    def org_id
-      ENV['GITHUB_ORG_ID']
+    def error
+      status 500
+      halt erb :error
     end
 
-    # the main event...
-    def add
-      sudo_client.add_team_membership team_id, user.login
-    end
+    # request a GitHub (authenticated) URL
+    get "/*" do
 
+      path = request.path || "/#{team_id}"
+      halt redirect "https://github.com#{path}", 302 if member?
+      forbidden unless valid?
+
+      if add
+        success({ :redirect => "https://github.com#{path}" })
+      else
+        error
+      end
+    end
   end
 end

data/script/bootstrap

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+bundle install

data/script/cibuild

@@ -0,0 +1,7 @@
+#!/bin/sh
+# Test that all dependencies resolve, and that the thing actually fires
+
+set -e
+
+bundle exec rake spec
+bundle exec gem build add-to-org.gemspec

data/script/release

@@ -0,0 +1,38 @@
+#!/bin/sh
+# Tag and push a release.
+
+set -e
+
+# Make sure we're in the project root.
+
+cd $(dirname "$0")/..
+
+# Build a new gem archive.
+
+rm -rf add-to-org-*.gem
+gem build -q add-to-org.gemspec
+
+# Make sure we're on the master branch.
+
+(git branch | grep -q '* master') || {
+  echo "Only release from the master branch."
+  exit 1
+}
+
+# Figure out what version we're releasing.
+
+tag=v`ls add-to-org-*.gem | sed 's/^add-to-org-\(.*\)\.gem$/\1/'`
+
+# Make sure we haven't released this version before.
+
+git fetch -t origin
+
+(git tag -l | grep -q "$tag") && {
+  echo "Whoops, there's already a '${tag}' tag."
+  exit 1
+}
+
+# Tag it and bag it.
+
+gem push add-to-org-*.gem && git tag "$tag" &&
+  git push origin master && git push origin "$tag"

data/script/server

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+bundle exec rackup

data/spec/add-to-org-helpers_spec.rb

@@ -0,0 +1,80 @@
+require "spec_helper"
+
+describe "AddToOrgHelpers" do
+
+  class TestHelper
+    include AddToOrg::Helpers
+
+    def github_user
+      User.make({"login" => "benbaltertest"}, "asdf1234")
+    end
+
+    def initialize(path=nil)
+      @path = path
+    end
+
+    def request
+      Rack::Request.new("PATH_INFO" => @path)
+    end
+  end
+
+  before(:each) do
+    @helper = TestHelper.new
+  end
+
+  it "initializes the client" do
+    expect(@helper.client.class).to eql(Octokit::Client)
+    expect(@helper.client.instance_variable_get("@access_token")).to eql("asdf1234")
+  end
+
+  it "initializes the sudo client" do
+    with_env "GITHUB_TOKEN", "SUDO_TOKEN" do
+      expect(@helper.sudo_client.class).to eql(Octokit::Client)
+      expect(@helper.sudo_client.instance_variable_get("@access_token")).to eql("SUDO_TOKEN")
+    end
+  end
+
+  it "retrieves a users verified emails" do
+    stub_request(:get, "https://api.github.com/user/emails").
+    to_return(:status => 200, :body => fixture("emails.json"), :headers => { 'Content-Type'=>'application/json' })
+    expect(@helper.verified_emails.count).to eql(1)
+    expect(@helper.verified_emails.first[:email]).to eql("octocat@github.com")
+  end
+
+  it "retrieves the org id" do
+    with_env "GITHUB_ORG_ID", "some_org" do
+      expect(@helper.org_id).to eql("some_org")
+    end
+  end
+
+  it "retrieves the team id" do
+    with_env "GITHUB_TEAM_ID", "1234" do
+      expect(@helper.team_id).to eql("1234")
+    end
+  end
+
+  it "knows if a user is an org member" do
+    with_env "GITHUB_ORG_ID", "some_org" do
+      stub_request(:get, "https://api.github.com/orgs/some_org/members/benbaltertest").
+      to_return(:status => 204)
+      expect(@helper.member?).to eql(true)
+
+      stub_request(:get, "https://api.github.com/orgs/some_org/members/benbaltertest").
+      to_return(:status => 404)
+      expect(@helper.member?).to eql(false)
+    end
+  end
+
+  it "knows how to add a mebmer to an org" do
+    with_env "GITHUB_ORG_ID", "some_org" do
+      stub = stub_request(:put, "https://api.github.com/teams/memberships/benbaltertest").
+      to_return(:status => 204)
+      @helper.add
+      expect(stub).to have_been_requested
+    end
+  end
+
+  it "throws an error if valid? is not defined" do
+    expect { @helper.valid? }.to raise_error("You must define a custom valid? method to determine eligibility")
+  end
+end

data/spec/add-to-org_spec.rb

@@ -0,0 +1,106 @@
+require "spec_helper"
+
+describe "logged out user" do
+
+  include Rack::Test::Methods
+
+  def app
+    AddToOrg::App
+  end
+
+  it "asks you to log in" do
+    get "/"
+    expect(last_response.status).to eql(302)
+    expect(last_response.headers['Location']).to match(%r{^https://github\.com/login/oauth/authorize})
+  end
+end
+
+describe "logged in user" do
+
+  include Rack::Test::Methods
+
+  module AddToOrg
+    class App < Sinatra::Base
+      def valid?
+        verified_emails.any? { |email| email[:email] =~ /@github\.com$/}
+      end
+    end
+  end
+
+  def app
+    AddToOrg::App
+  end
+
+  before do
+    @user = make_user('login' => 'benbaltertest')
+    login_as @user
+  end
+
+  it "redirects if the user is a member" do
+    with_env "GITHUB_ORG_ID", "some_org" do
+      stub_request(:get, "https://api.github.com/orgs/some_org/members/benbaltertest").
+      to_return(:status => 204)
+      get "/"
+      expect(last_response.status).to eql(302)
+      expect(last_response.headers['Location']).to eql("https://github.com/")
+
+      get "/foo"
+      expect(last_response.status).to eql(302)
+      expect(last_response.headers['Location']).to eql("https://github.com/foo")
+
+      get "/foo/bar"
+      expect(last_response.status).to eql(302)
+      expect(last_response.headers['Location']).to eql("https://github.com/foo/bar")
+    end
+  end
+
+  it "denies acccess to invalid users" do
+    with_env "GITHUB_ORG_ID", "some_org" do
+      stub_request(:get, "https://api.github.com/orgs/some_org/members/benbaltertest").
+      to_return(:status => 404)
+
+      stub_request(:get, "https://api.github.com/user/emails").
+      to_return(:status => 200, :body => fixture("invalid_emails.json"), :headers => { 'Content-Type'=>'application/json' })
+
+      get "/"
+      expect(last_response.status).to eql(403)
+      expect(last_response.body).to match(/We're unable to verify your eligibility at this time/)
+    end
+  end
+
+  it "tries to add valid users" do
+    with_env "GITHUB_ORG_ID", "some_org" do
+      stub_request(:get, "https://api.github.com/orgs/some_org/members/benbaltertest").
+      to_return(:status => 404)
+
+      stub_request(:get, "https://api.github.com/user/emails").
+      to_return(:status => 200, :body => fixture("emails.json"), :headers => { 'Content-Type'=>'application/json' })
+
+      stub = stub_request(:put, "https://api.github.com/teams/memberships/benbaltertest").
+      to_return(:status => 204)
+
+      get "/"
+      expect(stub).to have_been_requested
+      expect(last_response.status).to eql(200)
+      expect(last_response.body).to match(/You should have recieved an email inviting you to join the organization/)
+    end
+  end
+
+  it "includes the requested URL" do
+    with_env "GITHUB_ORG_ID", "some_org" do
+      stub_request(:get, "https://api.github.com/orgs/some_org/members/benbaltertest").
+      to_return(:status => 404)
+
+      stub_request(:get, "https://api.github.com/user/emails").
+      to_return(:status => 200, :body => fixture("emails.json"), :headers => { 'Content-Type'=>'application/json' })
+
+      stub = stub_request(:put, "https://api.github.com/teams/memberships/benbaltertest").
+      to_return(:status => 204)
+
+      get "/foo/bar"
+      expect(stub).to have_been_requested
+      expect(last_response.status).to eql(200)
+      expect(last_response.body).to match(Regexp.new('<a href="https://github.com/foo/bar">https://github.com/foo/bar</a>'))
+    end
+  end
+end

data/spec/fixtures/emails.json

@@ -0,0 +1,12 @@
+[
+  {
+    "email": "octocat@github.com",
+    "verified": true,
+    "primary": true
+  },
+  {
+    "email": "octocat1@github.com",
+    "verified": false,
+    "primary": true
+  }
+]

data/spec/fixtures/invalid_emails.json

@@ -0,0 +1,12 @@
+[
+  {
+    "email": "foo@example.com",
+    "verified": true,
+    "primary": true
+  },
+  {
+    "email": "bar@example.com",
+    "verified": false,
+    "primary": true
+  }
+]

data/spec/spec_helper.rb

@@ -0,0 +1,48 @@
+require "bundler/setup"
+require 'fileutils'
+
+ENV['RACK_ENV'] = 'test'
+$:.push File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'rack/test'
+require 'sinatra/auth/github'
+require 'sinatra/auth/github/test/test_helper'
+require 'webmock/rspec'
+
+require_relative "../lib/add-to-org"
+WebMock.disable_net_connect!
+
+RSpec.configure do |config|
+  config.include(Sinatra::Auth::Github::Test::Helper)
+end
+
+def fixture_path(fixture)
+  File.expand_path "./fixtures/#{fixture}", File.dirname(__FILE__)
+end
+
+def fixture(fixture)
+  File.open(fixture_path(fixture)).read
+end
+
+
+def with_env(key, value)
+  old_env = ENV[key]
+  ENV[key] = value
+  yield
+  ENV[key] = old_env
+end
+
+class User < Warden::GitHub::User
+  def self.make(attrs = {}, token=nil)
+    default_attrs = {
+      'login'   => "test_user",
+      'name'    => "Test User",
+      'email'   => "test@example.com",
+      'company' => "GitHub",
+      'gravatar_id' => 'a'*32,
+      'avatar_url'  => 'https://a249.e.akamai.net/assets.github.com/images/gravatars/gravatar-140.png?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png'
+    }
+    default_attrs.merge! attrs
+    User.new(default_attrs,token)
+  end
+end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: add-to-org
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2015-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: warden-github
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: sinatra_auth_github
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
@@ -56,42 +56,129 @@ dependencies:
   name: rack-ssl-enforcer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.3'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 description: A simple Oauth App to automatically add users to an organization.
 email: ben.balter@github.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
+- Gemfile
+- LICENSE.md
+- README.md
+- Rakefile
+- add-to-org.gemspec
 - lib/add-to-org.rb
-- lib/add-to-org/server.rb
+- lib/add-to-org/helpers.rb
 - lib/add-to-org/version.rb
 - lib/add-to-org/views/error.erb
 - lib/add-to-org/views/forbidden.erb
 - lib/add-to-org/views/success.erb
+- script/bootstrap
+- script/cibuild
+- script/release
+- script/server
+- spec/add-to-org-helpers_spec.rb
+- spec/add-to-org_spec.rb
+- spec/fixtures/emails.json
+- spec/fixtures/invalid_emails.json
+- spec/spec_helper.rb
 homepage: https://github.com/benbalter/add-to-org
 licenses:
 - MIT
@@ -116,4 +203,9 @@ rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A simple Oauth App to automatically add users to an organization
-test_files: []
+test_files:
+- spec/add-to-org-helpers_spec.rb
+- spec/add-to-org_spec.rb
+- spec/fixtures/emails.json
+- spec/fixtures/invalid_emails.json
+- spec/spec_helper.rb

data/lib/add-to-org/server.rb

@@ -1,53 +0,0 @@
-module AddToOrg
-  class App < Sinatra::Base
-
-    use Rack::Session::Cookie, {
-      :http_only => true,
-      :secret => ENV['SESSION_SECRET'] || SecureRandom.hex
-    }
-
-    register Sinatra::Auth::Github
-
-    set :views, File.expand_path("views", File.dirname(__FILE__))
-
-    # require ssl
-    configure :production do
-      require 'rack-ssl-enforcer'
-      use Rack::SslEnforcer
-    end
-
-    # dat auth
-    before do
-      session[:return_to] = request.url #store requested URL for post-auth redirect
-      authenticate!
-    end
-
-    def success(locals={})
-      erb :success, locals
-    end
-
-    def forbidden
-      status 403
-      erb :forbidden
-    end
-
-    def error
-      status 500
-      erb :error
-    end
-
-    # request a GitHub (authenticated) URL
-    get "/*" do
-
-      path = request.path || "/#{team_id}"
-      halt redirect "https://github.com#{path}", 302 if member?
-      forbidden unless valid?
-
-      if add
-        success({ :redirect => "https://github.com#{path}" })
-      else
-        error
-      end
-    end
-  end
-end