minor test fixes: MagicKey id is back to domain w/o username

app.yaml

@@ -70,11 +70,11 @@ handlers:
   script: activitypub.app
   secure: always
 
-- url: /[^/]+/salmon/?
+- url: /[^@/]+/salmon/?
   script: salmon.app
   secure: always
 
-- url: /(acct:)?([^@]+)@@[^/]+/?
+- url: /(acct:)?[^/]+/?
   script: webfinger.app
   secure: always
 

test/test_models.py

@@ -9,16 +9,16 @@ import testutil
 class ModelsTest(testutil.TestCase):
 
     def test_magic_key_get_or_create(self):
-        key = models.MagicKey.get_or_create('x@y.z')
+        key = models.MagicKey.get_or_create('y.z')
         assert key.mod
         assert key.public_exponent
         assert key.private_exponent
 
-        same = models.MagicKey.get_or_create('x@y.z')
+        same = models.MagicKey.get_or_create('y.z')
         self.assertEquals(same, key)
 
     def test_href(self):
-        key = models.MagicKey.get_or_create('x@y.z')
+        key = models.MagicKey.get_or_create('y.z')
         href = key.href()
         self.assertTrue(href.startswith('data:application/magic-public-key,RSA.'), href)
         self.assertIn(key.mod, href)

test/test_webmention.py

@@ -143,7 +143,7 @@ class WebmentionTest(testutil.TestCase):
         self.reply_obj['inReplyTo'][0]['id'] = 'tag:fed.brid.gy,2017-08-22:orig-post'
         reply_atom = atom.activity_to_atom(
             {'object': self.reply_obj}, xml_base='http://a/reply')
-        key = MagicKey.get_by_id('@a')
+        key = MagicKey.get_by_id('a')
         assert magicsigs.verify(None, reply_atom, env['sig'], key=key)
 
         data = utils.decode(env['data'])

webmention.py

@@ -168,12 +168,9 @@ class WebmentionHandler(webapp2.RequestHandler):
 
         # sign reply and wrap in magic envelope
         # TODO: use author h-card's u-url?
-        # TODO: person emoji username
-        # BETTER: TODO: extract u-nickname or first name
         domain = urlparse.urlparse(source_url).netloc.split(':')[0]
-        key_owner = 'ryan@' + domain
-        key = models.MagicKey.get_or_create(key_owner)
-        logging.info('Using key for %s: %s', key_owner, key)
+        key = models.MagicKey.get_or_create(domain)
+        logging.info('Using key for %s: %s', domain, key)
         magic_envelope = magicsigs.magic_envelope(
             entry, common.ATOM_CONTENT_TYPE, key)