push_type_auth 0.9.5 → 0.10.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 307f41223666c8b9ae7cec66068a94bf94b7c7e7
-  data.tar.gz: 3a292ad8bd968df05da0a1350016271c474e947d
+  metadata.gz: 7c9ba786935e68d44e0b6e727ec74a73e9b27fe6
+  data.tar.gz: 76b76eb8af26d7133de08e475e292b564c3ae285
 SHA512:
-  metadata.gz: 491b275bd26b74748da33b17fa90a4c398bfa161395fa5e83945264e379bdb023f19e07763763acb0b4b70e1a703459ee627234afb6118da638b2954c2a9128e
-  data.tar.gz: 46f23779d7d802300ceb181cff954bc37efeaacb1f79c4069e30d940c5b7eab4be55d340bfca01f6986a35f9f5387fc054a2b898a7cae589f59968dc2d4a9208
+  metadata.gz: e64ff974f5ffb1dc6b9075271cdb4248154b48ad159997cdc820064350845a9e1d2c7a377d5138abc7305426cf09dfd71cdd90033e0867bc1478ca013c364b6f
+  data.tar.gz: 38a88f8dcc08e12dbd145339b1d11095ede5434d5c55a78a817c88139fc3629e7ebf268e1ea98387ee4b1b57c9f8561106078c41d319e9babdc471df38635489

data/LICENSE.md

@@ -0,0 +1,22 @@
+# PushType License
+
+Copyright 2014-2016 Push Code Ltd
+
+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/app/controllers/concerns/push_type/api_authentication_methods.rb

@@ -0,0 +1,30 @@
+module PushType
+  module ApiAuthenticationMethods
+    extend ActiveSupport::Concern
+
+    included do
+      before_action :authenticate_user!
+    end
+
+    protected
+
+    def authenticate_user!
+      unless current_push_type_user
+        head(:unauthorized)
+      end
+    end
+
+    def current_push_type_user
+      @current_push_type_user ||= begin
+        Knock::AuthToken.new(token: auth_token).entity_for(PushType::User)
+      rescue
+        nil
+      end
+    end
+
+    def auth_token
+      params[:token] || request.headers['Authorization']&.split&.last
+    end
+
+  end
+end

data/app/controllers/concerns/push_type/authentication_methods.rb

@@ -12,7 +12,7 @@ module PushType
       if user_signed_in?
         super
       else
-        redirect_to push_type.new_user_session_path, alert: t('devise.failure.unauthenticated')
+        redirect_to push_type_admin.new_user_session_path, alert: t('devise.failure.unauthenticated')
       end
     end
 

data/app/controllers/concerns/push_type/invitation_methods.rb

@@ -6,7 +6,7 @@ module PushType
       load_user
       @user.resend_confirmation_instructions
       flash[:notice] = 'Sign up instructions have been resent to the user.'
-      redirect_back fallback_location: push_type.user_path(@user)
+      redirect_back fallback_location: push_type_admin.user_path(@user)
     end
 
   end

data/app/controllers/push_type/admin/profiles_controller.rb

@@ -0,0 +1,50 @@
+require_dependency "push_type/admin_controller"
+
+module PushType
+  class Admin::ProfilesController < AdminController
+
+    before_action :load_user
+
+    def edit
+    end
+
+    def update
+      if update_user profile_params
+        flash[:notice] = 'Profile successfully updated.'
+        bypass_sign_in @user
+        redirect_to push_type_admin.edit_profile_path
+      else
+        render 'edit'
+      end
+    end
+
+    private
+
+    def initial_breadcrumb
+      breadcrumbs.add 'Profile', push_type_admin.edit_profile_path
+    end
+
+    def load_user
+      @user = current_user
+    end
+
+    def update_user(user_params)
+      if password_required?
+        @user.update_with_password user_params
+      else
+        user_params.delete :current_password
+        @user.update_without_password user_params
+      end
+    end
+
+    def password_required?
+      profile_params[:password].present? || profile_params[:password_confirmation].present?
+    end
+
+    def profile_params
+      fields = [:name, :email, :current_password, :password, :password_confirmation] + @user.fields.keys
+      params.fetch(:user, {}).permit(*fields)
+    end
+
+  end
+end

