Supporting email and phone scopes

Automattic · Dec 3, 2024 · 37e73c8 · 37e73c8
1 parent a65653b
commit 37e73c8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/Http/Handlers/ConfigurationHandler.php b/src/Http/Handlers/ConfigurationHandler.php
@@ -28,7 +28,7 @@ private function configuration(): array {
 			'authorization_endpoint'                => Router::make_rest_url( 'authorize' ),
 			'token_endpoint'                        => Router::make_rest_url( 'token' ),
 			'userinfo_endpoint'                     => Router::make_rest_url( 'userinfo' ),
-			'scopes_supported'                      => array( 'openid', 'profile' ),
+			'scopes_supported'                      => array( 'openid', 'profile', 'email', 'phone' ),
 			'response_types_supported'              => array( 'code' ),
 			'id_token_signing_alg_values_supported' => array( 'RS256' ),
 		);

diff --git a/src/Storage/UserClaimsStorage.php b/src/Storage/UserClaimsStorage.php
@@ -38,13 +38,26 @@ public function getUserClaims( $user_id, $scope ) {
 			'nickname'    => 'user_nicename',
 		);
 
+		// Is email scope requested?
+		if(in_array('email', $scopes, true)) {
+			$field_map['email'] = 'user_email';
+		}
+
+		// Is phone scope requested?
+		if(in_array('phone', $scopes, true)) {
+			$field_map['phone'] = 'user_phone';
+		}
+
 		foreach ( $field_map as $key => $value ) {
 			if ( $user->$value ) {
 				$claims[ $key ] = $user->$value;
 			}
 		}
 
-		$claims['picture'] = get_avatar_url( $user->user_email );
+		// Is profile scope requested, add picture (user avatar)?
+		if(in_array( 'profile', $scopes, true )) {
+			$claims['picture'] = get_avatar_url( $user->user_email );
+		}
 
 		return apply_filters( 'oidc_user_claims', $claims, $user );
 	}