Skip to content

Commit

Permalink
fix: alias->group if auto True else default
Browse files Browse the repository at this point in the history
  • Loading branch information
kentbull committed May 14, 2024
1 parent 8daba3d commit 84b6f1d
Showing 1 changed file with 24 additions and 28 deletions.
52 changes: 24 additions & 28 deletions src/keri/app/cli/commands/multisig/join.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
parser.add_argument('--name', '-n', help='keystore name and file location of KERI keystore', required=True)
parser.add_argument('--base', '-b', help='additional optional prefix to file location of KERI keystore',
required=False, default="")
parser.add_argument('--alias', '-a', help='human readable alias for the multisig identifier prefix', required=False, default=None)
parser.add_argument('--group', '-a', help='human-readable name for the multisig group identifier prefix', required=False, default=None)
parser.add_argument('--passcode', '-p', help='22 character encryption passcode for keystore (is not saved)',
dest="bran", default=None) # passcode => bran
parser.add_argument("--auto", "-Y", help="auto approve any delegation request non-interactively", action="store_true")
Expand All @@ -42,11 +42,11 @@ def join(args):
base = args.base
bran = args.bran
auto = args.auto
alias = args.alias
group = args.group

confirmDoer = JoinDoer(name=name, base=base, bran=bran, alias=alias, auto=auto)
joinDoer = JoinDoer(name=name, base=base, bran=bran, group=group, auto=auto)

doers = [confirmDoer]
doers = [joinDoer]
return doers


Expand All @@ -55,18 +55,18 @@ class JoinDoer(doing.DoDoer):
"""

def __init__(self, name, base, bran, alias, auto=False):
def __init__(self, name, base, bran, group, auto=False):
""" Create doer for polling for group multisig events and either approve automatically or prompt user
Parameters:
name (str): database environment name
base (str): database directory prefix
bran (str): passcode to unlock keystore
alias (str): human-readable name for the multisig identifier prefix
group (str): human-readable name for the multisig identifier prefix
auto (bool): non-interactively auto approve any inception, rotation, interaction, or other event
while using the default alias of "test-alias"
while using the default group of "default-group"
"""
self.alias = alias
self.group = group
self.hby = existing.setupHby(name=name, base=base, bran=bran)
self.rgy = credentialing.Regery(hby=self.hby, name=name, base=base)
self.hbyDoer = habbing.HaberyDoer(habery=self.hby) # setup doer
Expand Down Expand Up @@ -201,22 +201,20 @@ def incept(self, attrs):

if approve:
if self.auto:
alias = self.alias
elif self.alias:
alias = self.alias
if self.hby.habByName(alias) is not None:
print(f"AID alias {alias} is already in use, please try again")
raise ValueError(f"AID alias {alias} is already in use, please try again")
if self.group is None:
group = "default-group"
else:
group = self.group
else:
while True:
alias = input(f"\nEnter alias for new AID: ")
if self.hby.habByName(alias) is not None:
print(f"AID alias {alias} is already in use, please try again")
group = input(f"\nEnter group name for new AID: ")
if self.hby.habByName(group) is not None:
print(f"AID group name {group} is already in use, please try again")
else:
break

try:
ghab = self.hby.makeGroupHab(group=alias, mhab=mhab,
ghab = self.hby.makeGroupHab(group=group, mhab=mhab,
smids=smids, rmids=rmids, **inits)
except ValueError as e:
return False
Expand Down Expand Up @@ -403,21 +401,19 @@ def rotate(self, attrs):
ghab = self.hby.habs[pre]
else:
if self.auto:
alias = "test alias"
elif self.alias:
alias = self.alias
if self.hby.habByName(alias) is not None:
print(f"AID alias {alias} is already in use, please try again")
raise ValueError(f"AID alias {alias} is already in use, please try again")
if self.group is None:
group = "default-group"
else:
group = self.group
else:
while True:
alias = input(f"\nEnter alias for new AID: ")
if self.hby.habByName(alias) is not None:
print(f"AID alias {alias} is already in use, please try again")
group = input(f"\nEnter group name for new AID: ")
if self.hby.habByName(group) is not None:
print(f"AID group name {group} is already in use, please try again")
else:
break

ghab = self.hby.joinGroupHab(pre, group=alias, mhab=mhab, smids=smids, rmids=rmids)
ghab = self.hby.joinGroupHab(pre, group=group, mhab=mhab, smids=smids, rmids=rmids)

try:
ghab.rotate(serder=orot)
Expand Down

0 comments on commit 84b6f1d

Please sign in to comment.