rails_auth 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1014c7f54fe350eac3299a078d6876128acbe1ab12ee224d96da919347d13487
-  data.tar.gz: 8bb02b0ff95f1fadc978c94d01145d4664a3c2b8781423f3f3810e3e46baf745
+  metadata.gz: e041a484dbf2b347a8a91adb00af10edae5a22d9c17b94f1a16c3178c6e2f594
+  data.tar.gz: ce546ae8a8aa36e168208890e51e11a8aa48896b23180451c10db40b024e0b64
 SHA512:
-  metadata.gz: 65d811d4aa1f61b5fe7ef26a9ad6c629cc19ceb41f79bc2a29ef803f40df90e743292ce8d264d0bac02ff9731adc708fd43608771d0241541513488a9016b608
-  data.tar.gz: f02f87f20c21af20d4c0de042f0ef2543f49faf145ad657ff4589f9208c645546511327a90d459af033e61f860654e7967251652a2b3d606558f199edd953e63
+  metadata.gz: f3f35f48fe8742134b7b3c6825cb6899bdb8272c371ca0229a885f8bf6138738c298194375530e6176aa0a37b41168533f0511c3514151911bc074ec0bb61154
+  data.tar.gz: 594804f03a88be27638447a83268bc9bc5e54179ed5a17a958e7b7dae44fac9725bc1357ca079e416b3b24a887fd0231ecb43598391cd5e5a4a6ec444bb95058

data/README.md

@@ -13,13 +13,10 @@
 ## 如何使用
 
 
-### 
-
-
-
 ```ruby
 class ApplicationController < ActionController::Base
   include RailsAuthController
+  before_action :require_login_from_session
 end
 ```
 
