zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-16 17:37:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Inject clientId into LoggedInFlow

Browse source 
(take two)

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=133206842
This commit is contained in:
cgoldfeder 2016-09-14 19:20:41 -07:00 • committed by Ben McIlwain
parent 516b5663a5
commit 949a360f46
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
java/google/registry/flows/LoggedInFlow.java
View file

@ -28,11 +28,13 @@ import com.google.common.collect.ImmutableSet;
import google.registry.flows.EppException.CommandUseErrorException; import google.registry.flows.EppException.CommandUseErrorException;
import google.registry.flows.EppException.SyntaxErrorException; import google.registry.flows.EppException.SyntaxErrorException;
import google.registry.flows.EppException.UnimplementedExtensionException; import google.registry.flows.EppException.UnimplementedExtensionException;
import google.registry.flows.FlowModule.ClientId;
import google.registry.model.eppcommon.ProtocolDefinition; import google.registry.model.eppcommon.ProtocolDefinition;
import google.registry.model.eppinput.EppInput.CommandExtension; import google.registry.model.eppinput.EppInput.CommandExtension;
import google.registry.model.registrar.Registrar; import google.registry.model.registrar.Registrar;
import google.registry.util.FormattingLogger; import google.registry.util.FormattingLogger;
import java.util.Set; import java.util.Set;
import javax.inject.Inject;
/** A flow that requires being logged in. */ /** A flow that requires being logged in. */
public abstract class LoggedInFlow extends Flow { public abstract class LoggedInFlow extends Flow {
@ -50,13 +52,15 @@ public abstract class LoggedInFlow extends Flow {
*/ */
private ImmutableSet<String> allowedTlds; private ImmutableSet<String> allowedTlds;
@Inject @ClientId String clientId;
protected ImmutableSet<String> getAllowedTlds() { protected ImmutableSet<String> getAllowedTlds() {
return allowedTlds; return allowedTlds;
} }
@Override @Override
public final void initFlow() throws EppException { public final void initFlow() throws EppException {
if (getClientId() == null) { if (clientId.isEmpty()) {
throw new NotLoggedInException(); throw new NotLoggedInException();
} }
// Validate that the extensions in the input match what this flow expects. // Validate that the extensions in the input match what this flow expects.
@ -89,15 +93,15 @@ public abstract class LoggedInFlow extends Flow {
} else { } else {
logger.infofmt( logger.infofmt(
"Client (%s) is attempting to run flow (%s) without declaring URIs %s on login", "Client (%s) is attempting to run flow (%s) without declaring URIs %s on login",
getClientId(), getClass().getSimpleName(), undeclaredUris); clientId, getClass().getSimpleName(), undeclaredUris);
} }
} }
if (isSuperuser) { if (isSuperuser) {
allowedTlds = getTlds(); allowedTlds = getTlds();
} else { } else {
Registrar registrar = verifyNotNull( Registrar registrar = verifyNotNull(
Registrar.loadByClientId(sessionMetadata.getClientId()), Registrar.loadByClientId(clientId),
"Could not load registrar %s", sessionMetadata.getClientId()); "Could not load registrar %s", clientId);
allowedTlds = registrar.getAllowedTlds(); allowedTlds = registrar.getAllowedTlds();
} }
initLoggedInFlow(); initLoggedInFlow();