Enable apikey security for all methods.

zhirsch · zhirsch · commit 87a1f7ad8d90 · 2017-10-01T14:57:41.000-04:00
Also explicitly specify apikey auth for methods that require oauth2,
since otherwise the local setting (oauth2 only) would override the
global setting (apikey only).  The result is that these methods
require both oauth2 and apikey authentication.

Without this fix, go-swagger doesn't generate an API that allows an
authentication method to be specified.
diff --git a/openapi-2.json b/openapi-2.json
@@ -301,6 +301,7 @@
         "parameters": [],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "ReadBasicUserProfile"
             ]
@@ -1129,6 +1130,7 @@
         ],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "WriteGroups",
               "BnetWrite"
@@ -1188,6 +1190,7 @@
         ],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "WriteGroups",
               "BnetWrite"
@@ -1255,6 +1258,7 @@
         ],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "WriteGroups",
               "BnetWrite"
@@ -1314,6 +1318,7 @@
         ],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "WriteGroups",
               "BnetWrite"
@@ -1517,6 +1522,7 @@
         ],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "ReadUserData"
             ]
@@ -1591,6 +1597,7 @@
         ],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "EditUserData"
             ]
@@ -1641,6 +1648,7 @@
         "parameters": [],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "ReadGroups"
             ]
@@ -1899,6 +1907,7 @@
         "parameters": [],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "BnetWrite"
             ]
@@ -1957,6 +1966,7 @@
         ],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "AdminGroups"
             ]
@@ -2016,6 +2026,7 @@
         ],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "AdminGroups"
             ]
@@ -2075,6 +2086,7 @@
         ],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "AdminGroups"
             ]
@@ -2134,6 +2146,7 @@
         ],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "AdminGroups"
             ]
@@ -2201,6 +2214,7 @@
         ],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "AdminGroups"
             ]
@@ -2440,6 +2454,7 @@
         ],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "AdminGroups"
             ]
@@ -2524,6 +2539,7 @@
         ],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "AdminGroups"
             ]
@@ -2607,6 +2623,7 @@
         ],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "AdminGroups"
             ]
@@ -2691,6 +2708,7 @@
         ],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "AdminGroups"
             ]
@@ -2758,6 +2776,7 @@
         ],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "AdminGroups"
             ]
@@ -2909,6 +2928,7 @@
         ],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "BnetWrite"
             ]
@@ -2975,6 +2995,7 @@
         ],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "AdminGroups"
             ]
@@ -3041,6 +3062,7 @@
         ],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "AdminGroups"
             ]
@@ -3116,6 +3138,7 @@
         ],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "BnetWrite"
             ]
@@ -3174,6 +3197,7 @@
         ],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "AdminGroups"
             ]
@@ -3235,6 +3259,7 @@
         ],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "AdminGroups"
             ]
@@ -3296,6 +3321,7 @@
         ],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "AdminGroups"
             ]
@@ -3357,6 +3383,7 @@
         ],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "AdminGroups"
             ]
@@ -3629,6 +3656,7 @@
         ],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "AdminGroups"
             ]
@@ -3712,6 +3740,7 @@
         ],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "AdminGroups"
             ]
@@ -4414,6 +4443,7 @@
         "parameters": [],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "MoveEquipDestinyItems"
             ]
@@ -4464,6 +4494,7 @@
         "parameters": [],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "MoveEquipDestinyItems"
             ]
@@ -4514,6 +4545,7 @@
         "parameters": [],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "MoveEquipDestinyItems"
             ]
@@ -4563,6 +4595,7 @@
         "parameters": [],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "MoveEquipDestinyItems"
             ]
@@ -4614,6 +4647,7 @@
         "parameters": [],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "MoveEquipDestinyItems"
             ]
@@ -4666,6 +4700,7 @@
         "parameters": [],
         "security": [
           {
+            "apiKey": [],
             "oauth2": [
               "MoveEquipDestinyItems"
             ]
@@ -24667,6 +24702,11 @@
       }
     }
   },
