Add ux_mode to allow sign-in when not already

fedidcg/FedCM#442 (comment)
philsmart · Oct 17, 2023 · 8b9ceb0 · 8b9ceb0
1 parent 204ccae
commit 8b9ceb0
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 41 deletions.
diff --git a/fedcm-idp/src/main/resources/templates/idp/reauth.html b/fedcm-idp/src/main/resources/templates/idp/reauth.html
@@ -12,7 +12,7 @@
 <body style="margin: 10px">
 
     <div style="text-align: center">
-        <h1>Identity Provider Reauthentication</h1>
+        <h1>Identity Provider Sign in</h1>
     </div>
 
     <div id="steps-outer">

diff --git a/...-model/src/main/java/uk/ac/jisc/ti/demo/fedcm/model/IdentityCredentialRequestOptions.java b/...-model/src/main/java/uk/ac/jisc/ti/demo/fedcm/model/IdentityCredentialRequestOptions.java
@@ -28,72 +28,65 @@ public class IdentityCredentialRequestOptions {
 
 	private final IdentityCredentialRequestOptionsContext context;
 
-    /**
-     * @return the providers
-     */
-    @JsonProperty("providers")
-    public final List<IdentityProviderConfig> getProviders() {
-        return providers;
-    }
-
-    @JsonProperty("context")
-    public final String getContext() {
-    	return context.getName();
-    }
+	private final String mode;
 
+
 	private IdentityCredentialRequestOptions(Builder builder) {
 		this.providers = builder.providers;
 		this.context = builder.context;
+		this.mode = builder.mode;
 	}
 
-
-	public static IProvidersStage builder() {
-		return new Builder();
+	/**
+	 * @return the providers
+	 */
+	@JsonProperty("providers")
+	public final List<IdentityProviderConfig> getProviders() {
+		return providers;
 	}
 
-
-	public interface IProvidersStage {
-		public IBuildStage withProviders(List<IdentityProviderConfig> providers);
+	@JsonProperty("context")
+	public final String getContext() {
+		return context.getName();
+	}
+
+	@JsonProperty("mode")
+	public final String getMode() {
+		return mode;
 	}
 
-
-	public interface IBuildStage {
-		public IBuildStage withContext(IdentityCredentialRequestOptionsContext context);
-
-		public IdentityCredentialRequestOptions build();
+
+	public static Builder builder() {
+		return new Builder();
 	}
 
 	@JsonPOJOBuilder(buildMethodName = "build", withPrefix = "with")
-	public static final class Builder implements IProvidersStage, IBuildStage {
+	public static final class Builder {
 		private List<IdentityProviderConfig> providers = Collections.emptyList();
-		private IdentityCredentialRequestOptionsContext context = IdentityCredentialRequestOptionsContext.SIGNIN;
+		private IdentityCredentialRequestOptionsContext context;
+		private String mode;
 
 		private Builder() {
 		}
 
-		@Override
-		public IBuildStage withProviders(List<IdentityProviderConfig> providers) {
+		public Builder withProviders(List<IdentityProviderConfig> providers) {
 			this.providers = providers;
 			return this;
 		}
 
-		@Override
-		public IBuildStage withContext(IdentityCredentialRequestOptionsContext context) {
+		public Builder withContext(IdentityCredentialRequestOptionsContext context) {
 			this.context = context;
 			return this;
 		}
 
-		@Override
+		public Builder withMode(String mode) {
+			this.mode = mode;
+			return this;
+		}
+
 		public IdentityCredentialRequestOptions build() {
 			return new IdentityCredentialRequestOptions(this);
 		}
-
-	}
-
-	@Override
-	public String toString() {
-		return "IdentityCredentialRequestOptions [providers=" + providers + ", context=" + context + "]";
 	}
-
 
 }
diff --git a/fedcm-proxy/src/main/resources/templates/proxy/reauth.html b/fedcm-proxy/src/main/resources/templates/proxy/reauth.html
@@ -40,7 +40,7 @@
 <body style="margin: 10px">
 
     <div style="text-align: center">
-        <h1>Proxy Reauthentication</h1>
+        <h1>Proxy Sign in</h1>
     </div>
 </body>
 

diff --git a/fedcm-rp/src/main/resources/application-rp.properties b/fedcm-rp/src/main/resources/application-rp.properties
@@ -14,4 +14,4 @@ server.ssl.key-store-password=changeit
 ## FedCM Generic properties
 
 ## FedCM RP properties
-fedcm.rp.idpConfig=classpath:/identity-provider-config.json
+fedcm.rp.idpConfig=classpath:/identity-provider-config-signin.json
diff --git a/fedcm-rp/src/main/resources/identity-provider-config-multi.json b/fedcm-rp/src/main/resources/identity-provider-config-multi.json
@@ -13,5 +13,6 @@
 			"scope": []
 		}
 	],
+	"mode" : "button",
 	"context": "signin"
 }}
diff --git a/fedcm-rp/src/main/resources/identity-provider-config-signin.json b/fedcm-rp/src/main/resources/identity-provider-config-signin.json
@@ -0,0 +1,18 @@
+{"identity":{
+	"providers": [
+		{
+			"configURL": "http://idp.localhost:8080/idp/fedcm.json",
+			"clientId": "https://test.rp.org/",
+			"nonce": "c2f39aba-b17e-4c38-93ea-34293dfde025",
+			"scope": [
+				"profile",
+				"scopes",
+				"newscope"
+			]
+		}
+	],
+	"mode" : "button",
+	"context": "continue"
+}}
+
+
diff --git a/fedcm-rp/src/main/resources/identity-provider-config.json b/fedcm-rp/src/main/resources/identity-provider-config.json
@@ -11,6 +11,7 @@
 			]
 		}
 	],
+	"mode" : "widget",
 	"context": "continue"
 }}
 

diff --git a/fedcm-rp/src/main/resources/templates/rp.html b/fedcm-rp/src/main/resources/templates/rp.html
@@ -66,7 +66,8 @@ <h4 style="text-align: center">FedCM Login Steps
            <!-- <iframe src="http://idp.localhost:8080/login-button" allow="identity-credentials-get">
                 
             </iframe>-->
-			<button onclick="login()">Login (FedCM)</button>			
+			<button onclick="login()">Login (FedCM)</button>
+
 		</div>
 
 		<div id="token-inner">