Merge branch 'gh-156'

samples/pom.xml

@@ -13,7 +13,7 @@
 
 	<properties>
 		<java.version>17</java.version>
-		<spring-cloud.version>2022.0.4</spring-cloud.version>
+		<spring-cloud.version>2023.0.0</spring-cloud.version>
 
 		<!-- OpenAPI -->
 		<io.swagger.core.v3.version>2.2.19</io.swagger.core.v3.version>

samples/tutorials/bff/backend/official/bff-official/src/main/resources/application.yml

@@ -84,8 +84,8 @@ logging:
   level:
     org:
       springframework:
-        security: DEBUG
-        boot: DEBUG
+        security: INFO
+        boot: INFO
 
 ---
 spring:

samples/tutorials/bff/backend/official/greeting-api-official/src/main/resources/application.yml

@@ -21,7 +21,7 @@ logging:
   level:
     org:
       springframework:
-        security: DEBUG
+        security: INFO
 
 ---
 server:

samples/tutorials/bff/backend/with-c4-soft/bff-c4/src/main/resources/application.yml

@@ -108,7 +108,8 @@ logging:
   level:
     org:
       springframework:
-        security: TRACE
+        security: INFO
+        boot: DEBUG
 
 ---
 spring:

samples/tutorials/bff/backend/with-c4-soft/greeting-api-c4/src/main/resources/application.yml

@@ -30,7 +30,7 @@ logging:
     org:
       springframework:
         boot: INFO
-        security: DEBUG
+        security: INFO
 
 ---
 server:

samples/tutorials/bff/flutter/.gitignore

@@ -0,0 +1,44 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+migrate_working_dir/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+**/doc/api/
+**/ios/Flutter/.last_build_id
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.packages
+.pub-cache/
+.pub/
+/build/
+
+# Symbolication related
+app.*.symbols
+
+# Obfuscation related
+app.*.map.json
+
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release

samples/tutorials/bff/flutter/.metadata

@@ -0,0 +1,45 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: "6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e"
+  channel: "stable"
+
+project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: 6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e
+      base_revision: 6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e
+    - platform: android
+      create_revision: 6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e
+      base_revision: 6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e
+    - platform: ios
+      create_revision: 6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e
+      base_revision: 6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e
+    - platform: linux
+      create_revision: 6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e
+      base_revision: 6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e
+    - platform: macos
+      create_revision: 6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e
+      base_revision: 6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e
+    - platform: web
+      create_revision: 6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e
+      base_revision: 6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e
+    - platform: windows
+      create_revision: 6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e
+      base_revision: 6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'

samples/tutorials/bff/flutter/README.md

@@ -0,0 +1,3 @@
+# bff_ui
+
+A new Flutter project.

samples/tutorials/bff/flutter/analysis_options.yaml

@@ -0,0 +1 @@
+include: package:flutter_lints/flutter.yaml

samples/tutorials/bff/flutter/android/.gitignore

@@ -0,0 +1,13 @@
+gradle-wrapper.jar
+/.gradle
+/captures/
+/gradlew
+/gradlew.bat
+/local.properties
+GeneratedPluginRegistrant.java
+
+# Remember to never publicly share your keystore.
+# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+key.properties
+**/*.keystore
+**/*.jks

samples/tutorials/bff/flutter/android/app/build.gradle

@@ -0,0 +1,66 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
+def localProperties = new Properties()
+def localPropertiesFile = rootProject.file('local.properties')
+if (localPropertiesFile.exists()) {
+    localPropertiesFile.withReader('UTF-8') { reader ->
+        localProperties.load(reader)
+    }
+}
+
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
+android {
+    namespace "com.c4_soft.quiz.flutter_ui"
+    compileSdkVersion flutter.compileSdkVersion
+    ndkVersion flutter.ndkVersion
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+    }
+
+    defaultConfig {
+        applicationId "com.c4_soft.quiz.flutter_ui"
+        // You can update the following values to match your application needs.
+        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
+        minSdkVersion flutter.minSdkVersion
+        targetSdkVersion flutter.targetSdkVersion
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
+    }
+
+    buildTypes {
+        release {
+            // TODO: Add your own signing config for the release build.
+            // Signing with the debug keys for now, so `flutter run --release` works.
+            signingConfig signingConfigs.debug
+        }
+    }
+}
+
+flutter {
+    source '../..'
+}
+
+dependencies {}

samples/tutorials/bff/flutter/android/app/src/debug/AndroidManifest.xml

