Fix params for flutter tests to pass

Author: abnegate

mock-server/app/http.php

@@ -564,12 +564,13 @@
     ->label('sdk.namespace', 'general')
     ->label('sdk.method', 'oauth2')
     ->param('clientId', '', new Text(100), 'OAuth2 Client ID.')
-    ->param('redirectUri', '', new Host(['localhost']), 'OAuth2 Redirect URI.') // Important to deny an open redirect attack
     ->param('scopes', [], new ArrayList(new Text(100)), 'OAuth2 scope list.')
     ->param('state', '', new Text(1024), 'OAuth2 state.')
+    ->param('success', '', new Text(1024), 'OAuth2 success redirect URI.')
+    ->param('failure', '', new Text(1024), 'OAuth2 failure redirect URI.')
     ->inject('response')
-    ->action(function (string $client_id, string $redirectURI, array $scopes, string $state, UtopiaSwooleResponse $response) {
-        $response->redirect($redirectURI . '?' . \http_build_query(['code' => 'abcdef', 'state' => $state]));
+    ->action(function (string $clientId, array $scopes, string $state, string $success, string $failure, UtopiaSwooleResponse $response) {
+        $response->redirect($success . '?' . \http_build_query(['code' => 'abcdef', 'state' => $state]));
     });
 
 App::get('/v1/mock/tests/general/oauth2/token')

templates/flutter/base/requests/oauth.twig

@@ -31,4 +31,4 @@
           query: query.join('&')
         );
 
-      return client.webAuth(url, callbackUrlScheme: success);
+        return client.webAuth(url, callbackUrlScheme: success);

tests/languages/dart/tests.dart

@@ -106,9 +106,10 @@ void main() async {
 
   final url = await general.oauth2(
       clientId: 'clientId',
-      redirectUri: 'https://localhost',
       scopes: ['test'],
-      state: '123456'
+      state: '123456',
+      success: 'https://localhost',
+      failure: 'https://localhost'
   );
   print(url);
 

tests/languages/deno/tests.ts

@@ -134,7 +134,13 @@ async function start() {
 
   await general.empty();
 
-  const url = await general.oauth2('clientId', 'https://localhost', ['test'], '123456')
+  const url = await general.oauth2(
+      'clientId',
+      ['test'],
+      '123456',
+      'https://localhost',
+      'https://localhost'
+  )
   console.log(url)
 
   // Query helper tests

tests/languages/dotnet/Tests.cs

@@ -115,9 +115,10 @@ public async Task Test1()
 
             var url = await general.Oauth2(
                 clientId: "clientId",
-                redirectUri: "https://localhost",
                 scopes: new List<string>() {"test"},
-                state: "123456"
+                state: "123456",
+                success: "https://localhost",
+                failure: "https://localhost"
             );
             TestContext.WriteLine(url);
 

tests/languages/kotlin/Tests.kt

@@ -127,12 +127,14 @@ class ServiceTest {
             try {
                 val url = general.oauth2(
                     clientId = "clientId",
-                    redirectUri = "https://localhost",
                     scopes = listOf("test"),
-                    state = "123456"
+                    state = "123456",
+                    success = "https://localhost",
+                    failure = "https://localhost",
                 )
                 writeToFile(url)
             } catch(e: Exception) {
+                writeToFile("Was exception")
                 writeToFile(e.message)
             }
 

tests/languages/node/test.js

@@ -99,7 +99,13 @@ async function start() {
 
     await general.empty();
 
-    const url = await general.oauth2('clientId', 'https://localhost', ['test'], '123456')
+    const url = await general.oauth2(
+        'clientId',
+        ['test'],
+        '123456',
+        'https://localhost',
+        'https://localhost'
+    )
     console.log(url)
 
     // Query helper tests

tests/languages/php/test.php

@@ -109,7 +109,13 @@
 
 $general->empty();
 
-$url = $general->oauth2('clientId', 'https://localhost', ['test'], '123456');
+$url = $general->oauth2(
+    'clientId',
+    ['test'],
+    '123456',
+    'https://localhost',
+    'https://localhost'
+);
 echo $url . "\n";
 
 // Query helper tests

tests/languages/python/tests.py

@@ -95,7 +95,13 @@
 
 general.empty()
 
-url = general.oauth2('clientId', 'https://localhost', ['test'], '123456')
+url = general.oauth2(
+    'clientId',
+    ['test'],
+    '123456',
+    'https://localhost',
+    'https://localhost'
+)
 print(url)
 
 # Query helper tests

tests/languages/ruby/tests.rb

@@ -108,9 +108,10 @@
 
 url = general.oauth2(
     client_id: 'clientId',
-    redirect_uri: 'https://localhost',
     scopes: ['test'],
-    state: '123456'
+    state: '123456',
+    success: 'https://localhost',
+    failure: 'https://localhost'
 )
 puts url