Diff comments:
>
> === modified file 'lib/lp/soyuz/model/archive.py'
> --- lib/lp/soyuz/model/archive.py 2016-07-14 00:25:14 +0000
> +++ lib/lp/soyuz/model/archive.py 2016-07-14 00:25:14 +0000
> @@ -1985,20 +1986,57 @@
> else:
> return archive_auth_token
>
> - def getNamedAuthToken(self, name):
> + def newNamedAuthTokens(self, names, as_dict=True):
> + """See `IArchive`."""
> +
> + if not getFeatureFlag(NAMED_AUTH_TOKEN_FEATURE_FLAG):
> + raise NamedAuthTokenFeatureDisabled()
> +
> + # Bail if the archive isn't private
> + if not self.private:
> + raise ArchiveNotPrivate("Archive must be private.")
> +
> + # Check for duplicate names.
> + token_set = getUtility(IArchiveAuthTokenSet)
> + active_tokens = token_set.getActiveNamedTokensForArchive(self)
> + active_tokens = removeSecurityProxy(active_tokens)
Didn't find a way around this. Not sure if that's ok.
> + dup_tokens = active_tokens.find(ArchiveAuthToken.name.is_in(names))
> + dup_names = [token.name for token in dup_tokens]
> +
> + values = [
> + (name, create_token(20), self) for name in names
> + if name not in dup_names]
> + tokens = create(
> + (ArchiveAuthToken.name, ArchiveAuthToken.token,
> + ArchiveAuthToken.archive), values, get_objects=True)
> +
> + # Return all requested tokens, including duplicates.
> + tokens.extend(dup_tokens)
> + if as_dict:
> + return {token.name: token.asDict() for token in tokens}
> + else:
> + return tokens
> +
> + def getNamedAuthToken(self, name, as_dict=True):
> """See `IArchive`."""
> token_set = getUtility(IArchiveAuthTokenSet)
> auth_token = token_set.getActiveNamedTokenForArchive(self, name)
> if auth_token is not None:
> - return auth_token.asDict()
> + if as_dict:
> + return auth_token.asDict()
> + else:
> + return auth_token
> else:
> raise NotFoundError(name)
>
> - def getNamedAuthTokens(self):
> + def getNamedAuthTokens(self, as_dict=True):
> """See `IArchive`."""
> token_set = getUtility(IArchiveAuthTokenSet)
> auth_tokens = token_set.getActiveNamedTokensForArchive(self)
> - return [auth_token.asDict() for auth_token in auth_tokens]
> + if as_dict:
> + return [auth_token.asDict() for auth_token in auth_tokens]
> + else:
> + return auth_tokens
>
> def revokeNamedAuthToken(self, name):
> """See `IArchive`."""
> @@ -2009,6 +2047,14 @@
> else:
> raise NotFoundError(name)
>
> + def revokeNamedAuthTokens(self, names):
> + """See `IArchive`."""
> + token_set = getUtility(IArchiveAuthTokenSet)
> + active_tokens = token_set.getActiveNamedTokensForArchive(self)
> + active_tokens = removeSecurityProxy(active_tokens)
Didn't find a way around this. Not sure if that's ok.
> + tokens = active_tokens.find(ArchiveAuthToken.name.is_in(names))
> + tokens.set(date_deactivated=UTC_NOW)
> +
> def newSubscription(self, subscriber, registrant, date_expires=None,
> description=None):
> """See `IArchive`."""
--
https://code.launchpad.net/~maxiberta/launchpad/named-auth-tokens-bulk-api/+merge/300016
Your team Launchpad code reviewers is requested to review the proposed merge of
lp:~maxiberta/launchpad/named-auth-tokens-bulk-api into lp:launchpad.
_______________________________________________
Mailing list: https://launchpad.net/~launchpad-reviewers
Post to : launchpad-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~launchpad-reviewers
More help : https://help.launchpad.net/ListHelp
