Merge pull request YaoApp#295 from trheyi/main

[add] third-party login
AbbetWang · Dec 16, 2022 · 33e0f52 · 33e0f52
2 parents a5c0abd + d9f7159
commit 33e0f52
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/widgets/app/app.go b/widgets/app/app.go
@@ -459,6 +459,11 @@ func processXgen(process *gou.Process) interface{} {
 			"login":   "/api/__yao/login/admin",
 			"layout":  layout,
 		}
+
+		if admin.ThirdPartyLogin != nil && len(admin.ThirdPartyLogin) > 0 {
+			xgenLogin["admin"]["thirdPartyLogin"] = admin.ThirdPartyLogin
+		}
+
 	}
 
 	if user, has := login.Logins["user"]; has {
@@ -490,6 +495,10 @@ func processXgen(process *gou.Process) interface{} {
 			"login":   "/api/__yao/login/user",
 			"layout":  layout,
 		}
+
+		if user.ThirdPartyLogin != nil && len(user.ThirdPartyLogin) > 0 {
+			xgenLogin["user"]["thirdPartyLogin"] = user.ThirdPartyLogin
+		}
 	}
 
 	xgenSetting := map[string]interface{}{

diff --git a/widgets/login/types.go b/widgets/login/types.go
@@ -2,10 +2,11 @@ package login
 
 // DSL the login DSL
 type DSL struct {
-	ID     string    `json:"id,omitempty"`
-	Name   string    `json:"name,omitempty"`
-	Action ActionDSL `json:"action,omitempty"`
-	Layout LayoutDSL `json:"layout,omitempty"`
+	ID              string               `json:"id,omitempty"`
+	Name            string               `json:"name,omitempty"`
+	Action          ActionDSL            `json:"action,omitempty"`
+	Layout          LayoutDSL            `json:"layout,omitempty"`
+	ThirdPartyLogin []ThirdPartyLoginDSL `json:"thirdPartyLogin,omitempty"`
 }
 
 // ActionDSL the login action DSL
@@ -22,3 +23,11 @@ type LayoutDSL struct {
 	Slogan  string `json:"slogan,omitempty"`
 	Site    string `json:"site,omitempty"`
 }
+
+// ThirdPartyLoginDSL the thirdparty login url
+type ThirdPartyLoginDSL struct {
+	Title string `json:"title,omitempty"`
+	Href  string `json:"href,omitempty"`
+	Icon  string `json:"icon,omitempty"`
+	Blank bool   `json:"blank,omitempty"`
+}