lwqzx_auth 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 646b1dc96995562fdd2a86af6d410b02b2c48fc8f1b5920eaa58b92341f7d8da
-  data.tar.gz: 7099e401098ffe0a58993aa7be74a4bee1c37455f06ee674f3a9bfa2471f495b
+  metadata.gz: b8c9ac0050837dc3ba05208b6cf877256463594c799cf4b137670145dedc574f
+  data.tar.gz: ec8eddbbdddf5b3e47c56ae84dfa96631775be444fafbdb0188b0ce764e61d80
 SHA512:
-  metadata.gz: 055e9659a80d5a60fd7e326bca73561c3415c335fb02519897eadbfec7e5c0724a8dd5bffa5b02508239b724f0f3a85a798c8c6a796512de9c29098f73bc91d2
-  data.tar.gz: 3b3eeb44c5a7b2d9032bb5d92aa97710c9ab9c4be4915e032d07ebfe468fdbe517634e8585761e8af2c80028d147001d53dc1707173f5670a884acd01412cc06
+  metadata.gz: 3518aff0e40db0abf15db0eb3118eb732ad0649c984adcb8bdbc3157c4070db343a1ac76869612e7a1d21ca336e379ad03e6d63c819fa1656768b38f4673a087
+  data.tar.gz: '08cbd3dc914637acf9d81e091f1154596ab2323fe4a4a346c8d07c88f6cb225341cc5714936fc36db17e815224ba1d2107370694c20420910c86b4aa50d91090'

data/app/controllers/lwqzx_auth/application_controller.rb

@@ -1,6 +1,22 @@
 module LwqzxAuth
   class ApplicationController < ::ApplicationController
     protect_from_forgery with: :exception
-
+    before_action :check_me
+    def check_me
+      auth_token = cookies.signed[:auth_token]
+      unless auth_token.blank?
+        one = Remember.where(token: auth_token).first
+        if one
+          if one.expired > Time.now.to_i
+            session[:login] = one.login
+            session[:realname] = one.name
+            session[:groups] = one.groups
+          else 
+            cookies.delete(:auth_token)
+            one.delete
+          end
+        end
+      end
+    end
   end
 end

data/app/controllers/lwqzx_auth/auth_controller.rb

@@ -8,6 +8,13 @@ module LwqzxAuth
 
     def logout
       flash[:notice]="你已经登出"
+
+      auth_token = cookies[:auth_token]
+      unless auth_token.blank?
+        one = Remember.where(token: auth_token).first
+        cookies.delete(:auth_token)
+        one.delete if one
+      end
       reset_session
       redirect_to  main_app.root_path
     end
@@ -20,6 +27,7 @@ module LwqzxAuth
 
       login = params[:login]
       psd = params[:password]
+      
       hsh = lauth(login,psd)
       if hsh["name"].blank?
         redirect_to login_path , alert: "用户信息有误"
@@ -27,6 +35,18 @@ module LwqzxAuth
         login = hsh["login"]
         name = hsh["name"]
         groups = hsh["user_group"]
+        
+        #rememberme = params[:rememberme]
+        #if rememberme == "yes"
+        #  token = SecureRandom.urlsafe_base64
+        #  cookies.signed[:auth_token] = token
+        #  Remember.create(token: token, login: login, name: name, groups: groups,expired: 7.days.from_now.to_i)
+        #else 
+        #  auth_token = cookies[:auth_token]
+        #  cookies.delete(:auth_token)
+        #  Remember.where(token: auth_token).delete
+        #end
+
         session[:login] = login
         session[:realname] = name
         session[:groups] = groups
@@ -35,6 +55,7 @@ module LwqzxAuth
     end
 
     private
+
     def lauth(login,passwd)
       lurl = "http://www.lwqzx.sdedu.net/kernel/net_school/core/jslogin.php"
       res = ::RestClient.post lurl,{login: login, password: passwd}

data/app/models/lwqzx_auth/remember.rb

@@ -0,0 +1,10 @@
+module LwqzxAuth
+  class Remember
+    include Mongoid::Document
+    field :token, type: String
+    field :login, type: String
+    field :name, type: String
+    field :groups, type: String
+    field :expired, type: Integer
+  end
+end

data/app/views/lwqzx_auth/auth/login.html.slim

@@ -1,22 +1,20 @@
 h2.text-center =<> icon("fas","user") + ' 登 录'
 br
 .row
-  .col-sm-4
-  .col-sm-4
+  .col-12.col-md-4.offset-md-4.align-self-center
     = form_tag auth_path, role: "form", class: "loginForm card form-horizontal" do
       .card-body
-        strong 登录名
+        p: strong 登录名
+        div = text_field_tag :login,nil,class: "form-control login"
         br
-        = text_field_tag :login,nil,class: "form-control login"
-        br
-        strong 密码:
-        br
-        = password_field_tag :password,nil, class: "form-control password"
+        p: strong 密码
+        div = password_field_tag :password,nil, class: "form-control password"
         p.text-center
           a.rucaptcha-image-box href="#" = rucaptcha_image_tag
         p.text-center = rucaptcha_input_tag(class: 'form-control code',placeholder: "输入验证码")
-        
-      .card-footer
-        = submit_tag '登录', class: "btn-block btn-primary btn"
-
-  .col-sm-4
+        /p.text-center
+          =<> check_box_tag :rememberme, "yes", false
+          | 记住7天 
+        div.mt-3
+          = submit_tag '登录', class: "btn-block btn-primary btn btn-lg"
+      /.card-footer

data/lib/lwqzx_auth/version.rb

@@ -1,3 +1,3 @@
 module LwqzxAuth
-  VERSION = '0.2.0'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lwqzx_auth
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - zxy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-09 00:00:00.000000000 Z
+date: 2020-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -40,6 +40,7 @@ files:
 - app/controllers/lwqzx_auth/application_controller.rb
 - app/controllers/lwqzx_auth/auth_controller.rb
 - app/helpers/lwqzx_auth/application_helper.rb
+- app/models/lwqzx_auth/remember.rb
 - app/views/lwqzx_auth/auth/login.html.slim
 - config/initializers/rucaptcha.rb
 - config/routes.rb
@@ -66,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: add auth function to host application.