drop oauth2 feature support

7 files changed, 7 insertions, 98 deletions

diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl
index 899c264d92..e302efd043 100644
--- a/templates/admin/config.tmpl
+++ b/templates/admin/config.tmpl
@@ -137,27 +137,6 @@
                         <br>
                         <div class="panel panel-radius">
                             <div class="panel-header">
-                                <strong>{{.i18n.Tr "admin.config.oauth_config"}}</strong>
-                            </div>
-                            <div class="panel-body">
-                                <dl class="dl-horizontal admin-dl-horizontal">
-                                    <dt>{{.i18n.Tr "admin.config.oauth_enabled"}}</dt>
-                                    <dd><i class="fa fa{{if .OauthEnabled}}-check{{end}}-square-o"></i></dd>
-                                    {{if .OauthEnabled}}<dt>GitHub</dt>
-                                    <dd><i class="fa fa{{if .Oauther.GitHub}}-check{{end}}-square-o"></i></dd>
-                                    <dt>Google</dt>
-                                    <dd><i class="fa fa{{if .Oauther.Google}}-check{{end}}-square-o"></i></dd>
-                                    <dt>腾讯 QQ</dt>
-                                    <dd><i class="fa fa{{if .Oauther.Tencent}}-check{{end}}-square-o"></i></dd>
-                                    <dt>新浪微博</dt>
-                                    <dd><i class="fa fa{{if .Oauther.Weibo}}-check{{end}}-square-o"></i></dd>
-                                    {{end}}
-                                </dl>
-                            </div>
-                        </div>
-                        <br>
-                        <div class="panel panel-radius">
-                            <div class="panel-header">
                                 <strong>{{.i18n.Tr "admin.config.cache_config"}}</strong>
                             </div>
                             <div class="panel-body">
diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl
index 874be79b01..847f488095 100644
--- a/templates/admin/dashboard.tmpl
+++ b/templates/admin/dashboard.tmpl
@@ -27,28 +27,24 @@
                                     <table class="table">
                                         <tbody>
                                             <tr>
-                                                <td>{{.i18n.Tr "admin.dashboard.clean_unbind_oauth"}}</td>
-                                                <td><i class="fa fa-caret-square-o-right"></i> <a href="{{AppSubUrl}}/admin?op=1">{{.i18n.Tr "admin.dashboard.operation_run"}}</a></td>
-                                            </tr>
-                                            <tr>
                                                 <td>{{.i18n.Tr "admin.dashboard.delete_inactivate_accounts"}}</td>
-                                                <td><i class="fa fa-caret-square-o-right"></i> <a href="{{AppSubUrl}}/admin?op=2">{{.i18n.Tr "admin.dashboard.operation_run"}}</a></td>
+                                                <td><i class="fa fa-caret-square-o-right"></i> <a href="{{AppSubUrl}}/admin?op=1">{{.i18n.Tr "admin.dashboard.operation_run"}}</a></td>
                                             </tr>
                                             <tr>
                                                 <td>{{.i18n.Tr "admin.dashboard.delete_repo_archives"}}</td>
-                                                <td><i class="fa fa-caret-square-o-right"></i> <a href="{{AppSubUrl}}/admin?op=3">{{.i18n.Tr "admin.dashboard.operation_run"}}</a></td>
+                                                <td><i class="fa fa-caret-square-o-right"></i> <a href="{{AppSubUrl}}/admin?op=2">{{.i18n.Tr "admin.dashboard.operation_run"}}</a></td>
                                             </tr>
                                             <tr>
                                                 <td>{{.i18n.Tr "admin.dashboard.git_gc_repos"}}</td>
-                                                <td><i class="fa fa-caret-square-o-right"></i> <a href="{{AppSubUrl}}/admin?op=4">{{.i18n.Tr "admin.dashboard.operation_run"}}</a></td>
+                                                <td><i class="fa fa-caret-square-o-right"></i> <a href="{{AppSubUrl}}/admin?op=3">{{.i18n.Tr "admin.dashboard.operation_run"}}</a></td>
                                             </tr>
                                             <tr>
                                                 <td>{{.i18n.Tr "admin.dashboard.resync_all_sshkeys"}}</td>
-                                                <td><i class="fa fa-caret-square-o-right"></i> <a href="{{AppSubUrl}}/admin?op=5">{{.i18n.Tr "admin.dashboard.operation_run"}}</a></td>
+                                                <td><i class="fa fa-caret-square-o-right"></i> <a href="{{AppSubUrl}}/admin?op=4">{{.i18n.Tr "admin.dashboard.operation_run"}}</a></td>
                                             </tr>
                                             <tr>
                                                 <td>{{.i18n.Tr "admin.dashboard.resync_all_update_hooks"}}</td>
