mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-09-06 08:07:03 +00:00
Code Issues Releases Wiki Activity

Prevent accidentally using full Drive URL as folder ID (#144)

Browse Source 
* Prevent accidentally using full Drive URL as folder ID
This commit is contained in:
Ben McIlwain
2019-07-03 14:22:15 -04:00
committed by GitHub
parent 8afc4f4d3d
commit 0564b207f2
7 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/google/registry/model/registrar/Registrar.java
+3 -1
View File
@@ -868,7 +868,9 @@ public class Registrar extends ImmutableObject implements Buildable, Jsonifiable
return this;
}
public Builder setDriveFolderId(String driveFolderId) {
public Builder setDriveFolderId(@Nullable String driveFolderId) {
checkArgument(driveFolderId == null || !driveFolderId.contains("/"),
"Drive folder ID must not be a full URL");
getInstance().driveFolderId = driveFolderId;
return this;
}
core/src/main/java/google/registry/tools/CreateOrUpdateRegistrarCommand.java
+1 -1
View File
@@ -237,7 +237,7 @@ abstract class CreateOrUpdateRegistrarCommand extends MutatingCommand {
@Nullable
@Parameter(
names = "--drive_folder_id",
description = "Id of this registrar's folder in Drive",
description = "Id (not full URL) of this registrar's folder in Drive",
converter = OptionalStringParameter.class,
validateWith = OptionalStringParameter.class)
Optional<String> driveFolderId;
core/src/main/resources/google/registry/ui/soy/registrar/RegistrarCreateConsole.soy
+2 -2
View File
@@ -240,12 +240,12 @@
{param required: true /}
{/call}
{call registry.soy.forms.inputFieldRowWithValue}
{param label: 'DRIVE ID' /}
{param label: 'Drive ID' /}
{param name: 'driveId' /}
{param value: $driveId /}
{param placeholder: 'required' /}
{param description kind="text"}
Id of this registrar's folder in Drive.
ID (not full URL) of this registrar's folder in Google Drive.
{/param}
{param required: true /}
{/call}