Finish the prompt page logic.

object/application.go

@@ -180,62 +180,3 @@ func DeleteApplication(application *Application) bool {
 
 	return affected != 0
 }
-
-func (application *Application) getProviderByCategory(category string) *Provider {
-	providers := GetProviders(application.Owner)
-	m := map[string]*Provider{}
-	for _, provider := range providers {
-		if provider.Category != category {
-			continue
-		}
-
-		m[provider.Name] = provider
-	}
-
-	for _, providerItem := range application.Providers {
-		if provider, ok := m[providerItem.Name]; ok {
-			return provider
-		}
-	}
-
-	return nil
-}
-
-func (application *Application) GetEmailProvider() *Provider {
-	return application.getProviderByCategory("Email")
-}
-
-func (application *Application) GetSmsProvider() *Provider {
-	return application.getProviderByCategory("SMS")
-}
-
-func (application *Application) getSignupItem(itemName string) *SignupItem {
-	for _, signupItem := range application.SignupItems {
-		if signupItem.Name == itemName {
-			return signupItem
-		}
-	}
-	return nil
-}
-
-func (application *Application) IsSignupItemEnabled(itemName string) bool {
-	return application.getSignupItem(itemName) != nil
-}
-
-func (application *Application) IsSignupItemVisible(itemName string) bool {
-	signupItem := application.getSignupItem(itemName)
-	if signupItem == nil {
-		return false
-	}
-
-	return signupItem.Visible
-}
-
-func (application *Application) GetSignupItemRule(itemName string) string {
-	signupItem := application.getSignupItem(itemName)
-	if signupItem == nil {
-		return ""
-	}
-
-	return signupItem.Rule
-}

object/application_item.go

@@ -0,0 +1,102 @@
+// Copyright 2021 The casbin Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package object
+
+func (application *Application) getProviderByCategory(category string) *Provider {
+	providers := GetProviders(application.Owner)
+	m := map[string]*Provider{}
+	for _, provider := range providers {
+		if provider.Category != category {
+			continue
+		}
+
+		m[provider.Name] = provider
+	}
+
+	for _, providerItem := range application.Providers {
+		if provider, ok := m[providerItem.Name]; ok {
+			return provider
+		}
+	}
+
+	return nil
+}
+
+func (application *Application) GetEmailProvider() *Provider {
+	return application.getProviderByCategory("Email")
+}
+
+func (application *Application) GetSmsProvider() *Provider {
+	return application.getProviderByCategory("SMS")
+}
+
+func (application *Application) getSignupItem(itemName string) *SignupItem {
+	for _, signupItem := range application.SignupItems {
+		if signupItem.Name == itemName {
+			return signupItem
+		}
+	}
+	return nil
+}
+
+func (application *Application) IsSignupItemEnabled(itemName string) bool {
+	return application.getSignupItem(itemName) != nil
+}
+
+func (application *Application) IsSignupItemVisible(itemName string) bool {
+	signupItem := application.getSignupItem(itemName)
+	if signupItem == nil {
+		return false
+	}
+
+	return signupItem.Visible
+}
+
+func (application *Application) GetSignupItemRule(itemName string) string {
+	signupItem := application.getSignupItem(itemName)
+	if signupItem == nil {
+		return ""
+	}
+
+	return signupItem.Rule
+}
+
+func (application *Application) getAllPromptedProviderItems() []*ProviderItem {
+	res := []*ProviderItem{}
+	for _, providerItem := range application.Providers {
+		if providerItem.isProviderPrompted() {
+			res = append(res, providerItem)
+		}
+	}
+	return res
+}
+
+func (application *Application) isAffiliationPrompted() bool {
+	signupItem := application.getSignupItem("Affiliation")
+	if signupItem == nil {
+		return false
+	}
+
+	return signupItem.Prompted
+}
+
+func (application *Application) HasPromptPage() bool {
+	providerItems := application.getAllPromptedProviderItems()
+	if len(providerItems) != 0 {
+		return true
+	}
+
+	return application.isAffiliationPrompted()
+}

object/provider_item.go

@@ -32,3 +32,11 @@ func (application *Application) GetProviderItem(providerName string) *ProviderIt
 	}
 	return nil
 }
+
+func (pi *ProviderItem) isProviderVisible() bool {
+	return pi.Provider.Category == "OAuth"
+}
+
+func (pi *ProviderItem) isProviderPrompted() bool {
+	return pi.isProviderVisible() && pi.Prompted
+}