-                                                <td><i class="fa fa-caret-square-o-right"></i> <a href="{{AppSubUrl}}/admin?op=6">{{.i18n.Tr "admin.dashboard.operation_run"}}</a></td>
+                                                <td><i class="fa fa-caret-square-o-right"></i> <a href="{{AppSubUrl}}/admin?op=5">{{.i18n.Tr "admin.dashboard.operation_run"}}</a></td>
                                             </tr>
                                         </tbody>
                                     </table>
diff --git a/templates/base/social.tmpl b/templates/base/social.tmpl
deleted file mode 100644
index 277b54fcbd..0000000000
--- a/templates/base/social.tmpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{{if .OauthService.GitHub}}<a class="btn github" href="{{AppSubUrl}}/user/login/oauth2/github?next={{AppSubUrl}}/user/info/github"><i class="fa fa-github"></i>GitHub</a>{{end}}
-{{if .OauthService.Google}}<a class="btn google" href="{{AppSubUrl}}/user/login/oauth2/google?next={{AppSubUrl}}/user/info/google"><i class="fa fa-google"></i>Google +</a>{{end}}
-{{if .OauthService.Weibo}}<a class="btn weibo" href="{{AppSubUrl}}/user/login/oauth2/weibo?next={{AppSubUrl}}/user/info/weibo"><i class="fa fa-weibo"></i>新浪微博</a>{{end}}
-{{if .OauthService.Tencent}}<a class="btn qq" href="{{AppSubUrl}}/user/login/oauth2/qq?next={{AppSubUrl}}/user/info/qq"><i class="fa fa-qq"></i>腾讯 QQ&nbsp;</a>{{end}}
\ No newline at end of file
diff --git a/templates/user/auth/signin.tmpl b/templates/user/auth/signin.tmpl
index 259c5f7d8f..a1e30e95cb 100644
--- a/templates/user/auth/signin.tmpl
+++ b/templates/user/auth/signin.tmpl
@@ -5,7 +5,7 @@
       <form class="ui form" action="{{.Link}}" method="post">
         {{.CsrfTokenHtml}}
         <h3 class="ui top attached header">
-          {{if .IsSocialLogin}}{{.i18n.Tr "social_sign_in" | Str2html}}{{else}}{{.i18n.Tr "sign_in"}}{{end}}
+          {{.i18n.Tr "sign_in"}}
         </h3>
         <div class="ui attached segment">
           {{template "base/alert" .}}
@@ -17,7 +17,6 @@
             <label for="password">{{.i18n.Tr "password"}}</label>
             <input id="password" name="password" type="password" value="{{.password}}" required>
           </div>
-          {{if not .IsSocialLogin}}
           <div class="inline field">
             <label></label>
             <div class="ui checkbox">
@@ -25,12 +24,11 @@
               <input name="remember" type="checkbox">
             </div>
           </div>
-          {{end}}
 
           <div class="inline field">
             <label></label>
             <button class="ui green button">{{.i18n.Tr "sign_in"}}</button>
-            {{if not .IsSocialLogin}}<a href="{{AppSubUrl}}/user/forget_password">{{.i18n.Tr "auth.forget_password"}}</a>{{end}}
+            <a href="{{AppSubUrl}}/user/forget_password">{{.i18n.Tr "auth.forget_password"}}</a>
           </div>
           {{if .ShowRegistrationButton}}
           <div class="inline field">
@@ -38,12 +36,6 @@
             <a href="{{AppSubUrl}}/user/sign_up">{{.i18n.Tr "auth.sign_up_now" | Str2html}}</a>
           </div>
           {{end}}
-          {{if and (not .IsSocialLogin) .OauthEnabled}}
-          <div class="inline field">
-            <label></label>
-            {{template "base/social" .}}
-          </div>
-          {{end}}
         </div>
       </form>
     </div>
