user_management_rails 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 454e19349bd2cc5c86c5153b6a610ad2c373ce52
-  data.tar.gz: 59448d316fbf22a3d657c6cdde2d7122efbeef70
+SHA256:
+  metadata.gz: 2b32d313222d2d7b0e9e957eeb1e60d1880f74c43537508bddb375ae24d73db7
+  data.tar.gz: 9a795605044d0e73b1a569dba6e9eaca01f14477e9d071d98af710b5056c92a3
 SHA512:
-  metadata.gz: 4d4d111ab93864f852431b9e531e1d5d3f4174103a1796d00b201f9d54f262c392e9d3b09e3e9994508b4857c045ce5de863fa5bacff0a28b40b9864315e8fe9
-  data.tar.gz: 3ef9118b9bb071a819af070a72c71150a954d41ef421b6d089394a8c8ae7538bbfe6ede99b42603d0ad2b41d492a6d2043c5900f208664a36a1e77e1d78c5550
+  metadata.gz: ed9c00d68fd9829eaf2b7ff9ca2c1b71362081455a8a0c16a6d71ba314e95a6c88717f174f926e9d88f768a987be2ff12284e263d9491b2e2504bc6d13e98e36
+  data.tar.gz: 84def8bfbeb4238f5ea03f6f16d4afec77c8271ce35483fe9e742a38059078b9736be7bb5f6ae024a2245749d1e78caefe18b105584129b47ae55df6bba6cde7

data/README.md

@@ -5,7 +5,7 @@ Short description and motivation.
 How to use my plugin.
 Gem has next methods:
 `decode_user(jwt)` - expects jwt with user and returns decoded payload(in our case user info).
-`valid_jwt?(jwt)` - expects jwt and checks if it is valid. Return `true` when it is valid, otherwise returns `false` 
+`valid_jwt?(jwt)` - expects jwt and checks if it is valid. Return `true` when it is valid, otherwise returns `false`
 
 Gem adds next endpoints to your application:
 `/logins` which has next methods:
@@ -16,7 +16,7 @@ Gem provides current_user_hash method for your controller by adding next line to
 ```ruby
   include UserManagementRails::Concerns::UserResource
 ```
-It has one optional param `raise_jwt_error` which when true (by default) will rise exception if user jwt has expired. 
+It has one optional param `raise_jwt_error` which when true (by default) will rise exception if user jwt has expired.
 If you don't want to raise exception then pass `false` and when token is expired then jwt will be deleted for cookies.
 
 How it works:
@@ -50,7 +50,7 @@ Default routes installed:
 $ rake routes
 Prefix Verb URI Pattern      Controller#Action
 user_management_rails      /                UserManagementRails::Engine
-                 home GET  /home(.:format)  user_management#loggedin
+                 home GET  /home(.:format)  user_management#home
                 login GET  /login(.:format) user_management#login
                  root GET  /                user_management#signup
 
@@ -58,9 +58,9 @@ Routes for UserManagementRails::Engine:
 logins POST /logins(.:format) user_management_rails/logins#create
 ```
 
-## Requirements 
+## Requirements
 In your routes.rb file you should specify where `/login` endpoint will be mount.
-Example: 
+Example:
 ```ruby
  mount UserManagementRails::Engine, at: '/'  
 ```
@@ -75,7 +75,7 @@ Then gems `/login` endpoint will be mounted on `domain.com/some_path/logins`
 
 ## Adding new version of gem to rubygems repository
 After you made changes and increment version of gem in(/lib/user_management_rails/version.rb)
-you need to build and push new gem file to rubygems.org: 
+you need to build and push new gem file to rubygems.org:
 ```bash
 gem build user_management_rails.gemspec
 gem push user_management_rails-<VERSION_OF_GEM>.gem

data/app/controllers/user_management_rails/concerns/user_resource.rb

@@ -15,6 +15,10 @@ module UserManagementRails::Concerns::UserResource
     result
   end
 
+  def current_user_logout
+    cookies.delete :jwt
+  end
+
   private
 
   def handle_error

data/lib/generators/templates/controllers/user_management_controller.rb

@@ -2,27 +2,31 @@ class UserManagementController < ApplicationController
   include UserManagementRails::Concerns::UserResource
 
   def signup
-    if current_user_hash
-       redirect_to action: 'loggedin'
+    if current_user_hash(false)
+       redirect_to action: 'home'
     else
       render 'signup'
     end
   end
 
   def login
-    if current_user_hash
-      redirect_to action: 'loggedin'
+    if current_user_hash(false)
+      redirect_to action: 'home'
     else
       render 'login'
     end
   end
 
-  def loggedin
-    if current_user_hash
+  def home
+    if current_user_hash(false)
       @userinfo = current_user_hash.values_at("phone","email")
     else
       redirect_to action: 'login'
     end
   end
 
+  def logout
+    current_user_logout
+    redirect_to action: 'login'
+  end
 end

data/lib/generators/templates/views/{loggedin.html.erb → home.html.erb}

@@ -5,5 +5,6 @@
   <body>
     <h3>"You Are Logged In as"</h3>
     <h4><%%= @userinfo %></h4>
+    <%%= button_to "Log Out", {:controller => :user_management, :action=> 'logout'} %>
   </body>
 </html>

data/lib/generators/templates/views/login.html.erb

@@ -10,26 +10,18 @@
 
     <script type='text/javascript' src="//code.jquery.com/jquery-3.1.1.min.js"></script>
 
-    <script type='text/javascript' src="//cdn.rawgit.com/oauth-io/oauth-js/c5af4519/dist/oauth.js"></script>
-
     <script type='text/javascript' src="https://s3.amazonaws.com/ringcaptcha-test/widget/jwt-20180328/bundle.js"></script>
 
