phcdevworks_accounts_auth0 0.3.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31bcba28f2f4367a49b1a3a27fba476bf5401678f3c0bbf4dc9ed095ab425e3c
-  data.tar.gz: b1fa78eb7301878cb358f67c0c78860a3fc100f357033b2514b081d4b639f61f
+  metadata.gz: 330728b841f8d36c168b82959b07ab61496f18b58fe84ffcc745ae37207685ea
+  data.tar.gz: 33fa99a27bd820a4e35010da44bfc1c1d6cfbcd40660c50108d057528846bd63
 SHA512:
-  metadata.gz: 508a3fc24fdd2031690e25fe2621d9fea544ce2421f822563e95d47c9ccfdb25bcd1a017c1822102d38e443deef84422b70247a4241aba44b4e55fb317353a9e
-  data.tar.gz: e321a2f5fe25e9180fb892adda5aadb564b35feb4902811407cc5a93289f77a6f846490880f32615bb91648039af6d1e3340b26f3ced7a7c68185f33b82dda2e
+  metadata.gz: 297ef0b8006bbc3ca2489b8552f08ef5505971b8ee179bbcc03f46d7c5c9ef82431e0fc26e742b009d1f8fef1dc2a21bf26fc46ed5deff4d09df053a1ddf69ab
+  data.tar.gz: b10458d97f1c5d7840ce8a25db98b05dc580b51637d360593f330c39d2d57370a145938e7673869cecff6aff427cee14689e12cf463a3580a7ba7b66ad3f24fc

data/app/controllers/phcdevworks_accounts_auth0/user/pages_controller.rb

@@ -1,4 +1,14 @@
 module PhcdevworksAccountsAuth0
   class User::PagesController < ApplicationController
+
+    def dashboard
+    end
+
+    def profile
+      @user = session[:userinfo]
+    end
+
+
+
   end
 end

data/app/helpers/phcdevworks_accounts_auth0/application_helper.rb

@@ -1,6 +1,26 @@
 module PhcdevworksAccountsAuth0
   module ApplicationHelper
 
+    def user_signed_in?
+      session['userinfo'].present?
+    end
+
+    def authenticate_user!
+      if user_signed_in?
+        @current_user = session['userinfo']
+      else
+        redirect_to root_path
+      end
+    end
+
+    def current_user
+      @current_user
+    end
+
+    def reset_session
+      session['userinfo'] = nil if session['userinfo'].present?
+    end
+
     def current_user
       @current_user = session['userinfo']
     end

data/app/views/layouts/phcdevworks_accounts_auth0/components/backend/navigation/_top_menu.html.erb

@@ -19,9 +19,9 @@
   <div class="navbar-nav">
     <div class="navbar-item navbar-user dropdown">
       <a href="#" class="navbar-link dropdown-toggle d-flex align-items-center" data-bs-toggle="dropdown">
-        <%= image_tag current_user.gravatar_url %>
+        <%= image_tag current_user['picture'] %>
         <span>
-          <span class="d-none d-md-inline"><%= current_user.firstname + " " + current_user.lastname %></span>
+          <span class="d-none d-md-inline"><%= current_user['name'] %></span>
           <b class="caret"></b>
         </span>
       </a>

data/app/views/layouts/phcdevworks_accounts_auth0/components/backend/sidebars/_side_menu.html.erb

@@ -8,16 +8,33 @@
 				<a href="javascript:;" class="menu-profile-link" data-toggle="app-sidebar-profile" data-target="#appSidebarProfileMenu">
 					<div class="menu-profile-cover with-shadow"></div>
 					<div class="menu-profile-image">
-						<%= image_tag current_user.gravatar_url %>
+						<% if defined?phcdevworks_accounts_devise %>
+							<%= image_tag current_user.gravatar_url %>
+						<% end %>
+						<% if defined?phcdevworks_accounts_auth0 %>
+							<%= image_tag current_user['picture'] %>
+						<% end %>
 					</div>
 					<div class="menu-profile-info">
 						<div class="d-flex align-items-center">
 							<div class="flex-grow-1">