@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
+         to allow setting breakpoints, to provide hot reload, etc.
+    -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+</manifest>

samples/tutorials/bff/flutter/android/app/src/main/AndroidManifest.xml

@@ -0,0 +1,111 @@
+<manifest xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.c4_soft.quiz.flutter_ui">
+
+    <application
+        android:label="BFF_Flutter_UI"
+        android:name="${applicationName}"
+        android:icon="@mipmap/ic_launcher">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:launchMode="singleTop"
+            android:theme="@style/LaunchTheme"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:hardwareAccelerated="true"
+            android:windowSoftInputMode="adjustResize">
+            <!-- Specifies an Android theme to apply to this Activity as soon as
+                 the Android process has started. This theme is visible to the user
+                 while the Flutter UI initializes. After that, this theme continues
+                 to determine the Window background behind the Flutter UI. -->
+            <meta-data
+                android:name="io.flutter.embedding.android.NormalTheme"
+                android:resource="@style/NormalTheme" />
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+
+            <meta-data
+                android:name="flutter_deeplinking_enabled"
+                android:value="true" />
+
+                <intent-filter android:autoVerify="true">
+                    <action android:name="android.intent.action.VIEW" />
+
+                    <category android:name="android.intent.category.DEFAULT" />
+                    <category android:name="android.intent.category.BROWSABLE" />
+
+                    <data android:scheme="https" />
+                    <data android:host="quiz.c4-soft.com" />
+                    <data android:pathPrefix="/login/oauth2/code" />
+                </intent-filter>
+                <intent-filter android:autoVerify="true">
+                    <action android:name="android.intent.action.VIEW" />
+
+                    <category android:name="android.intent.category.DEFAULT" />
+                    <category android:name="android.intent.category.BROWSABLE" />
+
+                    <data android:scheme="https" />
+                    <data android:host="quiz.c4-soft.com" />
+                    <data android:pathPrefix="/ui" />
+                </intent-filter>
+
+                <!--intent-filter >
+                    <action android:name="android.intent.action.VIEW" />
+    
+                    <category android:name="android.intent.category.DEFAULT" />
+                    <category android:name="android.intent.category.BROWSABLE" />
+    
+                    <data android:scheme="http" />
+                    <data android:host="192.168.1.119" android:port="8080" />
+                    <data android:pathPrefix="/login/oauth2/code" />
+                </intent-filter>
+                <intent-filter >
+                    <action android:name="android.intent.action.VIEW" />
+    
+                    <category android:name="android.intent.category.DEFAULT" />
+                    <category android:name="android.intent.category.BROWSABLE" />
+    
+                    <data android:scheme="http" />
+                    <data android:host="192.168.1.119" android:port="8080" />
+                    <data android:pathPrefix="/ui" />
+                </intent-filter>
+
+                <intent-filter >
+                    <action android:name="android.intent.action.VIEW" />
+    
+                    <category android:name="android.intent.category.DEFAULT" />
+                    <category android:name="android.intent.category.BROWSABLE" />
+    
+                    <data android:scheme="http" />
+                    <data android:host="192.168.1.182" android:port="8080" />
+                    <data android:pathPrefix="/login/oauth2/code" />
+                </intent-filter>
+                <intent-filter >
+                    <action android:name="android.intent.action.VIEW" />
+    
+                    <category android:name="android.intent.category.DEFAULT" />
+                    <category android:name="android.intent.category.BROWSABLE" />
+    
+                    <data android:scheme="http" />
+                    <data android:host="192.168.1.182" android:port="8080" />
+                    <data android:pathPrefix="/ui" />
+                </intent-filter-->
+        </activity>
+        <!-- Don't delete the meta-data below.
+             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
+    </application>
+
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="https" />
+        </intent>
+    </queries>
+</manifest>

samples/tutorials/bff/flutter/android/app/src/main/kotlin/com/c4_soft/quiz/flutter_ui/MainActivity.kt

@@ -0,0 +1,6 @@
+package com.c4_soft.quiz.flutter_ui
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity: FlutterActivity() {
+}

samples/tutorials/bff/flutter/android/app/src/main/res/drawable-v21/launch_background.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="?android:colorBackground" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>

samples/tutorials/bff/flutter/android/app/src/main/res/drawable/launch_background.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@android:color/white" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>

samples/tutorials/bff/flutter/android/app/src/main/res/values-night/styles.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             the Flutter engine draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>