-
     <script type='text/javascript'>
       $(document).ready(function() {
         $('#widget-point').append(
           '<div id="xyz" data-widget data-locale="en" data-mode="login" data-type="dual"></div>'
         );
-
         $('#xyz').each(function() {
-          // var appKey = "3i8i2ihu7e9u6orapyga";
-          // var userManagementId = '0bb071d01611abdf8e76c3';
           var appKey = "<%%= UserManagementRails.configuration.ringcaptcha_key %>";
           var userManagementId = "<%%= UserManagementRails.configuration.um_key %>";
-          var oauthioKey = 'HwAr2OtSxRgEEnO2-JnYjsuA3tc';
           var settings = $(this).data();
           // Initialize the SDK
-          //OAuth.initialize(oauthioKey)
           settings.app = appKey;
           settings.events = {
             login: function(event, formValues) {
@@ -39,8 +31,10 @@
               const data = dataString ? JSON.parse(dataString) : null;
               console.log("Login: data:", data);
               console.log("Login success for:", formValues.login);
-              $.post('/logins',{jwt:formValues['jwt']});
-              window.location.replace('./home');
+              $.post('/logins',{jwt:formValues['jwt']})
+              .done(function() {
+                window.location.replace('/home');
+              });
             }
           };
           settings.form = [

data/lib/generators/templates/views/signup.html.erb

@@ -10,45 +10,30 @@
 
     <script type='text/javascript' src="//code.jquery.com/jquery-3.1.1.min.js"></script>
 
-    <script type='text/javascript' src="//cdn.rawgit.com/oauth-io/oauth-js/c5af4519/dist/oauth.js"></script>
-
     <script type='text/javascript' src="https://s3.amazonaws.com/ringcaptcha-test/widget/jwt-20180328/bundle.js"></script>
 
     <script>
-    $(document).ready(function() {
+      $(document).ready(function() {
         $('#widget-point').append(
           '<div id="xyz" data-widget data-locale="en" data-mode="signup" data-type="dual"></div>'
         );
-          $('#xyz').each(function() {
-            // var appKey = "3i8i2ihu7e9u6orapyga";
-            // var userManagementId = '0bb071d01611abdf8e76c3';
-            var appKey = "<%%= UserManagementRails.configuration.ringcaptcha_key %>";
-            var userManagementId = "<%%= UserManagementRails.configuration.um_key %>";
-            var oauthioKey = "HwAr2OtSxRgEEnO2-JnYjsuA3tc";
-            var settings = $(this).data();
-            // Initialize the SDK
-            OAuth.initialize(oauthioKey)
-            settings.app = appKey;
-            settings.events = {
-              signup: function(event, formValues) {
-                console.log("Signup: event:", event);
-                console.log("Signup: formValues:", formValues);
-                const dataString = localStorage.getItem('ringcaptcha.widget.' + appKey);
-                const data = dataString ? JSON.parse(dataString) : null;
-                console.log("Signup: data:", data);
-                User.signup({
-                  email: formValues.email,
-                  password: "Freef0rall!",
-                  firstname: "Fname",
-                  lastname: "Lname",
-                  phone: formValues.phone
-                  }).done(function(user) {
-                   console.log("User.signup success for:", formValues.email);
-                   $.post('/logins',{jwt:formValues['jwt']});
-                   window.location.replace('/home');
-                 });
-              }
-            };
+        $('#xyz').each(function() {
+          var appKey = "<%%= UserManagementRails.configuration.ringcaptcha_key %>";
+          var userManagementId = "<%%= UserManagementRails.configuration.um_key %>";
+          var settings = $(this).data();
+          // Initialize the SDK
+          settings.app = appKey;
+          settings.events = {
+            signup: function(event, formValues) {
+              console.log("Signup: event:", event);
+              console.log("Signup: formValues:", formValues);
+              const dataString = localStorage.getItem('ringcaptcha.widget.' + appKey);
+              const data = dataString ? JSON.parse(dataString) : null;
+              console.log("Signup: data:", data);
+              console.log("User.signup success for:", formValues.email);
+              window.location.replace('/home');
+            }
+          };
           settings.form = [
             {
               id: 'email',

data/lib/generators/user_management_rails/install_generator.rb

@@ -47,14 +47,15 @@ module UserManagementRails
                    "app/views/user_management/signup.html.erb"
       template "views/login.html.erb",
                    "app/views/user_management/login.html.erb"
-      template "views/loggedin.html.erb",
-                   "app/views/user_management/loggedin.html.erb"
+      template "views/home.html.erb",
+                   "app/views/user_management/home.html.erb"
     end
 
     def add_routes
       route "root 'user_management#signup'"
+      route "post '/logout', to: 'user_management#logout'"
       route "get '/login', to: 'user_management#login'"
-      route "get '/home', to: 'user_management#loggedin'"
+      route "get '/home', to: 'user_management#home'"
       route "mount UserManagementRails::Engine, at: '/'"
     end
 

data/lib/user_management_rails/version.rb

@@ -1,3 +1,3 @@
 module UserManagementRails
-  VERSION = '0.1.4'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: user_management_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - RingCaptcha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-26 00:00:00.000000000 Z
+date: 2018-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -208,7 +208,7 @@ files:
 - lib/generators/templates/README
 - lib/generators/templates/controllers/user_management_controller.rb
 - lib/generators/templates/user_management_initializer.rb
-- lib/generators/templates/views/loggedin.html.erb
+- lib/generators/templates/views/home.html.erb
 - lib/generators/templates/views/login.html.erb
 - lib/generators/templates/views/signup.html.erb
 - lib/generators/user_management_rails/install_generator.rb
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: RingCaptcha widget RoR helper.