diff --git a/Gemfile b/Gemfile
index c3fd519..056a2ca 100644
--- a/Gemfile
+++ b/Gemfile
@@ -48,11 +48,19 @@ gem 'timecop'
# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development
+gem 'devise'
+gem 'omniauth-github', github: 'intridea/omniauth-github'
+
+gem 'bootstrap-sass', '~> 3.3.6'
+
group :development, :test do
gem 'sqlite3'
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug'
gem 'dotenv-rails'
+ gem 'annotate'
+ gem 'better_errors'
+ gem 'binding_of_caller'
end
group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index c9c0628..cdfd8cd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,11 @@
+GIT
+ remote: git://github.com/intridea/omniauth-github.git
+ revision: 45f2fc73d6d06f30863adac0e6aa112bcaaadf67
+ specs:
+ omniauth-github (1.1.2)
+ omniauth (~> 1.0)
+ omniauth-oauth2 (>= 1.1.1, < 2.0)
+
GIT
remote: https://github.com/AgileVentures/ProjectMetrics/
revision: 8ddb909abe2396cb2b9f454aa35821a5d1a6ff9c
@@ -80,15 +88,28 @@ GEM
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.4.0)
+ annotate (2.7.1)
+ activerecord (>= 3.2, < 6.0)
+ rake (>= 10.4, < 12.0)
arel (6.0.3)
attr_encrypted (3.0.3)
encryptor (~> 3.0.0)
+ autoprefixer-rails (6.5.1)
+ execjs
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1)
+ bcrypt (3.1.11)
+ better_errors (2.1.1)
+ coderay (>= 1.0.0)
+ erubis (>= 2.6.6)
+ rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
+ bootstrap-sass (3.3.7)
+ autoprefixer-rails (>= 5.2.1)
+ sass (>= 3.3.4)
builder (3.2.2)
byebug (9.0.5)
capybara (2.8.1)
@@ -99,6 +120,7 @@ GEM
rack-test (>= 0.5.4)
xpath (~> 2.0)
cliver (0.3.2)
+ coderay (1.1.1)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
coffee-rails (4.1.1)
@@ -136,6 +158,12 @@ GEM
uber (>= 0.0.15)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
+ devise (4.2.0)
+ bcrypt (~> 3.0)
+ orm_adapter (~> 0.1)
+ railties (>= 4.1.0, < 5.1)
+ responders
+ warden (~> 1.2.3)
diff-lcs (1.2.5)
docile (1.1.5)
dotenv (2.1.1)
@@ -178,6 +206,7 @@ GEM
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
+ jwt (1.5.6)
launchy (2.4.3)
addressable (~> 2.3)
loofah (2.0.3)
@@ -196,8 +225,21 @@ GEM
nokogiri (1.6.8)
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
+ oauth2 (1.2.0)
+ faraday (>= 0.8, < 0.10)
+ jwt (~> 1.0)
+ multi_json (~> 1.3)
+ multi_xml (~> 0.5)
+ rack (>= 1.2, < 3)
octokit (4.3.0)
sawyer (~> 0.7.0, >= 0.5.3)
+ omniauth (1.3.1)
+ hashie (>= 1.2, < 4)
+ rack (>= 1.0, < 3)
+ omniauth-oauth2 (1.4.0)
+ oauth2 (~> 1.0)
+ omniauth (~> 1.2)
+ orm_adapter (0.5.0)
pg (0.18.4)
phantomjs (2.1.1.0)
pkg-config (1.1.7)
@@ -246,6 +288,8 @@ GEM
representable (3.0.0)
declarative (~> 0.0.5)
uber (~> 0.0.15)
+ responders (2.3.0)
+ railties (>= 4.2.0, < 5.1)
rspec-core (3.5.3)
rspec-support (~> 3.5.0)
rspec-expectations (3.5.0)
@@ -325,6 +369,8 @@ GEM
coercible (~> 1.0)
descendants_tracker (~> 0.0, >= 0.0.3)
equalizer (~> 0.0, >= 0.0.9)
+ warden (1.2.6)
+ rack (>= 1.0)
web-console (2.3.0)
activemodel (>= 4.0)
binding_of_caller (>= 0.7.2)
@@ -344,12 +390,17 @@ PLATFORMS
ruby
DEPENDENCIES
+ annotate
attr_encrypted
+ better_errors
+ binding_of_caller
+ bootstrap-sass (~> 3.3.6)
byebug
coffee-rails (~> 4.1.0)
cucumber-rails
cucumber-rails-training-wheels
database_cleaner
+ devise
dotenv-rails
factory_girl_rails
figaro
@@ -357,6 +408,7 @@ DEPENDENCIES
jbuilder (~> 2.0)
jquery-rails
launchy
+ omniauth-github!
pg
phantomjs
poltergeist
@@ -386,4 +438,4 @@ RUBY VERSION
ruby 2.3.1p112
BUNDLED WITH
- 1.12.5
+ 1.13.3
diff --git a/README.md b/README.md
index 9426e91..cb79177 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,13 @@
+Main Repo Status:
+
+
+CS169 Group Forked Repo Status:
+
+
+
+
# MVP dashboard for ProjectScope
A dashboard to show project metrics such as those supported by gems like
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index e07c5a8..f0abf5e 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -12,5 +12,6 @@
//
//= require jquery
//= require jquery_ujs
+//= require bootstrap-sprockets
//= require turbolinks
//= require_tree .
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.scss
similarity index 92%
rename from app/assets/stylesheets/application.css
rename to app/assets/stylesheets/application.scss
index f9cd5b3..e458dac 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.scss
@@ -10,6 +10,6 @@
* defined in the other CSS/SCSS files in this directory. It is generally better to create a new
* file per style scope.
*
- *= require_tree .
- *= require_self
*/
+@import "bootstrap-sprockets";
+@import "bootstrap";
\ No newline at end of file
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 43fb48b..84905c1 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -1,8 +1,7 @@
class ProjectsController < ApplicationController
before_action :set_project, only: [:show, :edit, :update, :destroy]
+ before_action :authenticate_user!
- http_basic_authenticate_with name: "cs169", password: ENV['PROJECTSCOPE_PASSWORD']
-
# GET /projects
# GET /projects.json
def index
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
new file mode 100644
index 0000000..8fa9982
--- /dev/null
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -0,0 +1,39 @@
+class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
+ # You should configure your model like this:
+ # devise :omniauthable, omniauth_providers: [:twitter]
+
+ # You should also create an action method in this controller like this:
+ # def twitter
+ # end
+
+ # More info at:
+ # https://github.com/plataformatec/devise#omniauth
+
+ # GET|POST /resource/auth/twitter
+ # def passthru
+ # super
+ # end
+
+ # GET|POST /users/auth/twitter/callback
+ # def failure
+ # super
+ # end
+
+ # protected
+
+ # The path used when OmniAuth fails
+ # def after_omniauth_failure_path_for(scope)
+ # super(scope)
+ # end
+
+ def github
+ @user = User.from_omniauth(request.env["omniauth.auth"])
+ if @user.nil?
+ flash[:alert] = "You are not authorized."
+ redirect_to new_user_session_path
+ else
+ flash[:notice] = "Signed in successfully."
+ sign_in_and_redirect @user
+ end
+ end
+end
diff --git a/app/models/config.rb b/app/models/config.rb
index 85c6923..d988655 100644
--- a/app/models/config.rb
+++ b/app/models/config.rb
@@ -1,3 +1,16 @@
+# == Schema Information
+#
+# Table name: configs
+#
+# id :integer not null, primary key
+# project_id :integer
+# metric_name :string
+# encrypted_options :text
+# created_at :datetime not null
+# updated_at :datetime not null
+# encrypted_options_iv :string
+#
+
class Config < ActiveRecord::Base
belongs_to :project
scope :for, ->(metric_name) { where(:metric_name => metric_name).first }
diff --git a/app/models/metric_sample.rb b/app/models/metric_sample.rb
index 41360df..deb647a 100644
--- a/app/models/metric_sample.rb
+++ b/app/models/metric_sample.rb
@@ -1,3 +1,18 @@
+# == Schema Information
+#
+# Table name: metric_samples
+#
+# id :integer not null, primary key
+# project_id :integer
+# metric_name :string
+# encrypted_raw_data :text
+# created_at :datetime not null
+# updated_at :datetime not null
+# encrypted_raw_data_iv :string
+# score :float
+# image :text
+#
+
class MetricSample < ActiveRecord::Base
belongs_to :project
scope :latest_for, ->(metric_name) { where(:metric_name => metric_name).last }
diff --git a/app/models/project.rb b/app/models/project.rb
index de67b4d..002d238 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1,3 +1,13 @@
+# == Schema Information
+#
+# Table name: projects
+#
+# id :integer not null, primary key
+# name :string
+# created_at :datetime not null
+# updated_at :datetime not null
+#
+
class Project < ActiveRecord::Base
has_many :configs
has_many :metric_samples
diff --git a/app/models/user.rb b/app/models/user.rb
new file mode 100644
index 0000000..848c1d9
--- /dev/null
+++ b/app/models/user.rb
@@ -0,0 +1,49 @@
+# == Schema Information
+#
+# Table name: users
+#
+# id :integer not null, primary key
+# email :string default(""), not null
+# encrypted_password :string default(""), not null
+# reset_password_token :string
+# reset_password_sent_at :datetime
+# remember_created_at :datetime
+# sign_in_count :integer default(0), not null
+# current_sign_in_at :datetime
+# last_sign_in_at :datetime
+# current_sign_in_ip :string
+# last_sign_in_ip :string
+# created_at :datetime not null
+# updated_at :datetime not null
+# provider :string
+# uid :string
+# role :string default("coach"), not null
+#
+
+class User < ActiveRecord::Base
+ # Include default devise modules. Others available are:
+ # :confirmable, :lockable, :timeoutable and :omniauthable
+ devise :database_authenticatable, :recoverable,
+ :rememberable, :trackable, :validatable, :omniauthable, :omniauth_providers => [:github]
+
+ ADMIN = "admin"
+ COACH = "coach"
+
+ def self.from_omniauth(auth)
+ email = auth.info.email.nil? ? auth.extra.raw_info.email : auth.info.email
+ login = auth.extra.raw_info.login
+ if !login.nil? and !email.nil?
+ User.where(provider: auth.provider, provider_username: login, email: email).first_or_create do |user|
+ user.provider = auth.provider
+ user.uid = auth.uid
+ user.email = email
+ user.provider_username = login
+ user.password = Devise.friendly_token[0,20]
+ end
+ end
+ end
+
+ def is_admin?
+ self.role == ADMIN
+ end
+end
diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
new file mode 100644
index 0000000..2dc668f
--- /dev/null
+++ b/app/views/devise/confirmations/new.html.erb
@@ -0,0 +1,16 @@
+
Resend confirmation instructions
+
+<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
+ <%= devise_error_messages! %>
+
+
+ <%= f.label :email %>
+ <%= f.email_field :email, autofocus: true, value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %>
+
+
+
+ <%= f.submit "Resend confirmation instructions" %>
+
+<% end %>
+
+<%= render "devise/shared/links" %>
diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb
new file mode 100644
index 0000000..dc55f64
--- /dev/null
+++ b/app/views/devise/mailer/confirmation_instructions.html.erb
@@ -0,0 +1,5 @@
+Welcome <%= @email %>!
+
+You can confirm your account email through the link below:
+
+<%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %>
diff --git a/app/views/devise/mailer/password_change.html.erb b/app/views/devise/mailer/password_change.html.erb
new file mode 100644
index 0000000..b41daf4
--- /dev/null
+++ b/app/views/devise/mailer/password_change.html.erb
@@ -0,0 +1,3 @@
+Hello <%= @resource.email %>!
+
+We're contacting you to notify you that your password has been changed.
diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb
new file mode 100644
index 0000000..f667dc1
--- /dev/null
+++ b/app/views/devise/mailer/reset_password_instructions.html.erb
@@ -0,0 +1,8 @@
+Hello <%= @resource.email %>!
+
+Someone has requested a link to change your password. You can do this through the link below.
+
+<%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %>
+
+If you didn't request this, please ignore this email.
+Your password won't change until you access the link above and create a new one.
diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb
new file mode 100644
index 0000000..41e148b
--- /dev/null
+++ b/app/views/devise/mailer/unlock_instructions.html.erb
@@ -0,0 +1,7 @@
+Hello <%= @resource.email %>!
+
+Your account has been locked due to an excessive number of unsuccessful sign in attempts.
+
+Click the link below to unlock your account:
+
+<%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %>
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
new file mode 100644
index 0000000..6a796b0
--- /dev/null
+++ b/app/views/devise/passwords/edit.html.erb
@@ -0,0 +1,25 @@
+Change your password
+
+<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
+ <%= devise_error_messages! %>
+ <%= f.hidden_field :reset_password_token %>
+
+
+ <%= f.label :password, "New password" %>
+ <% if @minimum_password_length %>
+ (<%= @minimum_password_length %> characters minimum)
+ <% end %>
+ <%= f.password_field :password, autofocus: true, autocomplete: "off" %>
+
+
+
+ <%= f.label :password_confirmation, "Confirm new password" %>
+ <%= f.password_field :password_confirmation, autocomplete: "off" %>
+
+
+
+ <%= f.submit "Change my password" %>
+
+<% end %>
+
+<%= render "devise/shared/links" %>
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
new file mode 100644
index 0000000..3d6d11a
--- /dev/null
+++ b/app/views/devise/passwords/new.html.erb
@@ -0,0 +1,16 @@
+Forgot your password?
+
+<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
+ <%= devise_error_messages! %>
+
+
+ <%= f.label :email %>
+ <%= f.email_field :email, autofocus: true %>
+
+
+
+ <%= f.submit "Send me reset password instructions" %>
+
+<% end %>
+
+<%= render "devise/shared/links" %>
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
new file mode 100644
index 0000000..1e66f3d
--- /dev/null
+++ b/app/views/devise/registrations/edit.html.erb
@@ -0,0 +1,43 @@
+Edit <%= resource_name.to_s.humanize %>
+
+<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
+ <%= devise_error_messages! %>
+
+
+ <%= f.label :email %>
+ <%= f.email_field :email, autofocus: true %>
+
+
+ <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
+ Currently waiting confirmation for: <%= resource.unconfirmed_email %>
+ <% end %>
+
+
+ <%= f.label :password %> (leave blank if you don't want to change it)
+ <%= f.password_field :password, autocomplete: "off" %>
+ <% if @minimum_password_length %>
+
+ <%= @minimum_password_length %> characters minimum
+ <% end %>
+
+
+
+ <%= f.label :password_confirmation %>
+ <%= f.password_field :password_confirmation, autocomplete: "off" %>
+
+
+
+ <%= f.label :current_password %> (we need your current password to confirm your changes)
+ <%= f.password_field :current_password, autocomplete: "off" %>
+
+
+
+ <%= f.submit "Update" %>
+
+<% end %>
+
+Cancel my account
+
+Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %>
+
+<%= link_to "Back", :back %>
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
new file mode 100644
index 0000000..2f38efb
--- /dev/null
+++ b/app/views/devise/registrations/new.html.erb
@@ -0,0 +1,29 @@
+Sign up
+
+<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
+ <%= devise_error_messages! %>
+
+
+<% end %>
+
+<%= render "devise/shared/links" %>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
new file mode 100644
index 0000000..c310194
--- /dev/null
+++ b/app/views/devise/sessions/new.html.erb
@@ -0,0 +1,15 @@
+
+
+
+
+
+
Welcome to ProjectScope
+
+
+ <%= render "devise/shared/links" %>
+
+
+
+
+
+
diff --git a/app/views/devise/shared/_links.html.erb b/app/views/devise/shared/_links.html.erb
new file mode 100644
index 0000000..70e49c4
--- /dev/null
+++ b/app/views/devise/shared/_links.html.erb
@@ -0,0 +1,21 @@
+<%- if devise_mapping.omniauthable? %>
+ <%- resource_class.omniauth_providers.each do |provider| %>
+ <%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider), class: "btn btn-default" %>
+ <% end -%>
+<% end -%>
+
+<%- if controller_name != 'sessions' %>
+ <%= link_to "Log in", new_session_path(resource_name) %>
+<% end -%>
+
+<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
+ <%= link_to "Sign up", new_registration_path(resource_name) %>
+<% end -%>
+
+<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+ <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
+<% end -%>
+
+<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
+ <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
+<% end -%>
diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb
new file mode 100644
index 0000000..16586bc
--- /dev/null
+++ b/app/views/devise/unlocks/new.html.erb
@@ -0,0 +1,16 @@
+Resend unlock instructions
+
+<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
+ <%= devise_error_messages! %>
+
+
+ <%= f.label :email %>
+ <%= f.email_field :email, autofocus: true %>
+
+
+
+ <%= f.submit "Resend unlock instructions" %>
+
+<% end %>
+
+<%= render "devise/shared/links" %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index c4d63a5..0c28ac7 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,14 +1,33 @@
- ProjectscopeMvp
+ Projectscope
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
<%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
<%= csrf_meta_tags %>
-
-<%= yield %>
-
+
+
+
+
+
+ <% unless notice.nil? %>
+
<%= notice %>
+ <% end%>
+ <% unless alert.nil? %>
+
<%= alert %>
+ <% end %>
+
+
+
+
+ <% if user_signed_in? %>
+ <%= link_to('Logout', destroy_user_session_path, :method => :delete, :class => "btn btn-md btn-primary") %>
+ <% end %>
+ <%= yield %>
+
+
+
diff --git a/app/views/projects/index.html.haml b/app/views/projects/index.html.haml
index f86c3a4..d3f8d02 100644
--- a/app/views/projects/index.html.haml
+++ b/app/views/projects/index.html.haml
@@ -1,5 +1,3 @@
-%p#notice= notice
-
%h1 Project List
%table
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index b8d6341..d2a8300 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -1,5 +1,3 @@
-%p#notice= notice
-
%p
%strong Name:
= @project.name
diff --git a/config/application.yml.asc b/config/application.yml.asc
index de3dbe0..eb882d0 100644
--- a/config/application.yml.asc
+++ b/config/application.yml.asc
@@ -1,9 +1,20 @@
-----BEGIN PGP MESSAGE-----
+Version: GnuPG v2
-jA0EBwMCxdph80I4HQhg0sABAYK4UG1AnL3wy0TvTiV8hcrNZkUxH/eRGvGNZvMP
-TZr/eOuFMUVnOU94162lvh13TJCHtThD5/sP/VgFHwYlqwKWFpy7S0X5qm7viwKk
-9mtxAxRi9WMCs7BE69oOMXmInKsEHP9AInDY6UjqWDL1rD1/p49wsoueZcDsjuv+
-ctdnavNKlDG8kUsvpw4AHwRYjpFsX8ceI6eHEM9xiHwKfWxEIBRTuN7P2JH65atI
-hvoiulsTJ//B/KjDcdlLhHV+Kg==
-=miLo
+hQEMA7YaI9ARhVG0AQgAwx53/unAc7ppdSCyIrZWJjhetQcXu7X2SCwFfhZiKMfL
+21i4CTo7pP5dToC8cbyMUWm0WDnphBQaRT8YC8NjzSEJLBOfza+Pbh9n4R/CwXx3
+EG7nf2kkPDivDTtZ3q4wyHZSXKX+lJYgEhwQ18PTePFPwtnVm0TIRwFK4yJUuiOW
+ke8/p7Ide7QORpfwUDLhaVhdnpBKffExMgMn8zaGXBcqRXuROqtWvHOkMrzM2Yf3
+oLKapemtJ5XFUepuzCHqEgfB5khyClhXnjKfvu9tfvEjYtcTcbLV5sD9j+JVC9RI
+F19yhFibv3THj5tjxp40jSOH9n09bFP8yKZi23SaFYwuBAMDAkgsQqgkrMIp4c9N
++bmzj3ZjxoqOHsUfv+CpRqE3jadDKRSjeXbmT/062dLAvgFVEJwW9l7pRSfSLzOn
+yQqM5dfCdnzkIpJRDruQ78/Sor3QAg4UQZ0Fem31YCZF1HfhKL2VIqEor7Ghg9PP
+kf9auOFH6c/aNTeHQGUnddxwJhRY+ri9PayLRVuQlltFNe6gfnxYaOZg71e8113U
+k/05qtDEu1Cee8gvgWYworF9HWIi1Buhk7DlGNaPe27VUMDvet9ThBvlpiQ1hhRF
+1gqpRbdym+b3wK25HPKZxf7is491w8GbaHBeSdYVAO9/lxyTaFniWk3Yg3zOKRQX
+ttD8Ey1diWAYCN/6nkkC3gbNx96DBRDF9L2Z2mqKvWwYOEGcxnKN2NylCqj93bRD
+GgAhiKSp7AdWxMvlgALeayorqZpIsLzWPqbxpriTtMQ+WM0HoNFjJR5AzxqvgbXf
+eQqHRbmihorqO0da5x+2y+7BrL3e/l2D44W8X9aVmzxnALgAo+yVcpmEdeBTq0YB
+PwbPQeJRIQRDecZAvAXz4+B+hY5MPHqVDynyYM7djYo=
+=IRpG
-----END PGP MESSAGE-----
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 9f4577a..1b8be30 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -40,4 +40,8 @@
# config.action_view.raise_on_missing_translations = true
ENV['attr_encrypted_key'] = '123456789012345678901234567890123456789012345678901234567890'
+
+ # set up according to devise instruction
+ config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
+
end
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
new file mode 100644
index 0000000..bd0d895
--- /dev/null
+++ b/config/initializers/devise.rb
@@ -0,0 +1,276 @@
+# Use this hook to configure devise mailer, warden hooks and so forth.
+# Many of these configuration options can be set straight in your model.
+Devise.setup do |config|
+ # The secret key used by Devise. Devise uses this key to generate
+ # random tokens. Changing this key will render invalid all existing
+ # confirmation, reset password and unlock tokens in the database.
+ # Devise will use the `secret_key_base` as its `secret_key`
+ # by default. You can change it below and use your own secret key.
+ # config.secret_key = 'ee99d8f0b73c44ec8c3471149638794ac1fff4aa5cfc2aa53e09652c0fece199e121779597a4ff7eb66863156a8d147a96557002bf65c01a57c15b0fe401d2e1'
+
+ # ==> Mailer Configuration
+ # Configure the e-mail address which will be shown in Devise::Mailer,
+ # note that it will be overwritten if you use your own mailer class
+ # with default "from" parameter.
+ config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
+
+ # Configure the class responsible to send e-mails.
+ # config.mailer = 'Devise::Mailer'
+
+ # Configure the parent class responsible to send e-mails.
+ # config.parent_mailer = 'ActionMailer::Base'
+
+ # ==> ORM configuration
+ # Load and configure the ORM. Supports :active_record (default) and
+ # :mongoid (bson_ext recommended) by default. Other ORMs may be
+ # available as additional gems.
+ require 'devise/orm/active_record'
+
+ # ==> Configuration for any authentication mechanism
+ # Configure which keys are used when authenticating a user. The default is
+ # just :email. You can configure it to use [:username, :subdomain], so for
+ # authenticating a user, both parameters are required. Remember that those
+ # parameters are used only when authenticating and not when retrieving from
+ # session. If you need permissions, you should implement that in a before filter.
+ # You can also supply a hash where the value is a boolean determining whether
+ # or not authentication should be aborted when the value is not present.
+ # config.authentication_keys = [:email]
+
+ # Configure parameters from the request object used for authentication. Each entry
+ # given should be a request method and it will automatically be passed to the
+ # find_for_authentication method and considered in your model lookup. For instance,
+ # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
+ # The same considerations mentioned for authentication_keys also apply to request_keys.
+ # config.request_keys = []
+
+ # Configure which authentication keys should be case-insensitive.
+ # These keys will be downcased upon creating or modifying a user and when used
+ # to authenticate or find a user. Default is :email.
+ config.case_insensitive_keys = [:email]
+
+ # Configure which authentication keys should have whitespace stripped.
+ # These keys will have whitespace before and after removed upon creating or
+ # modifying a user and when used to authenticate or find a user. Default is :email.
+ config.strip_whitespace_keys = [:email]
+
+ # Tell if authentication through request.params is enabled. True by default.
+ # It can be set to an array that will enable params authentication only for the
+ # given strategies, for example, `config.params_authenticatable = [:database]` will
+ # enable it only for database (email + password) authentication.
+ # config.params_authenticatable = true
+
+ # Tell if authentication through HTTP Auth is enabled. False by default.
+ # It can be set to an array that will enable http authentication only for the
+ # given strategies, for example, `config.http_authenticatable = [:database]` will
+ # enable it only for database authentication. The supported strategies are:
+ # :database = Support basic authentication with authentication key + password
+ # config.http_authenticatable = false
+
+ # If 401 status code should be returned for AJAX requests. True by default.
+ # config.http_authenticatable_on_xhr = true
+
+ # The realm used in Http Basic Authentication. 'Application' by default.
+ # config.http_authentication_realm = 'Application'
+
+ # It will change confirmation, password recovery and other workflows
+ # to behave the same regardless if the e-mail provided was right or wrong.
+ # Does not affect registerable.
+ # config.paranoid = true
+
+ # By default Devise will store the user in session. You can skip storage for
+ # particular strategies by setting this option.
+ # Notice that if you are skipping storage for all authentication paths, you
+ # may want to disable generating routes to Devise's sessions controller by
+ # passing skip: :sessions to `devise_for` in your config/routes.rb
+ config.skip_session_storage = [:http_auth]
+
+ # By default, Devise cleans up the CSRF token on authentication to
+ # avoid CSRF token fixation attacks. This means that, when using AJAX
+ # requests for sign in and sign up, you need to get a new CSRF token
+ # from the server. You can disable this option at your own risk.
+ # config.clean_up_csrf_token_on_authentication = true
+
+ # When false, Devise will not attempt to reload routes on eager load.
+ # This can reduce the time taken to boot the app but if your application
+ # requires the Devise mappings to be loaded during boot time the application
+ # won't boot properly.
+ # config.reload_routes = true
+
+ # ==> Configuration for :database_authenticatable
+ # For bcrypt, this is the cost for hashing the password and defaults to 11. If
+ # using other algorithms, it sets how many times you want the password to be hashed.
+ #
+ # Limiting the stretches to just one in testing will increase the performance of
+ # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
+ # a value less than 10 in other environments. Note that, for bcrypt (the default
+ # algorithm), the cost increases exponentially with the number of stretches (e.g.
+ # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
+ config.stretches = Rails.env.test? ? 1 : 11
+
+ # Set up a pepper to generate the hashed password.
+ # config.pepper = '642386cf3cd7fc653bbef7cfe38c2e49c5a55689fcfa7966dfeaa50905e109ab33f90840305a257eb286148acba7025ac024041a32a61b7df8a312cd5623f5d2'
+
+ # Send a notification email when the user's password is changed
+ # config.send_password_change_notification = false
+
+ # ==> Configuration for :confirmable
+ # A period that the user is allowed to access the website even without
+ # confirming their account. For instance, if set to 2.days, the user will be
+ # able to access the website for two days without confirming their account,
+ # access will be blocked just in the third day. Default is 0.days, meaning
+ # the user cannot access the website without confirming their account.
+ # config.allow_unconfirmed_access_for = 2.days
+
+ # A period that the user is allowed to confirm their account before their
+ # token becomes invalid. For example, if set to 3.days, the user can confirm
+ # their account within 3 days after the mail was sent, but on the fourth day
+ # their account can't be confirmed with the token any more.
+ # Default is nil, meaning there is no restriction on how long a user can take
+ # before confirming their account.
+ # config.confirm_within = 3.days
+
+ # If true, requires any email changes to be confirmed (exactly the same way as
+ # initial account confirmation) to be applied. Requires additional unconfirmed_email
+ # db field (see migrations). Until confirmed, new email is stored in
+ # unconfirmed_email column, and copied to email column on successful confirmation.
+ config.reconfirmable = true
+
+ # Defines which key will be used when confirming an account
+ # config.confirmation_keys = [:email]
+
+ # ==> Configuration for :rememberable
+ # The time the user will be remembered without asking for credentials again.
+ # config.remember_for = 2.weeks
+
+ # Invalidates all the remember me tokens when the user signs out.
+ config.expire_all_remember_me_on_sign_out = true
+
+ # If true, extends the user's remember period when remembered via cookie.
+ # config.extend_remember_period = false
+
+ # Options to be passed to the created cookie. For instance, you can set
+ # secure: true in order to force SSL only cookies.
+ # config.rememberable_options = {}
+
+ # ==> Configuration for :validatable
+ # Range for password length.
+ config.password_length = 6..128
+
+ # Email regex used to validate email formats. It simply asserts that
+ # one (and only one) @ exists in the given string. This is mainly
+ # to give user feedback and not to assert the e-mail validity.
+ config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
+
+ # ==> Configuration for :timeoutable
+ # The time you want to timeout the user session without activity. After this
+ # time the user will be asked for credentials again. Default is 30 minutes.
+ # config.timeout_in = 30.minutes
+
+ # ==> Configuration for :lockable
+ # Defines which strategy will be used to lock an account.
+ # :failed_attempts = Locks an account after a number of failed attempts to sign in.
+ # :none = No lock strategy. You should handle locking by yourself.
+ # config.lock_strategy = :failed_attempts
+
+ # Defines which key will be used when locking and unlocking an account
+ # config.unlock_keys = [:email]
+
+ # Defines which strategy will be used to unlock an account.
+ # :email = Sends an unlock link to the user email
+ # :time = Re-enables login after a certain amount of time (see :unlock_in below)
+ # :both = Enables both strategies
+ # :none = No unlock strategy. You should handle unlocking by yourself.
+ # config.unlock_strategy = :both
+
+ # Number of authentication tries before locking an account if lock_strategy
+ # is failed attempts.
+ # config.maximum_attempts = 20
+
+ # Time interval to unlock the account if :time is enabled as unlock_strategy.
+ # config.unlock_in = 1.hour
+
+ # Warn on the last attempt before the account is locked.
+ # config.last_attempt_warning = true
+
+ # ==> Configuration for :recoverable
+ #
+ # Defines which key will be used when recovering the password for an account
+ # config.reset_password_keys = [:email]
+
+ # Time interval you can reset your password with a reset password key.
+ # Don't put a too small interval or your users won't have the time to
+ # change their passwords.
+ config.reset_password_within = 6.hours
+
+ # When set to false, does not sign a user in automatically after their password is
+ # reset. Defaults to true, so a user is signed in automatically after a reset.
+ # config.sign_in_after_reset_password = true
+
+ # ==> Configuration for :encryptable
+ # Allow you to use another hashing or encryption algorithm besides bcrypt (default).
+ # You can use :sha1, :sha512 or algorithms from others authentication tools as
+ # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20
+ # for default behavior) and :restful_authentication_sha1 (then you should set
+ # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper).
+ #
+ # Require the `devise-encryptable` gem when using anything other than bcrypt
+ # config.encryptor = :sha512
+
+ # ==> Scopes configuration
+ # Turn scoped views on. Before rendering "sessions/new", it will first check for
+ # "users/sessions/new". It's turned off by default because it's slower if you
+ # are using only default views.
+ # config.scoped_views = false
+
+ # Configure the default scope given to Warden. By default it's the first
+ # devise role declared in your routes (usually :user).
+ # config.default_scope = :user
+
+ # Set this configuration to false if you want /users/sign_out to sign out
+ # only the current scope. By default, Devise signs out all scopes.
+ # config.sign_out_all_scopes = true
+
+ # ==> Navigation configuration
+ # Lists the formats that should be treated as navigational. Formats like
+ # :html, should redirect to the sign in page when the user does not have
+ # access, but formats like :xml or :json, should return 401.
+ #
+ # If you have any extra navigational formats, like :iphone or :mobile, you
+ # should add them to the navigational formats lists.
+ #
+ # The "*/*" below is required to match Internet Explorer requests.
+ # config.navigational_formats = ['*/*', :html]
+
+ # The default HTTP method used to sign out a resource. Default is :delete.
+ config.sign_out_via = :delete
+
+ # ==> OmniAuth
+ # Add a new OmniAuth provider. Check the wiki for more information on setting
+ # up on your models and hooks.
+ # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
+
+ # ==> Warden configuration
+ # If you want to use other strategies, that are not supported by Devise, or
+ # change the failure app, you can configure them inside the config.warden block.
+ #
+ # config.warden do |manager|
+ # manager.intercept_401 = false
+ # manager.default_strategies(scope: :user).unshift :some_external_strategy
+ # end
+
+ # ==> Mountable engine configurations
+ # When using Devise inside an engine, let's call it `MyEngine`, and this engine
+ # is mountable, there are some extra configurations to be taken into account.
+ # The following options are available, assuming the engine is mounted as:
+ #
+ # mount MyEngine, at: '/my_engine'
+ #
+ # The router that invoked `devise_for`, in the example above, would be:
+ # config.router_name = :my_engine
+ #
+ # When using OmniAuth, Devise cannot automatically set OmniAuth path,
+ # so you need to do it manually. For the users scope, it would be:
+ # config.omniauth_path_prefix = '/my_engine/users/auth'
+
+ config.omniauth :github, Figaro.env.github_app_id, Figaro.env.github_app_secret
+end
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
new file mode 100644
index 0000000..bd4c3eb
--- /dev/null
+++ b/config/locales/devise.en.yml
@@ -0,0 +1,62 @@
+# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+
+en:
+ devise:
+ confirmations:
+ confirmed: "Your email address has been successfully confirmed."
+ send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
+ send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
+ failure:
+ already_authenticated: "You are already signed in."
+ inactive: "Your account is not activated yet."
+ invalid: "Invalid %{authentication_keys} or password."
+ locked: "Your account is locked."
+ last_attempt: "You have one more attempt before your account is locked."
+ not_found_in_database: "Invalid %{authentication_keys} or password."
+ timeout: "Your session expired. Please sign in again to continue."
+ unauthenticated: "You need to sign in or sign up before continuing."
+ unconfirmed: "You have to confirm your email address before continuing."
+ mailer:
+ confirmation_instructions:
+ subject: "Confirmation instructions"
+ reset_password_instructions:
+ subject: "Reset password instructions"
+ unlock_instructions:
+ subject: "Unlock instructions"
+ password_change:
+ subject: "Password Changed"
+ omniauth_callbacks:
+ failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
+ success: "Successfully authenticated from %{kind} account."
+ passwords:
+ no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+ send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
+ send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+ updated: "Your password has been changed successfully. You are now signed in."
+ updated_not_active: "Your password has been changed successfully."
+ registrations:
+ destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
+ signed_up: "Welcome! You have signed up successfully."
+ signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
+ signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
+ signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
+ update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address."
+ updated: "Your account has been updated successfully."
+ sessions:
+ signed_in: "Signed in successfully."
+ signed_out: "Signed out successfully."
+ already_signed_out: "Signed out successfully."
+ unlocks:
+ send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
+ send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
+ unlocked: "Your account has been unlocked successfully. Please sign in to continue."
+ errors:
+ messages:
+ already_confirmed: "was already confirmed, please try signing in"
+ confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
+ expired: "has expired, please request a new one"
+ not_found: "not found"
+ not_locked: "was not locked"
+ not_saved:
+ one: "1 error prohibited this %{resource} from being saved:"
+ other: "%{count} errors prohibited this %{resource} from being saved:"
diff --git a/config/routes.rb b/config/routes.rb
index 2540f57..c0e478d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,5 @@
Rails.application.routes.draw do
+ devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" }, :skip => [:password]
resources :projects
root 'projects#index'
end
diff --git a/db/migrate/20161019233104_devise_create_users.rb b/db/migrate/20161019233104_devise_create_users.rb
new file mode 100644
index 0000000..27ce622
--- /dev/null
+++ b/db/migrate/20161019233104_devise_create_users.rb
@@ -0,0 +1,44 @@
+class DeviseCreateUsers < ActiveRecord::Migration
+ def change
+ create_table :users do |t|
+ ## Database authenticatable
+ t.string :provider_username, null: false, default: ""
+ t.string :email, null: false, default: ""
+ t.string :encrypted_password, null: false, default: ""
+
+ ## Recoverable
+ t.string :reset_password_token
+ t.datetime :reset_password_sent_at
+
+ ## Rememberable
+ t.datetime :remember_created_at
+
+ ## Trackable
+ t.integer :sign_in_count, default: 0, null: false
+ t.datetime :current_sign_in_at
+ t.datetime :last_sign_in_at
+ t.string :current_sign_in_ip
+ t.string :last_sign_in_ip
+
+ ## Confirmable
+ # t.string :confirmation_token
+ # t.datetime :confirmed_at
+ # t.datetime :confirmation_sent_at
+ # t.string :unconfirmed_email # Only if using reconfirmable
+
+ ## Lockable
+ # t.integer :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
+ # t.string :unlock_token # Only if unlock strategy is :email or :both
+ # t.datetime :locked_at
+
+
+ t.timestamps null: false
+ end
+
+ add_index :users, :provider_username, unique: true
+ add_index :users, :email, unique: true
+ add_index :users, :reset_password_token, unique: true
+ # add_index :users, :confirmation_token, unique: true
+ # add_index :users, :unlock_token, unique: true
+ end
+end
diff --git a/db/migrate/20161019234426_add_omniauth_to_users.rb b/db/migrate/20161019234426_add_omniauth_to_users.rb
new file mode 100644
index 0000000..9c23c47
--- /dev/null
+++ b/db/migrate/20161019234426_add_omniauth_to_users.rb
@@ -0,0 +1,6 @@
+class AddOmniauthToUsers < ActiveRecord::Migration
+ def change
+ add_column :users, :provider, :string
+ add_column :users, :uid, :string
+ end
+end
diff --git a/db/migrate/20161020034239_add_role_to_users.rb b/db/migrate/20161020034239_add_role_to_users.rb
new file mode 100644
index 0000000..ea24805
--- /dev/null
+++ b/db/migrate/20161020034239_add_role_to_users.rb
@@ -0,0 +1,5 @@
+class AddRoleToUsers < ActiveRecord::Migration
+ def change
+ add_column :users, :role, :string, null: false, default: "coach"
+ end
+end
diff --git a/db/migrate/20161020040440_create_root_user.rb b/db/migrate/20161020040440_create_root_user.rb
new file mode 100644
index 0000000..d9bf218
--- /dev/null
+++ b/db/migrate/20161020040440_create_root_user.rb
@@ -0,0 +1,19 @@
+class CreateRootUser < ActiveRecord::Migration
+ def up
+ User.create!(email: "junyuw@berkeley.edu",
+ password: Devise.friendly_token[0,20],
+ provider_username: "DrakeW",
+ provider: "github",
+ role: "admin")
+ User.create!(email: "fox@cs.berkeley.edu",
+ password: Devise.friendly_token[0,20],
+ provider_username: "armandofox",
+ provider: "github",
+ role: "admin")
+ end
+
+ def down
+ User.where(email: "junyuw@berkeley.edu", provider: "github").first.destroy
+ User.where(email: "fox@cs.berkeley.edu", provider: "github").first.destroy
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 1a2ae0c..a6a3d20 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20160804055752) do
+ActiveRecord::Schema.define(version: 20161020040440) do
create_table "configs", force: :cascade do |t|
t.integer "project_id"
@@ -30,9 +30,9 @@
t.text "encrypted_raw_data"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
+ t.string "encrypted_raw_data_iv"
t.float "score"
t.text "image"
- t.string "encrypted_raw_data_iv"
end
add_index "metric_samples", ["project_id", "metric_name"], name: "index_metric_samples_on_project_id_and_metric_name"
@@ -46,4 +46,27 @@
add_index "projects", ["name"], name: "index_projects_on_name"
+ create_table "users", force: :cascade do |t|
+ t.string "provider_username", default: "", null: false
+ t.string "email", default: "", null: false
+ t.string "encrypted_password", default: "", null: false
+ t.string "reset_password_token"
+ t.datetime "reset_password_sent_at"
+ t.datetime "remember_created_at"
+ t.integer "sign_in_count", default: 0, null: false
+ t.datetime "current_sign_in_at"
+ t.datetime "last_sign_in_at"
+ t.string "current_sign_in_ip"
+ t.string "last_sign_in_ip"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.string "provider"
+ t.string "uid"
+ t.string "role", default: "coach", null: false
+ end
+
+ add_index "users", ["email"], name: "index_users_on_email", unique: true
+ add_index "users", ["provider_username"], name: "index_users_on_provider_username", unique: true
+ add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
+
end
diff --git a/features/add_project_with_config.feature b/features/add_project_with_config.feature
index cf5d7ca..1059176 100644
--- a/features/add_project_with_config.feature
+++ b/features/add_project_with_config.feature
@@ -1,4 +1,4 @@
-@javascript
+@javascript @omniauth
Feature: add project and its config/credentials info
As a project supervisor
diff --git a/features/github_user_login.feature b/features/github_user_login.feature
new file mode 100644
index 0000000..9d6e3af
--- /dev/null
+++ b/features/github_user_login.feature
@@ -0,0 +1,18 @@
+@omniauth
+Feature: GitHub User Login
+ As a user of projectscope, I should be able to login
+ if I have an valid github account
+
+Scenario: github user login
+ Given I am on the login page
+ And I have a valid github account with email "test-coach@test.com" username "test-coach"
+ When I follow "Sign in with GitHub"
+ Then I should be on the home page
+ And I should see "Signed in successfully."
+
+Scenario: unauthrozied user login
+ Given I am on the login page
+ And I do not have a valid github account
+ When I follow "Sign in with GitHub"
+ Then I should be on the login page
+ And I should see "Could not authenticate you from GitHub"
diff --git a/features/step_definitions/project_steps.rb b/features/step_definitions/project_steps.rb
index 9ac77c5..402eabf 100644
--- a/features/step_definitions/project_steps.rb
+++ b/features/step_definitions/project_steps.rb
@@ -56,7 +56,12 @@
end
And(/^I am logged in$/) do
- page.driver.basic_authorize('cs169', ENV['PROJECTSCOPE_PASSWORD'])
+ steps %Q{
+ Given I am on the login page
+ And I have a valid github account with email "test-coach@test.com" username "test-coach"
+ And I follow "Sign in with GitHub"
+ }
+ sleep(1)
end
Then(/^the config value "([^"]*)" should not appear in the page$/) do |value|
diff --git a/features/step_definitions/user_login_steps.rb b/features/step_definitions/user_login_steps.rb
new file mode 100644
index 0000000..c24773c
--- /dev/null
+++ b/features/step_definitions/user_login_steps.rb
@@ -0,0 +1,20 @@
+When /^I have a valid github account with email "(.*)" username "(.*)"/ do |email, username|
+ OmniAuth.config.mock_auth[:github] = OmniAuth::AuthHash.new(
+ {
+ :uid => '12345',
+ :info => {
+ :email => email
+ },
+ :extra => {
+ :raw_info => {
+ :email => email,
+ :login => username
+ }
+ }
+ })
+end
+
+When /^I do not have a valid github account/ do
+ OmniAuth.config.mock_auth[:github] = :invalid_credentials
+end
+
\ No newline at end of file
diff --git a/features/support/env.rb b/features/support/env.rb
index f41841a..a84ced1 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -60,3 +60,12 @@
Cucumber::Rails::Database.javascript_strategy = :truncation
World(FactoryGirl::Syntax::Methods)
+
+# for cucumber omniauth test
+Before('@omniauth') do
+ OmniAuth.config.test_mode = true
+end
+
+After('@omniauth') do
+ OmniAuth.config.test_mode = false
+end
diff --git a/features/support/paths.rb b/features/support/paths.rb
index 55c3239..429951b 100644
--- a/features/support/paths.rb
+++ b/features/support/paths.rb
@@ -19,6 +19,8 @@ def path_to(page_name)
'/projects'
when /^the edit page for project "(.*)"$/ then
"/projects/#{Project.find_by(name: $1).id}/edit"
+ when /^the login page/ then
+ '/users/sign_in'
# Add more mappings here.
# Here is an example that pulls values out of the Regexp:
#
diff --git a/features/view_metrics.feature b/features/view_metrics.feature
index 630a5d6..659edcf 100644
--- a/features/view_metrics.feature
+++ b/features/view_metrics.feature
@@ -1,4 +1,4 @@
-@javascript @vcr
+@javascript @vcr @omniauth
Feature: View A Projects Metrics
As a project supervisor
diff --git a/features/view_metrics_with_secrets.feature b/features/view_metrics_with_secrets.feature
index 64064a2..4df9cf5 100644
--- a/features/view_metrics_with_secrets.feature
+++ b/features/view_metrics_with_secrets.feature
@@ -1,4 +1,4 @@
-@javascript @vcr
+@javascript @vcr @omniauth
Feature: View A Projects Metrics with Secrets
As a project supervisor
diff --git a/iterations/iter0.md b/iterations/iter0.md
new file mode 100644
index 0000000..07f8e13
--- /dev/null
+++ b/iterations/iter0.md
@@ -0,0 +1,26 @@
+## Iteration 0
+
+Entry video
+---
+URL: https://youtu.be/0qMtzclG9Is
+
+Development Environment Setup Screencast
+---
+Junyu Wang: https://youtu.be/pPfSiQsZm5I
+
+Jiacheng Wu: https://youtu.be/x8AOtKAzmaQ
+
+Shuotong Wu: http://youtu.be/-65Oz8VtzDw?hd=1
+
+Yibing Chen: https://youtu.be/U1Z-9KzoL7c
+
+Jiawei Jiang: https://youtu.be/ClqYbe2Ipnc
+
+Pivotal Tracker Project
+---
+URL: https://www.pivotaltracker.com/n/projects/1886749
+
+Heroku
+---
+URL: https://projectscope-cs169-junyu.herokuapp.com/
+
diff --git a/spec/models/config_spec.rb b/spec/models/config_spec.rb
index d054c4b..040eb4c 100644
--- a/spec/models/config_spec.rb
+++ b/spec/models/config_spec.rb
@@ -1,3 +1,16 @@
+# == Schema Information
+#
+# Table name: configs
+#
+# id :integer not null, primary key
+# project_id :integer
+# metric_name :string
+# encrypted_options :text
+# created_at :datetime not null
+# updated_at :datetime not null
+# encrypted_options_iv :string
+#
+
require 'rails_helper'
describe Config do