data/app/models/concerns/push_type/authenticatable.rb

@@ -11,7 +11,7 @@ module PushType
 
       def password_required?
         persisted? ? super : false
-      end  
+      end
     end
 
   end

data/app/views/devise/mailer/confirmation_instructions.html.erb

@@ -7,7 +7,7 @@
 <table>
   <tr>
     <td class="padding">
-      <p><%= link_to 'Confirm my account', confirmation_url(@user, confirmation_token: @token), class: 'btn-primary' %></p>
+      <p><%= link_to 'Confirm my account', push_type_admin.user_confirmation_url(@user, confirmation_token: @token), class: 'btn-primary' %></p>
     </td>
   </tr>
 </table>

data/app/views/devise/mailer/reset_password_instructions.html.erb

@@ -7,7 +7,7 @@
 <table>
   <tr>
     <td class="padding">
-      <p><%= link_to 'Change my password', edit_password_url(@user, reset_password_token: @token), class: 'btn-primary' %></p>
+      <p><%= link_to 'Change my password', push_type_admin.edit_password_url(@user, reset_password_token: @token), class: 'btn-primary' %></p>
     </td>
   </tr>
 </table>

data/app/views/devise/shared/_links.html.erb

@@ -1,25 +1,25 @@
 <%- if controller_name != 'sessions' %>
-  <%= link_to "Log in", new_session_path(resource_name) %><br />
+  <%= link_to "Log in", push_type_admin.new_user_session_path %><br />
 <% end -%>
 
 <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
-  <%= link_to "Sign up", new_registration_path(resource_name) %><br />
+  <%= link_to "Sign up", push_type_admin.new_user_registration_path %><br />
 <% end -%>
 
 <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
-  <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
+  <%= link_to "Forgot your password?", push_type_admin.new_user_password_path %><br />
 <% end -%>
 
 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
-  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
+  <%= link_to "Didn't receive confirmation instructions?", push_type_admin.new_user_confirmation_path %><br />
 <% 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) %><br />
+  <%= link_to "Didn't receive unlock instructions?", push_type_admin.new_user_unlock_path %><br />
 <% end -%>
 
 <%- if devise_mapping.omniauthable? %>
   <%- resource_class.omniauth_providers.each do |provider| %>
-    <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
+    <%= link_to "Sign in with #{provider.to_s.titleize}", push_type_admin.user_omniauth_authorize_path(provider) %><br />
   <% end -%>
 <% end -%>

data/app/views/layouts/push_type/auth.html.erb

@@ -16,13 +16,13 @@
     <nav class="top-bar" data-topbar role="navigation">
       <ul class="title-area">
         <li class="name">
-          <h1><%= link_to image_tag('push_type/pushtype-logo.svg', size: '140x26', alt: 'PushType', class: 'logo'), push_type.root_path %></h1>
+          <h1><%= link_to image_tag('push_type/pushtype-logo.svg', size: '140x26', alt: 'PushType', class: 'logo'), push_type_admin.root_path %></h1>
         </li>
         <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
       </ul>
       <section class="top-bar-section">
         <ul class="right">
-          <%= content_tag :li, link_to(ficon(:home, 'Back to site'), main_app.root_path), :'data-no-turbolink' => true %>
+          <%= content_tag :li, link_to(ficon(:home, 'Back to site'), main_app.home_path), :'data-no-turbolink' => true %>
         </ul>
       </section>
     </nav>

data/app/views/push_type/admin/profiles/edit.html.haml

