fix display login logic.

codeskyblue · Dec 22, 2016 · 7e1387a · 7e1387a
1 parent ff1f38c
commit 7e1387a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/httpstaticserver.go b/httpstaticserver.go
@@ -34,6 +34,7 @@ type HTTPStaticServer struct {
 	Theme           string
 	PlistProxy      string
 	GoogleTrackerId string
+	AuthType        string
 
 	indexes []IndexFileItem
 	m       *mux.Router

diff --git a/main.go b/main.go
@@ -139,6 +139,7 @@ func main() {
 	ss.Title = gcfg.Title
 	ss.GoogleTrackerId = gcfg.GoogleTrackerId
 	ss.Upload = gcfg.Upload
+	ss.AuthType = gcfg.Auth.Type
 
 	if gcfg.PlistProxy != "" {
 		u, err := url.Parse(gcfg.PlistProxy)

diff --git a/res/index.tmpl.html b/res/index.tmpl.html
@@ -36,6 +36,7 @@
                 <span class="glyphicon glyphicon-qrcode"></span>
               </a>
             </li>
+            [[if eq .AuthType "openid"]]
             <li class="hidden-xs">
               <a href="/-/logout" v-if="user.email">
                 <span v-text="user.name"></span>
@@ -46,6 +47,7 @@
                 <span class="glyphicon glyphicon-user"></span>
               </a>
             </li>
+            [[end]]
           </ul>
           <form class="navbar-form navbar-right">
             <div class="input-group">

diff --git a/res/js/index.js b/res/js/index.js
@@ -98,7 +98,7 @@ var vm = new Vue({
       method: "get",
       dataType: "json",
       success: function(ret) {
-        if (this.user) {
+        if (ret) {
           this.user.email = ret.email;
           this.user.name = ret.name;
         }