+  "security": [
+    {
+      "apiKey": []
+    }
+  ],
   "tags": [
     {
       "name": "User",

Original file line number	Diff line number	Diff line change
`@@ -301,6 +301,7 @@`
`301`	`301`	`"parameters": [],`
`302`	`302`	`"security": [`
`303`	`303`	`{`
	`304`	`+ "apiKey": [],`
`304`	`305`	`"oauth2": [`
`305`	`306`	`"ReadBasicUserProfile"`
`306`	`307`	`]`
`@@ -1129,6 +1130,7 @@`
`1129`	`1130`	`],`
`1130`	`1131`	`"security": [`
`1131`	`1132`	`{`
	`1133`	`+ "apiKey": [],`
`1132`	`1134`	`"oauth2": [`
`1133`	`1135`	`"WriteGroups",`
`1134`	`1136`	`"BnetWrite"`
`@@ -1188,6 +1190,7 @@`
`1188`	`1190`	`],`
`1189`	`1191`	`"security": [`
`1190`	`1192`	`{`
	`1193`	`+ "apiKey": [],`
`1191`	`1194`	`"oauth2": [`
`1192`	`1195`	`"WriteGroups",`
`1193`	`1196`	`"BnetWrite"`
`@@ -1255,6 +1258,7 @@`
`1255`	`1258`	`],`
`1256`	`1259`	`"security": [`
`1257`	`1260`	`{`
	`1261`	`+ "apiKey": [],`
`1258`	`1262`	`"oauth2": [`
`1259`	`1263`	`"WriteGroups",`
`1260`	`1264`	`"BnetWrite"`
`@@ -1314,6 +1318,7 @@`
`1314`	`1318`	`],`
`1315`	`1319`	`"security": [`
`1316`	`1320`	`{`
	`1321`	`+ "apiKey": [],`
`1317`	`1322`	`"oauth2": [`
`1318`	`1323`	`"WriteGroups",`
`1319`	`1324`	`"BnetWrite"`
`@@ -1517,6 +1522,7 @@`
`1517`	`1522`	`],`
`1518`	`1523`	`"security": [`
`1519`	`1524`	`{`
	`1525`	`+ "apiKey": [],`
`1520`	`1526`	`"oauth2": [`
`1521`	`1527`	`"ReadUserData"`
`1522`	`1528`	`]`
`@@ -1591,6 +1597,7 @@`
`1591`	`1597`	`],`
`1592`	`1598`	`"security": [`
`1593`	`1599`	`{`
	`1600`	`+ "apiKey": [],`
`1594`	`1601`	`"oauth2": [`
`1595`	`1602`	`"EditUserData"`
`1596`	`1603`	`]`
`@@ -1641,6 +1648,7 @@`
`1641`	`1648`	`"parameters": [],`
`1642`	`1649`	`"security": [`
`1643`	`1650`	`{`
	`1651`	`+ "apiKey": [],`
`1644`	`1652`	`"oauth2": [`
`1645`	`1653`	`"ReadGroups"`
`1646`	`1654`	`]`
`@@ -1899,6 +1907,7 @@`
`1899`	`1907`	`"parameters": [],`
`1900`	`1908`	`"security": [`
`1901`	`1909`	`{`
	`1910`	`+ "apiKey": [],`
`1902`	`1911`	`"oauth2": [`
`1903`	`1912`	`"BnetWrite"`
`1904`	`1913`	`]`
`@@ -1957,6 +1966,7 @@`
`1957`	`1966`	`],`
`1958`	`1967`	`"security": [`
`1959`	`1968`	`{`
	`1969`	`+ "apiKey": [],`
`1960`	`1970`	`"oauth2": [`
`1961`	`1971`	`"AdminGroups"`
`1962`	`1972`	`]`
`@@ -2016,6 +2026,7 @@`
`2016`	`2026`	`],`
`2017`	`2027`	`"security": [`
`2018`	`2028`	`{`
	`2029`	`+ "apiKey": [],`
`2019`	`2030`	`"oauth2": [`
`2020`	`2031`	`"AdminGroups"`
`2021`	`2032`	`]`
`@@ -2075,6 +2086,7 @@`
`2075`	`2086`	`],`
`2076`	`2087`	`"security": [`
`2077`	`2088`	`{`
	`2089`	`+ "apiKey": [],`
`2078`	`2090`	`"oauth2": [`
`2079`	`2091`	`"AdminGroups"`
`2080`	`2092`	`]`
`@@ -2134,6 +2146,7 @@`
`2134`	`2146`	`],`
`2135`	`2147`	`"security": [`
`2136`	`2148`	`{`
	`2149`	`+ "apiKey": [],`
`2137`	`2150`	`"oauth2": [`
`2138`	`2151`	`"AdminGroups"`
`2139`	`2152`	`]`
`@@ -2201,6 +2214,7 @@`
`2201`	`2214`	`],`
`2202`	`2215`	`"security": [`
`2203`	`2216`	`{`
	`2217`	`+ "apiKey": [],`
`2204`	`2218`	`"oauth2": [`
`2205`	`2219`	`"AdminGroups"`
`2206`	`2220`	`]`
`@@ -2440,6 +2454,7 @@`
`2440`	`2454`	`],`
`2441`	`2455`	`"security": [`
`2442`	`2456`	`{`
	`2457`	`+ "apiKey": [],`
`2443`	`2458`	`"oauth2": [`
`2444`	`2459`	`"AdminGroups"`
`2445`	`2460`	`]`
`@@ -2524,6 +2539,7 @@`
`2524`	`2539`	`],`
`2525`	`2540`	`"security": [`
`2526`	`2541`	`{`
	`2542`	`+ "apiKey": [],`
`2527`	`2543`	`"oauth2": [`
`2528`	`2544`	`"AdminGroups"`
`2529`	`2545`	`]`
`@@ -2607,6 +2623,7 @@`
`2607`	`2623`	`],`
`2608`	`2624`	`"security": [`
`2609`	`2625`	`{`
	`2626`	`+ "apiKey": [],`
`2610`	`2627`	`"oauth2": [`
`2611`	`2628`	`"AdminGroups"`
`2612`	`2629`	`]`
`@@ -2691,6 +2708,7 @@`
`2691`	`2708`	`],`
`2692`	`2709`	`"security": [`
`2693`	`2710`	`{`
	`2711`	`+ "apiKey": [],`
`2694`	`2712`	`"oauth2": [`
`2695`	`2713`	`"AdminGroups"`
`2696`	`2714`	`]`
`@@ -2758,6 +2776,7 @@`
`2758`	`2776`	`],`
`2759`	`2777`	`"security": [`
`2760`	`2778`	`{`
	`2779`	`+ "apiKey": [],`
`2761`	`2780`	`"oauth2": [`
`2762`	`2781`	`"AdminGroups"`
`2763`	`2782`	`]`
`@@ -2909,6 +2928,7 @@`
`2909`	`2928`	`],`
`2910`	`2929`	`"security": [`
`2911`	`2930`	`{`
	`2931`	`+ "apiKey": [],`
`2912`	`2932`	`"oauth2": [`
`2913`	`2933`	`"BnetWrite"`
`2914`	`2934`	`]`
`@@ -2975,6 +2995,7 @@`
`2975`	`2995`	`],`
`2976`	`2996`	`"security": [`
`2977`	`2997`	`{`
	`2998`	`+ "apiKey": [],`
`2978`	`2999`	`"oauth2": [`
`2979`	`3000`	`"AdminGroups"`
`2980`	`3001`	`]`
`@@ -3041,6 +3062,7 @@`
`3041`	`3062`	`],`
`3042`	`3063`	`"security": [`
`3043`	`3064`	`{`
	`3065`	`+ "apiKey": [],`
`3044`	`3066`	`"oauth2": [`
`3045`	`3067`	`"AdminGroups"`
`3046`	`3068`	`]`
`@@ -3116,6 +3138,7 @@`
`3116`	`3138`	`],`
`3117`	`3139`	`"security": [`
`3118`	`3140`	`{`
	`3141`	`+ "apiKey": [],`
`3119`	`3142`	`"oauth2": [`
`3120`	`3143`	`"BnetWrite"`
`3121`	`3144`	`]`
`@@ -3174,6 +3197,7 @@`
`3174`	`3197`	`],`
`3175`	`3198`	`"security": [`
`3176`	`3199`	`{`
	`3200`	`+ "apiKey": [],`
`3177`	`3201`	`"oauth2": [`
`3178`	`3202`	`"AdminGroups"`
`3179`	`3203`	`]`
`@@ -3235,6 +3259,7 @@`
`3235`	`3259`	`],`
`3236`	`3260`	`"security": [`
`3237`	`3261`	`{`
	`3262`	`+ "apiKey": [],`
`3238`	`3263`	`"oauth2": [`
`3239`	`3264`	`"AdminGroups"`
`3240`	`3265`	`]`
`@@ -3296,6 +3321,7 @@`
`3296`	`3321`	`],`
`3297`	`3322`	`"security": [`
`3298`	`3323`	`{`
	`3324`	`+ "apiKey": [],`
`3299`	`3325`	`"oauth2": [`
`3300`	`3326`	`"AdminGroups"`
`3301`	`3327`	`]`
`@@ -3357,6 +3383,7 @@`
`3357`	`3383`	`],`
`3358`	`3384`	`"security": [`
`3359`	`3385`	`{`
	`3386`	`+ "apiKey": [],`
`3360`	`3387`	`"oauth2": [`
`3361`	`3388`	`"AdminGroups"`
`3362`	`3389`	`]`
`@@ -3629,6 +3656,7 @@`
`3629`	`3656`	`],`
`3630`	`3657`	`"security": [`
`3631`	`3658`	`{`
	`3659`	`+ "apiKey": [],`
`3632`	`3660`	`"oauth2": [`
`3633`	`3661`	`"AdminGroups"`
`3634`	`3662`	`]`
`@@ -3712,6 +3740,7 @@`
`3712`	`3740`	`],`
`3713`	`3741`	`"security": [`
`3714`	`3742`	`{`
	`3743`	`+ "apiKey": [],`
`3715`	`3744`	`"oauth2": [`
`3716`	`3745`	`"AdminGroups"`
`3717`	`3746`	`]`
`@@ -4414,6 +4443,7 @@`
`4414`	`4443`	`"parameters": [],`
`4415`	`4444`	`"security": [`
`4416`	`4445`	`{`
	`4446`	`+ "apiKey": [],`
`4417`	`4447`	`"oauth2": [`
`4418`	`4448`	`"MoveEquipDestinyItems"`
`4419`	`4449`	`]`
`@@ -4464,6 +4494,7 @@`
`4464`	`4494`	`"parameters": [],`
`4465`	`4495`	`"security": [`
`4466`	`4496`	`{`
	`4497`	`+ "apiKey": [],`
`4467`	`4498`	`"oauth2": [`
`4468`	`4499`	`"MoveEquipDestinyItems"`
`4469`	`4500`	`]`
`@@ -4514,6 +4545,7 @@`
`4514`	`4545`	`"parameters": [],`
`4515`	`4546`	`"security": [`
`4516`	`4547`	`{`
	`4548`	`+ "apiKey": [],`
`4517`	`4549`	`"oauth2": [`
`4518`	`4550`	`"MoveEquipDestinyItems"`
`4519`	`4551`	`]`
`@@ -4563,6 +4595,7 @@`
`4563`	`4595`	`"parameters": [],`
`4564`	`4596`	`"security": [`
`4565`	`4597`	`{`
	`4598`	`+ "apiKey": [],`
`4566`	`4599`	`"oauth2": [`
`4567`	`4600`	`"MoveEquipDestinyItems"`
`4568`	`4601`	`]`
`@@ -4614,6 +4647,7 @@`
`4614`	`4647`	`"parameters": [],`
`4615`	`4648`	`"security": [`
`4616`	`4649`	`{`
	`4650`	`+ "apiKey": [],`
`4617`	`4651`	`"oauth2": [`
`4618`	`4652`	`"MoveEquipDestinyItems"`
`4619`	`4653`	`]`
`@@ -4666,6 +4700,7 @@`
`4666`	`4700`	`"parameters": [],`
`4667`	`4701`	`"security": [`
`4668`	`4702`	`{`
	`4703`	`+ "apiKey": [],`
`4669`	`4704`	`"oauth2": [`
`4670`	`4705`	`"MoveEquipDestinyItems"`
`4671`	`4706`	`]`
`@@ -24667,6 +24702,11 @@`
`24667`	`24702`	`}`
`24668`	`24703`	`}`
`24669`	`24704`	`},`
	`24705`	`+ "security": [`
	`24706`	`+ {`
	`24707`	`+ "apiKey": []`
	`24708`	`+ }`
	`24709`	`+ ],`
`24670`	`24710`	`"tags": [`
`24671`	`24711`	`{`
`24672`	`24712`	`"name": "User",`