diff --git a/templates/user/settings/nav.tmpl b/templates/user/settings/nav.tmpl
deleted file mode 100644
index 838e21476d..0000000000
--- a/templates/user/settings/nav.tmpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<div id="setting-menu" class="grid-1-5 panel panel-radius left">
-    <p class="panel-header"><strong>{{.i18n.Tr "settings"}}</strong></p>
-    <div class="panel-body">
-        <ul class="menu menu-vertical switching-list grid-1-5 left">
-            <li {{if .PageIsSettingsProfile}}class="current"{{end}}><a href="{{AppSubUrl}}/user/settings">{{.i18n.Tr "settings.profile"}}</a></li>
-            <li {{if .PageIsSettingsPassword}}class="current"{{end}}><a href="{{AppSubUrl}}/user/settings/password">{{.i18n.Tr "settings.password"}}</a></li>
-            <li {{if .PageIsSettingsEmails}}class="current"{{end}}><a href="{{AppSubUrl}}/user/settings/email">{{.i18n.Tr "settings.emails"}}</a></li>
-            <li {{if .PageIsSettingsSSHKeys}}class="current"{{end}}><a href="{{AppSubUrl}}/user/settings/ssh">{{.i18n.Tr "settings.ssh_keys"}}</a></li>
-            {{if .HasOAuthService}}
-            <li {{if .PageIsSettingsSocial}}class="current"{{end}}><a href="{{AppSubUrl}}/user/settings/social">{{.i18n.Tr "settings.social"}}</a></li>
-            {{end}}
-            <li {{if .PageIsSettingsApplications}}class="current"{{end}}><a href="{{AppSubUrl}}/user/settings/applications">{{.i18n.Tr "settings.applications"}}</a></li>
-            <li {{if .PageIsSettingsDelete}}class="current"{{end}}><a href="{{AppSubUrl}}/user/settings/delete">{{.i18n.Tr "settings.delete"}}</a></li>
-        </ul>
-    </div>
-</div>
\ No newline at end of file
diff --git a/templates/user/settings/navbar.tmpl b/templates/user/settings/navbar.tmpl
index 3b8973b8e0..5c8773a84b 100644
--- a/templates/user/settings/navbar.tmpl
+++ b/templates/user/settings/navbar.tmpl
@@ -13,11 +13,6 @@
 	  <a class="{{if .PageIsSettingsSSHKeys}}active{{end}} item" href="{{AppSubUrl}}/user/settings/ssh">
 	    {{.i18n.Tr "settings.ssh_keys"}}
 	  </a>
-	  {{if .HasOAuthService}}
-	  <a class="{{if .PageIsSettingsSocial}}active{{end}} item" href="{{AppSubUrl}}/user/settings/social">
-	    {{.i18n.Tr "settings.social"}}
-	  </a>
-	  {{end}}
 	  <a class="{{if .PageIsSettingsApplications}}active{{end}} item" href="{{AppSubUrl}}/user/settings/applications">
 	    {{.i18n.Tr "settings.applications"}}
 	  </a>
diff --git a/templates/user/settings/social.tmpl b/templates/user/settings/social.tmpl
deleted file mode 100644
index f2a30da791..0000000000
--- a/templates/user/settings/social.tmpl
+++ /dev/null
@@ -1,33 +0,0 @@
-{{template "ng/base/head" .}}
-{{template "ng/base/header" .}}
-<div id="setting-wrapper" class="main-wrapper">
-    <div id="user-profile-setting" class="container clear">
-        {{template "user/settings/nav" .}}
-        <div class="grid-4-5 left">
-            <div class="setting-content">
-                {{template "ng/base/alert" .}}
-                <div id="setting-content">
-                    <div id="user-social-panel" class="panel panel-radius">
-                        <div class="panel-header"><strong>{{.i18n.Tr "settings.manage_social"}}</strong></div>
-                        <ul class="panel-body setting-list">
-                            <li>{{.i18n.Tr "settings.social_desc"}}</li>
-                            {{range .Socials}}
-                            <li class="ssh clear">
-                                <span class="active-icon left label label-{{if .HasRecentActivity}}green{{else}}gray{{end}} label-radius"></span>
-                                <i class="fa {{Oauth2Icon .Type}} fa-2x left"></i>
-                                <div class="ssh-content left">
-                                    <p><strong>{{Oauth2Name .Type}}</strong></p>
-                                    <p class="print">{{.Identity}}</p>
-                                    <p class="activity"><i>{{$.i18n.Tr "settings.add_on"}} <span title="{{DateFmtLong .Created}}">{{DateFmtShort .Created}}</span> —  <i class="octicon octicon-info"></i>{{$.i18n.Tr "settings.last_used"}} {{DateFmtShort .Updated}}</i></p>
-                                </div>
-                                <a class="right btn btn-small btn-red btn-header btn-radius" href="{{AppSubUrl}}/user/settings/social?remove={{.Id}}">{{$.i18n.Tr "settings.unbind"}}</a>
-                            </li>
-                            {{end}}
-                        </ul>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-{{template "ng/base/footer" .}}
\ No newline at end of file