Changeset 1101 for trunk/openid2-server/plugins/openid2-server/lib/OpenID2Server/App.pm

Timestamp:

09/18/08 08:56:27 (18 months ago)

Author:

fumiakiy

Message:

Differentiate required SREG attributes from optionl attributes.

Files:

• trunk/openid2-server/plugins/openid2-server/lib/OpenID2Server/App.pm (modified) (3 diffs)

trunk/openid2-server/plugins/openid2-server/lib/OpenID2Server/App.pm

@@ -209 +209 @@
                 $req{email} = $app->user->email;
             }
-            elsif ( ( 'nickname' eq $req) || ( 'fullname' eq $req ) ) {
+            elsif ( !exists($req{nickname})
+               && ( ( 'nickname' eq $req ) || ( 'fullname' eq $req ) ) )
+            {
                 $req{nickname} = $app->user->nickname;
             }
@@ -221 +223 @@
                 $opt{email} = $app->user->email;
             }
-            elsif ( ( 'nickname' eq $opt ) || ( 'fullname' eq $opt ) ) {
+            elsif ( !exists($req{nickname}) && !exists($opt{nickname})
+               && ( ( 'nickname' eq $opt )    || ( 'fullname' eq $opt ) ) )
+            {
                 $opt{nickname} = $app->user->nickname;
             }
@@ -250 +254 @@
     # Simple Registration Extension support
     if ( $q->param('openid.ns.sreg') ) {
-        $param{additional_fields} = {
-            'ns.sreg' => $q->param('openid.ns.sreg'),
-            'sreg.email' => $q->param('openid.sreg.email'),
-            'sreg.nickname' => $q->param('openid.sreg.nickname'),
-            'sreg.language' => $q->param('openid.sreg.language')
-        };
+        my %additional_fields;
+        my @p = $q->param;
+        foreach my $p (@p) {
+            next unless $p =~ /^__(\w+)_beacon__$/;
+            my $field = $1;
+            $additional_fields{'sreg.' . $field} = $q->param('openid.sreg.' . $field);
+        }
+        if ( keys %additional_fields ) {
+            $param{additional_fields} = {
+                'ns.sreg' => $q->param('openid.ns.sreg'),
+                %additional_fields
+            }
+        }
     }