@@ -37,3 +34,4 @@ end
 # in controller
 current_user
 ```
+

data/Rakefile

@@ -1,15 +1,10 @@
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
+require 'bundler/setup'
 require 'sdoc'
 require 'rdoc/task'
 
 RDoc::Task.new(:sdoc) do |rdoc|
   rdoc.rdoc_dir = 'docs'
-  rdoc.title = 'TheAuth'
+  rdoc.title = 'RailsAuth'
   rdoc.options << '--format=sdoc'
   rdoc.options << '-g'
   rdoc.template = 'rails'
@@ -18,21 +13,8 @@ RDoc::Task.new(:sdoc) do |rdoc|
   rdoc.rdoc_files.include('app/models/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)
 load 'rails/tasks/engine.rake'
 
 
-
 Bundler::GemHelper.install_tasks
-
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-
-task default: :test

data/app/assets/javascripts/controllers/auth/admin/users/index.js

@@ -0,0 +1 @@
+$('.ui.toggle.checkbox').checkbox();

data/app/assets/javascripts/controllers/auth/join/create.js

@@ -0,0 +1 @@
+//= require ./token

data/app/assets/javascripts/controllers/auth/join/token.js

@@ -0,0 +1,10 @@
+document.getElementById('mobile_confirm').addEventListener('click', function(e){
+  var remind_link = new URL(this.href);
+  var account = document.getElementById('user_account').value;
+  if (/(?:^1[3456789]|^9[28])\d{9}$/.test(account)) {
+    this.href = remind_link.pathname + '?account=' + account;
+  } else {
+    alert('wrong number!');
+    e.preventDefault();
+  }
+});

data/app/assets/javascripts/controllers/auth/my/users/edit-ready.js

@@ -0,0 +1,4 @@
+//= require rails_com/attachment
+
+
+

data/app/assets/stylesheets/controllers/auth/admin/users/edit.css

@@ -0,0 +1,7 @@
+input:invalid {
+  background-color: #ffdddd;
+}
+
+input:required:invalid {
+  border-color: #C00000;
+}

data/app/assets/stylesheets/controllers/auth/join/new.css

@@ -0,0 +1,3 @@
+/*
+= require ../login/new
+*/

data/app/assets/stylesheets/controllers/auth/login/new.css

@@ -0,0 +1,6 @@
+.ui.centered.grid {
+  height: 100%;
+}
+.column {
+  min-width: 320px;
+}

data/app/assets/stylesheets/controllers/auth/mobile/mobile.css

@@ -0,0 +1,3 @@
+/*
+= require ../login/new
+*/

data/app/assets/stylesheets/controllers/auth/password/new.css

@@ -0,0 +1,3 @@
+/*
+= require ../login/new
+*/

data/app/controllers/auth/admin/base_controller.rb

@@ -0,0 +1,3 @@
+class Auth::Admin::BaseController < RailsAuth.config.admin_class.constantize
+
+end

data/app/controllers/auth/admin/oauth_users_controller.rb

@@ -0,0 +1,33 @@
+class Auth::Admin::OauthUsersController < Auth::Admin::BaseController
+  before_action :set_oauth_user, only: [:show, :update, :destroy]
+
+  def index
+    if params[:user_id]
+      @user = User.find(params[:user_id])
+      @oauth_users = @user.oauth_users.page(params[:page])
+    else
+      @oauth_users = OauthUser.page(params[:page])
+    end
+  end
+
+  def show
+  end
+
+  def update
+    if @oauth_user.update(oauth_user_params)
+      redirect_to @oauth_user, notice: 'Oauth user was successfully updated.'
+    else
+      render head: :no_content
+    end
+  end
+
+  def destroy
+    @oauth_user.destroy
+    redirect_to oauth_users_url, notice: 'Oauth user was successfully destroyed.'
+  end
+
+  private
+  def set_oauth_user
+    @oauth_user = OauthUser.find(params[:id])
+  end
+end

data/app/controllers/auth/admin/users_controller.rb

@@ -0,0 +1,66 @@
+class Auth::Admin::UsersController < Auth::Admin::BaseController
+  before_action :set_user, only: [:show, :edit, :update, :destroy]
+
+  def index
+    @users = User.includes(:oauth_users).order(created_at: :desc).default_where(search_params).page(params[:page])
+  end
+
+  def new
+    @user = User.new
+  end
+
+  def create
+    @user = User.new(user_params)
+    if @user.join(params)
+      redirect_to admin_users_url, notice: 'User was successfully created.'
+    else
+      render :new
+    end
+  end
+
+  def show
+  end
+
+  def edit
+
+  end
+
+  def update
+    respond_to do |format|
+      if @user.update(user_params)
+        format.js { head :no_content }
+        format.html { redirect_to admin_users_url, notice: 'User was successfully updated.' }
+      else
+        format.js { head :no_content }
+        format.html { render :edit }
+      end
+    end
+  end
+
+  def destroy
+    @user.destroy
+    redirect_to admin_users_url, alert: 'User was successfully destroyed.'
+  end
+
+  private
+  def set_user
+    @user = User.find(params[:id])
+  end
+
+  def search_params
+    params.fetch(:q, {}).permit(:name, :mobile, :email)
+  end
+
+  def user_params
+    params[:user].permit(
+      :name,
+      :avatar,
+      :avatars,
+      :email,
+      :mobile,
+      :password,
+      :disabled
+    )
+  end
+
+end

data/app/controllers/auth/api/base_controller.rb

@@ -0,0 +1,3 @@
+class Auth::Api::BaseController < RailsAuth.config.api_class.constantize
+
+end

data/app/controllers/auth/api/mes_controller.rb

@@ -0,0 +1,38 @@
+class Auth::Api::MesController < Auth::Api::BaseController
+  before_action :require_login_from_token
+  before_action :set_user
+
+  def show
+    render json: @user.as_json(root: true, include: [:oauth_users], methods: [:avatar_url])
+  end
+
+  def update
+    if @user.update(user_params)
+      render json: @user.as_json(root: true, methods: [:avatar_url]), status: :created
+    else
+      process_errors(@user)
+    end
+  end
+
+  def destroy
+    @user.destroy
+    redirect_to api_me_url, notice: 'Me was successfully destroyed.'
+  end
+
+  private
+  def set_user
+    @user = current_user
+  end
+
+  def user_params
+    params.fetch(:user, {}).permit(
+      :name,
+      :email,
+      :mobile,
+      :locale,
+      :nation,
+      :timezone
+    )
+  end
+
+end

data/app/controllers/auth/api/oauth_users_controller.rb

@@ -0,0 +1,19 @@
+class Auth::Api::OauthUsersController < Auth::Api::BaseController
+
+  def create
+    @oauth_user = OauthUser.find_or_initialize_by(type: oauth_user_params[:type], uid: oauth_user_params[:uid])
+    @oauth_user.save_info(oauth_user_params)
+    @oauth_user.init_user
+
+    if @oauth_user.save
+      login_as @oauth_user.user
+      render json: { oauth_user: @oauth_user.as_json, user: @oauth_user.user.as_json }
+    end
+  end
+
+  private
+  def oauth_user_params
+    params.fetch(:oauth_user, {}).permit(:uid, :provider, :type, :name, :access_token, :auth_code)
+  end
+
+end

data/app/controllers/auth/api/user_controller.rb

@@ -0,0 +1,94 @@
+class Auth::Api::UserController < Auth::Api::BaseController
+  if whether_filter(:require_login_from_token)
+    skip_before_action :require_login_from_token
+  end
+
+  def new
+    if params[:account].include?('@')
+      @user = User.find_by(email: params[:account])
+      if @user
+        @verify_token = @user.email_token
+      else
+        @verify_token = EmailToken.valid.find_or_initialize_by(account: params[:account])
+      end
+    else
+      @user = User.find_by(mobile: params[:account])
+      if @user
+        @verify_token = @user.mobile_token
+      else
+        @verify_token = MobileToken.valid.find_or_initialize_by(account: params[:account])
+      end
+    end
+
+    if @verify_token.save_with_send
+      render json: { present: @user.present?, message: 'Validation code has been sent!' }
+    else
+      render json: { message: 'Token is invalid' }, status: :bad_request
+    end
+  end
+
+  def create
+    if params[:account].include?('@')
+      @user = User.find_or_initialize_by(email: params[:account])
+    else
+      @user = User.find_or_initialize_by(mobile: params[:account])
+    end
+
+    if @user.persisted?
+      if @user.can_login?(params)
+        login_as @user
+        render json: { user: @user.as_json(only:[:id, :name, :mobile], methods: [:auth_token, :avatar_url]) } and return
+      end
+    else
+      @mobile_token = MobileToken.valid.find_by(token: params[:token], account: params[:account])
+
+      if @mobile_token
+        @user.mobile_confirmed = true
+        @mobile_token.user = @user
+      else
+        render json: { message: 'Token is invalid' }, status: :bad_request and return
+      end
+
+      if @user.join(user_params)
+        login_as @user
+        render json: { user: @user.as_json(only:[:id, :name, :mobile], methods: [:auth_token, :avatar_url]) } and return
+      end
+    end
+
+    process_errors(@user)
+  end
+
+  # 40001 登陆；
+  def reset
+    if params[:account].include?('@')
+      @user = User.find_by(email: params[:account])
+    else
+      @user = User.find_by(mobile: params[:account])
+    end
+
+    unless @user
+      render json: { code: 40001, message: 'Please join first' }, status: :bad_request and return
+    end
+
+    @token = @user.verify_tokens.valid.find_by(token: params[:token])
+    if @token
+      @user.assign_attributes user_params
+      if @user.save
+        render json: { user: @user.as_json(only:[:id, :name, :mobile], methods: [:auth_token, :avatar_url]) } and return
+      else
+        process_errors(@user)
+      end
+    else
+      render json: { message: 'Token is invalid' }, status: :bad_request
+    end
+  end
+
+  private
+  def user_params
+    params.permit(
+      :password,
+      :password_confirmation
+    ).merge(source: 'api')
+  end
+
+end

data/app/controllers/auth/api/users_controller.rb

@@ -0,0 +1,19 @@
+class Auth::Api::UsersController < Auth::Api::BaseController
+  before_action :set_user, only: [:show]
+
+  def index
+    @users = User.page(params[:page])
+
+    render json: @users
+  end
+
+  def show
+    render json: @user.as_json(root: true, only: [:name, :timezone, :locale, :disabled, :nation, :last_login_at, :last_login_ip, :mobile_confirmed], methods: [:avatar_url])
+  end
+
+  private
+  def set_user
+    @user = User.find(params[:id])
+  end
+
+end

data/app/controllers/auth/base_controller.rb

@@ -0,0 +1,4 @@
+class Auth::BaseController < RailsAuth.config.app_class.constantize
+  include RailsAuthController
+
+end

data/app/controllers/auth/confirm_controller.rb

@@ -0,0 +1,21 @@
+class Auth::ConfirmController < Auth::BaseController
+
+  def email
+
+  end
+
+  def mobile
+
+  end
+
+  def update
+    @token = ConfirmToken.find_by(token: params[:token])
+
+    if @token.verify_token?
+      redirect_back(fallback_location: root_url, error: @token.errors.full_messages)
+    else
+      redirect_back(fallback_location: root_url, error: '用户不存在')
+    end
+  end
+
+end