@@ -0,0 +1,48 @@
+- title 'Profile'
+
+.medium-4.columns
+  .side-panel{ :'side-panel' => true }
+    %ul.side-nav
+      %li.heading Settings
+      %li= link_to 'Profile', push_type_admin.edit_profile_path
+
+
+.medium-8.columns
+  = form_for @user, url: push_type_admin.profile_path do |f|
+    .container
+      .head
+        .title= yield :title
+      .body.padded
+        .row.title
+          .columns
+            = f.label :name
+            = f.text_field :name
+        .row.email
+          .columns
+            = f.label :email
+            = f.email_field :email
+
+        %password-fields{ :'reveal-fields' => [:current_password, :password, :password_confirmation].any? { |k| @user.errors.keys.include? k }, :'inline-template' => true }
+          .row{ :'v-show' => '!revealFields' }
+            .columns
+              %a.button.secondary.tiny.radius{ :'v-on:click' => 'revealFields=true' }= ficon :lock, 'Change password'
+          .row.password{ :'v-show' => 'revealFields' }
+            .small-4.columns
+              = f.label :current_password
+              = f.password_field :current_password
+            .small-4.columns
+              = f.label :password, 'New password'
+              = f.password_field :password
+            .small-4.columns
+              = f.label :password_confirmation, 'Confirm new password'
+              = f.password_field :password_confirmation
+
+        .row.custom-fields
+          - @user.fields.each do |key, field|
+            %div{ class: field_classes(field) }
+              = f.label field.name, field.label
+              = render_field field, f
+
+        .row.submit.text-center
+          %button.button.radius= ficon :check, 'Update profile'
+            

data/app/views/push_type/admin/users/_meta_table.html.haml

@@ -0,0 +1,15 @@
+.meta-row
+  .key Status
+  .value
+    - if @user.new_record?
+      New user
+    - elsif @user.confirmed?
+      Confirmed
+    - else
+      Invited #{ time_ago_in_words @user.confirmation_sent_at } ago
+      = link_to ficon(:mail, 'Resend'), push_type_admin.invite_user_path(@user), method: 'patch', class: 'right'
+- unless @user.new_record?
+  .meta-row
+    .key Logged in
+    .value
+      %time= last_logged_in @user

data/app/views/push_type/confirmations/new.html.haml

@@ -1,6 +1,6 @@
 - title 'Resend confirmation instructions'
 
-= form_for @user, url: push_type.user_confirmation_path, html: { method: :post } do |f|
+= form_for @user, url: push_type_admin.user_confirmation_path, html: { method: :post } do |f|
   .row.text
     .columns
       = f.label :email

data/app/views/push_type/confirmations/show.html.haml

@@ -1,6 +1,6 @@
 - title 'Create a password'
 
-= form_for @user, url: push_type.user_confirm_path do |f|
+= form_for @user, url: push_type_admin.user_confirm_path do |f|
   = f.hidden_field :confirmation_token
   .row.text
     .columns

data/app/views/push_type/passwords/edit.html.haml

@@ -1,6 +1,6 @@
 - title 'Change your password'
 
-= form_for @user, url: push_type.user_password_path, html: { method: :put } do |f|
+= form_for @user, url: push_type_admin.user_password_path, html: { method: :put } do |f|
   = f.hidden_field :reset_password_token
   .row.text
     .columns

data/app/views/push_type/passwords/new.html.haml

@@ -1,6 +1,6 @@
 - title 'Forgot your password?'
 
-= form_for @user, url: push_type.user_password_path, html: { method: :post } do |f|
+= form_for @user, url: push_type_admin.user_password_path, html: { method: :post } do |f|
   .row.text
     .columns
       = f.label :email

data/app/views/push_type/sessions/new.html.haml

@@ -1,6 +1,6 @@
 - title 'Sign in'
 
-= form_for @user, url: push_type.user_session_path do |f|
+= form_for @user, url: push_type_admin.user_session_path do |f|
   .row.text
     .columns
       = f.label :email

data/config/initializers/devise.rb

@@ -251,7 +251,7 @@ Devise.setup do |config|
   #     mount MyEngine, at: '/my_engine'
   #
   # The router that invoked `devise_for`, in the example above, would be:
-  config.router_name = :push_type
+  config.router_name = :push_type_admin
   
   # When using omniauth, Devise cannot automatically set Omniauth path,
   # so you need to do it manually. For the users scope, it would be:

data/config/initializers/knock.rb