-								<%= current_user.firstname + " " + current_user.lastname  %>
+								<% if defined?phcdevworks_accounts_devise %>
+									<%= current_user.firstname + " " + current_user.lastname  %>
+								<% end %>
+								<% if defined?phcdevworks_accounts_auth0 %>
+									<%= current_user['name'] %>
+								<% end %>
 							</div>
 							<div class="menu-caret ms-auto"></div>
 						</div>
-						<small><%= current_user.username %></small>
+						<small>
+							<% if defined?phcdevworks_accounts_devise %>
+								<%= current_user.username %>
+							<% end %>
+							<% if defined?phcdevworks_accounts_auth0 %>
+								<%= current_user['nickname'] %>
+							<% end %>
+						</small>
 					</div>
 				</a>
 			<% end %>
@@ -833,7 +850,7 @@
 
 		<!-- -PHCDEV- Page Container - Sidebar - Navigation - PHCDevworks Accounts -->
 		
-		<% if defined?phcdevworks_accounts_stripe and current_user.admin? %>
+		<% if defined?phcdevworks_accounts_stripe and defined?phcdevworks_accounts_devise and current_user.admin? %>
 			<div class="menu-header">Subscription Administration</div>
 			<div class="menu-item has-sub">
 				<a href="javascript:;" class="menu-link">
@@ -889,7 +906,7 @@
 				</div>
 			</div>
 		<% end %>
-		<% if current_user and current_user.admin? %>
+		<% if defined?phcdevworks_accounts_devise and current_user and current_user.admin? %>
 			<div class="menu-header">Login Administration</div>
 			<div class="menu-item has-sub">
 				<a href="javascript:;" class="menu-link">

data/app/views/phcdevworks_accounts_auth0/user/pages/profile.html.erb

@@ -0,0 +1,4 @@
+<div>
+<p>Normalized User Profile:<%= JSON.pretty_generate(@user[:info])%></p>
+<p>Full User Profile:<%= JSON.pretty_generate(@user[:extra][:raw_info])%></p>
+</div>

data/config/routes.rb

@@ -1,12 +1,12 @@
 PhcdevworksAccountsAuth0::Engine.routes.draw do
 
     # User Dashboard
-    match "user", to: "user/pages#dashboard", via: "get"
-    match "user/profile", to: "user/pages#profile", via: "get"
+    get "dashboard" => 'user/pages#dashboard'
+    get "profile" => 'user/pages#profile'
 
     # Auth Routes
-    get "/auth/auth0", as: "authentication"
-    get "/auth/auth0/callback" => "auth/handler#callback"
+    get "/auth/", as: "authentication"
+    get "/auth/callback" => "auth/handler#callback"
     get "/auth/failure" => "auth/handler#failure"
     get "/auth/logout" => "auth/handler#logout"
     get "/auth/redirect" => "auth/handler#redirect"

data/lib/phcdevworks_accounts_auth0/version.rb

@@ -1,3 +1,3 @@
 module PhcdevworksAccountsAuth0
-  VERSION = "0.3.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phcdevworks_accounts_auth0
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.6.0
 platform: ruby
 authors:
 - PHCDevworks
@@ -337,7 +337,6 @@ files:
 - app/controllers/phcdevworks_accounts_auth0/auth/handler_controller.rb
 - app/controllers/phcdevworks_accounts_auth0/user/pages_controller.rb
 - app/helpers/phcdevworks_accounts_auth0/application_helper.rb
-- app/helpers/phcdevworks_accounts_auth0/user/pages_helper.rb
 - app/jobs/phcdevworks_accounts_auth0/application_job.rb
 - app/mailers/phcdevworks_accounts_auth0/application_mailer.rb
 - app/models/phcdevworks_accounts_auth0/application_record.rb

data/app/helpers/phcdevworks_accounts_auth0/user/pages_helper.rb

@@ -1,4 +0,0 @@
-module PhcdevworksAccountsAuth0
-  module User::PagesHelper
-  end
-end