重写Auth2.0登录逻辑 (#851)

* go mod update * feat: change to new wxwork sso login * fix: can't log in by workwx browser * fix: workwx auto regist * fix: change app.conf.example * fix: workwx account can't be disabled * fix: workwx account delete * fix: workwx bind error * feat: optimize wecom login * feat: rewrite dingtalk login * feat: rewrite dingtalk login * feat: optimize auth2 login
2025-11-24 16:53:22 +08:00 · 2023-04-20 13:24:28 +08:00
parent 725b6ac24e
commit 08d0e1613d
17 changed files with 1936 additions and 791 deletions
--- a/views/account/workweixin-login-callback.tpl
+++ b/views/account/workweixin-login-callback.tpl
@@ -39,8 +39,8 @@
        window.user_info_json = {{ .user_info_json }};
        window.server_error_msg = "{{ .error_msg }}";
        window.home_url = "{{ .BaseUrl }}";
-        window.workweixin_login_bind = "{{urlfor "AccountController.WorkWeixinLoginBind"}}";
-        window.workweixin_login_ignore = "{{urlfor "AccountController.WorkWeixinLoginIgnore"}}";
+        window.account_bind = "{{urlfor "AccountController.Auth2BindAccount" ":app" .app}}";
+        window.account_auto_create = "{{urlfor "AccountController.Auth2AutoAccount" ":app" .app}}";
    </script>
 </head>
 <body class="manual-container">
@@ -114,7 +114,7 @@
                btn: ['绑定','取消'],
                yes: function(index, layero){
                    $.ajax({
-                        url: window.workweixin_login_bind,
+                        url: window.account_bind,
                        type: 'POST',
                        beforeSend: function(request) {
                            request.setRequestHeader("X-Xsrftoken", $('.bind-existed-form input[name="_xsrf"]').val());
@@ -165,7 +165,7 @@
            });
            */
            $.ajax({
-                url: window.workweixin_login_ignore,
+                url: window.account_auto_create,
                type: 'GET',
                beforeSend: function(request) {
                    request.setRequestHeader("X-Xsrftoken", $('.bind-existed-form input[name="_xsrf"]').val());
--- a/views/account/login.tpl
+++ b/views/account/login.tpl
@@ -14,23 +14,46 @@
    <link href="{{cdncss "/static/bootstrap/css/bootstrap.min.css"}}" rel="stylesheet">
    <link href="{{cdncss "/static/font-awesome/css/font-awesome.min.css"}}" rel="stylesheet">
    <link href="{{cdncss "/static/css/main.css" "version"}}" rel="stylesheet">
-    {{if .CanLoginWorkWeixin}}
-    <style type="text/css">
-        #wxwork-login-line > a {
-            display: block;
-            text-align: center;
-            border: 1px solid #ccc;
-            border-radius: 0.3em;
-            padding-top: 0.8em;
-            padding-bottom: 0.75em;
+    <style>
+        .line {
+            height:0;
+            border-top: 1px solid #cccccc;
+            text-align:center;
+            margin: 14px 0;
        }
-        #wxwork-login-line > a:hover {
-            color: #fff;
-            background-color: #5cb85c;
-            border-color: #4cae4c;
+        .line > .text {
+            position:relative;
+            top:-12px;
+            background-color:#fff;
+            padding: 5px;
+        }
+        .icon-box {
+            align-items: center;
+            justify-content: center;
+            display: flex;
+            display: -webkit-flex;
+        }
+
+        .icon {
+            box-sizing: border-box;
+            display: inline-block;
+            padding: 10px;
+            border-radius: 50%;
+            cursor: pointer;
+            margin: 0 5px;
+        }
+        .icon-disable {
+            background-color: #cccccc;
+            cursor: not-allowed;
+        }
+        .icon-disable:hover {
+            background-color: #bbbbbb;
+        }
+
+        .icon > img {
+            height: 24px;
        }
    </style>
-    {{end}}
    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
    <script src="{{cdnjs "/static/jquery/1.12.4/jquery.min.js"}}"></script>
 </head>
@@ -87,30 +110,27 @@
                <div class="form-group">
                    <button type="button" id="btn-login" class="btn btn-success" style="width: 100%"  data-loading-text="{{i18n .Lang "common.logging_in"}}" autocomplete="off">{{i18n .Lang "common.login"}}</button>
                </div>
-                {{if .ENABLE_QR_DINGTALK}}
-                <div class="form-group">
-                    <a id="btn-dingtalk-qr" class="btn btn-default" style="width: 100%" data-loading-text="" autocomplete="off">{{i18n .Lang "common.dingtalk_login"}}</a>
-                </div>
-                {{end}}
                {{if .ENABLED_REGISTER}}
-                {{if ne .ENABLED_REGISTER "false"}}
-                <div class="form-group">
-                    {{i18n .Lang "message.no_account_yet"}} <a href="{{urlfor "AccountController.Register" }}" title={{i18n .Lang "common.register"}}>{{i18n .Lang "common.register"}}</a>
-                </div>
+                    {{if ne .ENABLED_REGISTER "false"}}
+                        <div class="form-group">
+                            {{i18n .Lang "message.no_account_yet"}} <a href="{{urlfor "AccountController.Register" }}" title={{i18n .Lang "common.register"}}>{{i18n .Lang "common.register"}}</a>
+                        </div>
+                    {{end}}
                {{end}}
-                {{end}}
-                {{if .CanLoginWorkWeixin}}
-                <div class="form-group">
-                    <div id="wxwork-login-line">
-                        <a href="{{ .workweixin_login_url }}" title="手机企业微信-扫码登录">手机企业微信-扫码登录</a>
+                <div class="third-party">
+                    <div class="line">
+                        <span class="text">{{i18n .Lang "common.third_party_login"}}</span>
+                    </div>
+                    <div class="icon-box">
+                        <div class="icon {{ if .CanLoginDingTalk }}btn-success{{else}}icon-disable{{end}}" title="{{i18n .Lang "common.dingtalk_login"}}" data-url="{{ .dingtalk_login_url }}">
+                            <img alt="{{i18n .Lang "common.dingtalk_login"}}" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAA9hJREFUaEPNmVvoZ1MUxz/fPOBR8uJBya0QXmRqhsZtasq4xQMP7h5GyiR5MIkHlOQBDyaEcmvGrTBCYjDuKbmUW3jyQF7kEsrSd9pHx+9/fufss8/5/85v1e7/6/9ba+31OXutfdbeP9EgEfE6cChwN3CXpL+a9Jbhf2oBWJ+++wN42DCSvliGoOsx5ADU9R8zjKRXlwWkL0AV905gO7BD0p9TwswDuAG4NSOwrxPIdkmfZeiPrjIP4Fjg456z7TCMpGd62g1SbwSwx4h4DzihwLvBnV6G+a7AvpdJG8BW4JZe3v6v/HsN5OUBflpN2wCOBj4daeLdLvi0Kj+O5HOPm7kAKY2eAzaNOOHPgH3uGZL+Geq7C8AvM7+VV0O8gxnkeUlvlE7QCpBW4QrgYmBd6SQZdh8ATwFPSvo+Q/8/lU6ASjMizksgZ/SZoKfub4ZIIC/m2GYD1ECOAs5MY03OJIU6HwIPSLqvzb6rBo4A3MB9A3wOvAXslvR+Sq8TU5EbyLqrIR8BWyR5J1shnSsQEd8CBzfYurhdfIbyOBXYmMZhq0CyTtLbs35zAO4HXMg58mgqRgPdNDKMt92zSgAuAB7Pib5B5wfAUG7Dz01Qha7YJenk3gAp118BTi+deSS7OyVdVwrg4A0xpWyU9FIRQFqFmwemwBD4JyRdWLQL1Y0iYiqINdXWXbwClWFEXAVcCxwy5JH2sPWtyJZ5+p3baJNhRBwAHAfsm8Y+M3/3ArwD1Yfb876NoVtvP/25B6MigJm02h/wEdTDUNXnHg95rupWSbe1OSoGSPVwDnDMGJE2+PAlgZ++G7y5MgTAbUNWx1gIeJmkh7psiwHS1upj4vldkxR8/7Qkt++dMghglSB+AU6R5C60UwYDJIgx3w83Ssq+DRkFIEG4oO9oeT/8BPhK0nXj1GuSN4HTJP3d+eiTwmgACWI/YENq/KoXnS/IdlYHkogw5IqmLMWzSdILucFbb1SAnIkjwoegkxp0d82zb2qjK92FAkTEQcCXgN/cOfIrcHzb7xKLBvDW6FuHXLlI0iNtyosGuB24PjN6/yJ0TZfuogFeA1YcCxuCfEfS2q7gF1rEEXE4cGBDUN5W3dVW4rxfK+mTpQJoCiYiLgFm+53LJT2YE/xCV2AOgG/drqx9d68kH5iyZaE1MBtVRLhl9lWlJTvv634mA4iII9N1peNx3q/PbeCWBeBq4J4UzGZJ27LzpqY45Qo8C5wNbJO0uST4SYs4ItydfpVSJ7v7nAWdZAVST+Tr+g2S3i19+pOtQERcCuxdmveTF3FEeL8vzvs6wL8iyC9AZnHsagAAAABJRU5ErkJggg==">
+                        </div>
+                        <div class="icon {{ if .CanLoginWorkWeixin }}btn-success{{else}}icon-disable{{end}}" title="{{i18n .Lang "common.wecom_login"}}" data-url="{{ .workweixin_login_url }}">
+                            <img alt="{{i18n .Lang "common.wecom_login"}}" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAABE9JREFUaEPtmVvIpWMUx3//IkkYhgkXTBiFHEPjVCYXJscJMyOHMEUZN0NOuWEuJCPHhBnqk0MuhmYaoswFQoYoTAqNHBqH0IyRK9Jfa/e80/u93/vt5917v/vb31ez6m1fPOv0f9Z6nrWetcUMJ81w/xkIgO3DgTOBY4H9St8fwPfAD+l3o6T/hrFZPQOwfSFwMXBGcryJX/8CLwFvAgFmexOhJjyNASTHbwQuaqK4C8/PwDPAakm/DKgrn0K25wKPAIsGNVaRL4DcJyki1Bd1jYDt84ExYE5f2psJvQ8s6TcakwKwfTuwqpkPA3NtAxZI+qJXTbUAbJ8DvN2rshb4T5H0aS96JgCwfRTwdS9KWuY9UFJcw41oHADbewMbgIjAqGiDpEuaGq8CeBK4qanwEPlWSHqsif6dAGwfCsQh2reJ4JB5vgPmS/otZ6cM4C7g/pzAFK4vl/RUzl4ZQOz+cTmBKVx/VdLlOXsdACl9ovGaTrRd0v45hwoAZwHv5ZhHsD5L0o5udgsAV6ZucQQ+djU5T9KWJgCmwwF+AViTimg0d1GLfpW0qQmA61LTNqoIrJW0pB/jRQqdCnzcj4IWZDZLOj5dJvsApwOHAW9JilddVyoA7AX8CeyWExjC+kpJ9yYAH6SXXmHmaElfZVMoCX8GnDAEB3Mqo41+x/bVQJyDMq2TdGlTALEL9+SsDWG9ABAvvnUV/f8AR0jaOpndciU+GPgEOGQITtapjPy+W9LLKQNmRd4DcR7LdK2k57MAkpKpiMJK4MP4JP2V7M4HFsZZsB1ZsLg08YhrNNZqC1q1nR5mFOIwLpI07rFk+/o0NFgj6Y5ip20HiOWpHoxJWlYXhboX2Q2poLSZSTskRYp0yHZcm2enbynwmqSYNU0g20VWzJH0e5VhsjfxQ8CtLSJYJmnM9pHAw5XZUgy5TuvWMqRmMyYj8eA6Js2V3pW0vttU4nXgghZAbJIUxSl2vu6MNWqbbb8IXFXyp6O3G4DYrY1ADLYGoS2S5iUAMemovrezDxfbJwN104oFucFWvNCi0RuEduZ/zazpR+AkSTEXmpRs3wY8WGHYJml2DkDc0VcM4n2SvUXSoykKNwNPAF8CjwPfRCXOAIih8MISz0fA05KeywGI+zru6DZoD0lRWceRbadOOEBOuOttr0jX7OfA+phwSwoAHcoBiOnxQTXeB7ComnsCB6RvduV3MxDft0C0AlslvVEDoHAwClZEJhzspJTtE9OEcG2q2hMGXjkAsTtlioP0gKRQ2BrZXg3E6D4onI+UCTC7A+cW3WqdwRyA4tYIx6NSxoupdUr/9ESlDocL+htYWhe1sgM5APHAmNvP1LhXlLZfAS6ryD0rKTqDSanxPzS9OtQrv+1rgGrXuUrSnTMCQDq05bMQF8ViST/NGAAJRLQd53U7uI3PQK9pMAr+aXMG+gW/C0C/O9eW3K4ItLWT/eqZ8RH4H4Zge30AMjOdAAAAAElFTkSuQmCC">
+                        </div>
                    </div>
                </div>
-                {{end}}
            </form>
-            <div class="form-group dingtalk-container" style="display: none;">
-                <div id="dingtalk-qr-container"></div>
-                <a class="btn btn-default btn-dingtalk" style="width: 100%" data-loading-text="" autocomplete="off">{{i18n .Lang "message.return_account_login"}}</a>
-            </div>
        </div>
    </div>
    <div class="clearfix"></div>
@@ -119,79 +139,6 @@
 <!-- Include all compiled plugins (below), or include individual files as needed -->
 <script src="{{cdnjs "/static/bootstrap/js/bootstrap.min.js"}}" type="text/javascript"></script>
 <script src="{{cdnjs "/static/layer/layer.js"}}" type="text/javascript"></script>
-<script src="{{cdnjs "/static/js/dingtalk-jsapi.js"}}" type="text/javascript"></script>
-<script src="{{cdnjs "/static/js/dingtalk-ddlogin.js"}}" type="text/javascript"></script>
-
-{{if .ENABLE_QR_DINGTALK}}
-<script type="text/javascript">
-    if (dd.env.platform !== "notInDingTalk"){
-        dd.ready(function() {
-            dd.runtime.permission.requestAuthCode({
-                corpId: {{ .corpID }} , // 企业id
-                onSuccess: function (info) {
-                    var index = layer.load(1, {
-                        shade: [0.1, '#fff'] // 0.1 透明度的白色背景
-                    })
-
-                    var formData = $("form").serializeArray()
-                    formData.push({"name": "dingtalk_code", "value": info.code})
-
-                    $.ajax({
-                        url: "{{urlfor "AccountController.DingTalkLogin"}} ",
-                        data: formData,
-                        dataType: "json",
-                        type: "POST",
-                        complete: function(){
-                            layer.close(index)
-                        },
-                        success: function (res) {
-                            if (res.errcode !== 0) {
-                                layer.msg(res.message)
-                            } else {
-                                window.location = "{{ urlfor "HomeController.Index"  }}"
-                            }
-                        },
-                        error: function (res) {
-                            layer.msg("发生异常")
-                        }
-                    })
-                }
-            });
-        });
-    }
-
-    $(document).ready(function () {
-        var url = 'https://oapi.dingtalk.com/connect/oauth2/sns_authorize?appid={{.dingtalk_qr_key}}&response_type=code&scope=snsapi_login&state=1&redirect_uri={{ urlfor "AccountController.QRLogin" ":app" "dingtalk"}}'
-        var obj = DDLogin({
-            id:"dingtalk-qr-container",
-            goto: encodeURIComponent(url), 
-            style: "border:none;background-color:#FFFFFF;",
-            width : "338",
-            height: "300"
-        });
-        $(window).on('message', function (event) {
-            var origin = event.origin;
-            if( origin == "https://login.dingtalk.com" ) { //判断是否来自ddLogin扫码事件。
-                layer.load(1, { shade: [0.1, '#fff'] })
-                var loginTmpCode = event.data; 
-                //获取到loginTmpCode后就可以在这里构造跳转链接进行跳转了
-                console.log("loginTmpCode", loginTmpCode);
-                url = url + "&loginTmpCode=" + loginTmpCode
-                window.location = url
-            }
-        });
-        $("#btn-dingtalk-qr").on('click', function(){
-            $('form').hide()
-            $(".dingtalk-container").show()
-        })
-
-        $(".btn-dingtalk").on('click', function(){
-            $('form').show()
-            $(".dingtalk-container").hide()
-        })
-    });
-</script>
-{{end}}

 <script type="text/javascript">
    $(document).ready(function () {
@@ -206,6 +153,13 @@
            }
        });

+        $(".icon").on('click', function (){
+           if ($(this).hasClass("icon-disable")) {
+               return;
+           }
+           window.location.href = $(this).data("url");
+        })
+
        $("#btn-login").on('click', function () {
            $(this).tooltip('destroy').parents('.form-group').removeClass('has-error');
            var $btn = $(this).button('loading');