@@ -0,0 +1,57 @@
+Knock.setup do |config|
+  ## Expiration claim
+  ## ----------------
+  ##
+  ## How long before a token is expired. If nil is provided, token will
+  ## last forever.
+  ##
+  ## Default:
+  # config.token_lifetime = 1.day
+
+  ## Audience claim
+  ## --------------
+  ##
+  ## Configure the audience claim to identify the recipients that the token
+  ## is intended for.
+  ##
+  ## Default:
+  # config.token_audience = nil
+
+  ## If using Auth0, uncomment the line below
+  # config.token_audience = -> { Rails.application.secrets.auth0_client_id }
+
+  ## Signature algorithm
+  ## -------------------
+  ##
+  ## Configure the algorithm used to encode the token
+  ##
+  ## Default:
+  # config.token_signature_algorithm = 'HS256'
+
+  ## Signature key
+  ## -------------
+  ##
+  ## Configure the key used to sign tokens.
+  ##
+  ## Default:
+  # config.token_secret_signature_key = -> { Rails.application.secrets.secret_key_base }
+
+  ## If using Auth0, uncomment the line below
+  # config.token_secret_signature_key = -> { JWT.base64url_decode Rails.application.secrets.auth0_client_secret }
+
+  ## Public key
+  ## ----------
+  ##
+  ## Configure the public key used to decode tokens, if required.
+  ##
+  ## Default:
+  # config.token_public_key = nil
+
+  ## Exception Class
+  ## ---------------
+  ##
+  ## Configure the exception to be used when user cannot be found.
+  ##
+  ## Default:
+  # config.not_found_exception_class_name = 'ActiveRecord::RecordNotFound'
+end

data/config/routes.rb

@@ -1,11 +1,15 @@
-PushType::Core::Engine.routes.draw do
-  devise_for :users, class_name: "PushType::User", path: ''
+PushType::Admin::Engine.routes.draw do
+
+  devise_for :users, class_name: "PushType::User"
   devise_scope :user do
     patch 'confirmation' => 'confirmations#update', as: :user_confirm
   end
-  resources :users, only: [] do
-    patch :invite, on: :member
-  end
 
-  resource :profile, only: [:edit, :update]
-end
+  scope module: 'admin' do
+    resources :users, only: [] do
+      patch :invite, on: :member
+    end
+    resource :profile, only: [:edit, :update]
+  end
+  
+end

data/lib/push_type/auth.rb

@@ -1,11 +1,14 @@
 require 'push_type_core'
+require 'push_type_api'
 require 'push_type_admin'
+
 require 'devise'
+require 'knock'
 
 module PushType
 
   module Auth
-    ActiveSupport.run_load_hooks(:push_type_auth, PushType)
+    PushType.register_engine self
   end
   
 end

data/lib/push_type/auth/engine.rb

@@ -17,7 +17,8 @@ module PushType
           
           # Extend controllers with auth/invitation methos
           PushType::AdminController.include PushType::AuthenticationMethods
-          PushType::UsersController.include PushType::InvitationMethods
+          PushType::ApiController.include PushType::ApiAuthenticationMethods
+          PushType::Admin::UsersController.include PushType::InvitationMethods
           
           # Configure devise with helpers and layout
           DeviseController.helper PushType::AdminHelper
@@ -38,10 +39,9 @@ module PushType
 
       initializer 'push_type_auth.devise_config' do
         Devise.mailer_sender = PushType.config.mailer_sender
-        Devise.router_name = :push_type
       end
 
-      initializer 'push_type.auth_assets' do
+      initializer 'push_type_auth.admin_assets' do
         ActiveSupport.on_load :push_type_admin do
           admin_assets.javascripts << 'push_type/auth'
         end
@@ -51,11 +51,11 @@ module PushType
         PushType.menu :utility do
           item :settings do
             text  { ficon(:widget) }
-            link  { push_type.edit_profile_path }
+            link  { push_type_admin.edit_profile_path }
           end
           item :sign_out do
             text  { ficon(:power) }
-            link  { push_type.destroy_user_session_path }
+            link  { push_type_admin.destroy_user_session_path }
             link_options method: 'delete'
           end
         end