Merge branch 'staging' into dev

ipsilon/info/infofasjson.py

@@ -6,6 +6,8 @@ from ipsilon.util import config as pconfig
 import fasjson_client
 
 
+# For OpenID Connect: https://openid.net/specs/openid-connect-basic-1_0.html#StandardClaims
+# For OpenID: https://openid.net/specs/openid-simple-registration-extension-1_0.html#response_format
 fasjson_mapping = [
     ['email', 'email'],
     ['username', 'nickname'],
@@ -19,6 +21,9 @@ fasjson_mapping = [
     ['gpgkeyids', 'gpg_keyids'],
     ['groups', 'groups'],
     ['agreements', 'agreements'],
+    # Plain OpenID (sreg)
+    ['timezone', 'timezone'],
+    ['human_name', 'fullname'],
 ]
 
 

ipsilon/providers/openidc/plugins/account-scopes.py

@@ -15,4 +15,8 @@ class OpenidCExtension(OpenidCExtensionBase):
             'display_name': 'Fedora Account Signed Agreements',
             'claims': ['agreements']
         },
+        'https://id.fedoraproject.org/scope/fas-attributes': {
+            'display_name': 'Fedora Account Attributes',
+            'claims': ['ircnick', 'gpg_keyid', 'ssh_key', 'privacy']
+        },
     }