Switch to using FedCM IdP type matching

See https://github.com/fedidcg/FedCM/issues/585
lastlogin-net · Jun 14, 2024 · 1874f40 · 1874f40
1 parent 81114c6
commit 1874f40
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/fedcm.go b/fedcm.go
@@ -22,10 +22,11 @@ type FedCmWebId struct {
 }
 
 type FedCmConfig struct {
-	AccountsEndpoint       string `json:"accounts_endpoint,omitempty"`
-	ClientMetadataEndpoint string `json:"client_metadata_endpoint,omitempty"`
-	IdAssertionEndpoint    string `json:"id_assertion_endpoint,omitempty"`
-	LoginUrl               string `json:"login_url,omitempty"`
+	AccountsEndpoint       string   `json:"accounts_endpoint,omitempty"`
+	ClientMetadataEndpoint string   `json:"client_metadata_endpoint,omitempty"`
+	IdAssertionEndpoint    string   `json:"id_assertion_endpoint,omitempty"`
+	LoginUrl               string   `json:"login_url,omitempty"`
+	Types                  []string `json:"types"`
 }
 
 type FedCmAccounts struct {
@@ -108,6 +109,9 @@ func NewFedCmHandler(db *Database, storage Storage, loginEndpoint string) *FedCm
 			//ClientMetadataEndpoint: fmt.Sprintf("%s/fedcm/client-metadata", uri),
 			IdAssertionEndpoint: fmt.Sprintf("%s/fedcm/id-assertion", uri),
 			LoginUrl:            fmt.Sprintf("%s%s", uri, loginEndpoint),
+			Types: []string{
+				"indieauth",
+			},
 		}
 
 		w.Header().Set("Content-Type", "application/json")

diff --git a/templates/footer.html b/templates/footer.html
@@ -8,7 +8,7 @@
         return raw ? parseInt(raw[2], 10) : false;
     }
 
-    if (window["IdentityProvider"] && IdentityProvider.register != undefined && getChromeVersion() >= 126) {
+    if (window["IdentityProvider"] && IdentityProvider.register != undefined && getChromeVersion() >= 128) {
       const fedcmBtn = document.getElementById('og-register-fedcm-button');
       fedcmBtn.classList.remove('og-remove');
       fedcmBtn.addEventListener('click', () => {

diff --git a/templates/login-fedcm.html b/templates/login-fedcm.html
@@ -11,7 +11,8 @@
       context: "signin",
       providers: [
         {
-          configURL: "any",
+          configURL: 'any',
+          type: "indieauth",
           clientId: window.location.origin,
           nonce: "fake-nonce",
         },