Merge pull request #456 from OneBusAway/fix/cli-api-key-credentials

Fix CLI-created API keys returning 401 permission denied

Author: aaronbrethorst

onebusaway-api-key-cli/src/main/java/org/onebusaway/cli/apikey/ApiKeyCliMain.java

@@ -284,7 +284,7 @@ private void doCreate(CommandLine cli, boolean jsonOutput) throws Exception {
         }
 
         // Create the key
-        UserIndex userIndex = userService.getOrCreateUserForIndexKey(indexKey, "", true);
+        UserIndex userIndex = userService.getOrCreateUserForIndexKey(indexKey, keyValue, false);
         userPropertiesService.authorizeApi(userIndex.getUser(), minApiReqInt);
 
         User user = userIndex.getUser();

onebusaway-api-key-cli/src/test/java/org/onebusaway/cli/apikey/ApiKeyCliMainTest.java

@@ -249,12 +249,12 @@ public void testCreate_NewKey_Success() throws Exception {
         User mockUser = mockUserIndex.getUser();
 
         when(userService.getUserIndexForId(any(UserIndexKey.class))).thenReturn(null);
-        when(userService.getOrCreateUserForIndexKey(any(UserIndexKey.class), eq(""), eq(true)))
+        when(userService.getOrCreateUserForIndexKey(any(UserIndexKey.class), eq("test-key-123"), eq(false)))
             .thenReturn(mockUserIndex);
 
         cli.run(new String[]{"create", "--config", "/tmp/data-sources.xml", "--key", keyValue});
 
-        verify(userService).getOrCreateUserForIndexKey(any(UserIndexKey.class), eq(""), eq(true));
+        verify(userService).getOrCreateUserForIndexKey(any(UserIndexKey.class), eq("test-key-123"), eq(false));
         verify(userPropertiesService).authorizeApi(eq(mockUser), anyLong());
         verify(userPropertiesService).updateApiKeyContactInfo(eq(mockUser), anyString(), anyString(), anyString(), anyString());
         assertTrue(outContent.toString().contains("API key created successfully"));
@@ -267,7 +267,7 @@ public void testCreate_WithContactInfo_Success() throws Exception {
         User mockUser = mockUserIndex.getUser();
 
         when(userService.getUserIndexForId(any(UserIndexKey.class))).thenReturn(null);
-        when(userService.getOrCreateUserForIndexKey(any(UserIndexKey.class), eq(""), eq(true)))
+        when(userService.getOrCreateUserForIndexKey(any(UserIndexKey.class), eq("test-key-456"), eq(false)))
             .thenReturn(mockUserIndex);
 
         cli.run(new String[]{
@@ -515,7 +515,7 @@ public void testCreate_JsonOutput_Success() throws Exception {
         User mockUser = mockUserIndex.getUser();
 
         when(userService.getUserIndexForId(any(UserIndexKey.class))).thenReturn(null);
-        when(userService.getOrCreateUserForIndexKey(any(UserIndexKey.class), eq(""), eq(true)))
+        when(userService.getOrCreateUserForIndexKey(any(UserIndexKey.class), eq("json-test-key"), eq(false)))
             .thenReturn(mockUserIndex);
 
         cli.run(new String[]{