2.0.1 (#5) (#6)

* chore: recreating example

* ci: add make, actions, dependabot

* chore: edit gitignore

* docs: readme & license

* style: lint

* chore: dependency update

* feat: Update models & add new

* feat: Added more options for working with proxy api. Redesigned network client.

* docs: update readme & add changelog

* chore: bump 2.0.1

Author: mit-73

.github/dependabot.yaml

@@ -0,0 +1,7 @@
+version: 2
+enable-beta-ecosystems: true
+updates:
+  - package-ecosystem: "pub"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/pull_request.yaml

@@ -0,0 +1,24 @@
+name: pull_request
+
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:   
+  format:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: 'Git Checkout'
+        uses: actions/checkout@v3
+      - name: 'Install Flutter'
+        uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable'
+      - name: 'Install Tools'
+        run: flutter pub global activate fvm; make init;
+      - name: 'Format Code'
+        run: make fix
+      - name: 'Validate Formatting'
+        run: ./tool/validate-formatting.sh

.github/workflows/push.yaml

@@ -0,0 +1,17 @@
+name: push
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: jacopocarlini/action-autotag@master
+      with:
+        GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        package_root: "/"
+        tag_prefix: "v"

.gitignore

@@ -1,5 +1,6 @@
 # Miscellaneous
 *.class
+*.lock
 *.log
 *.pyc
 *.swp
@@ -9,16 +10,18 @@
 .history
 .svn/
 .fvm/
+.melos_tool/
 
 # 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.
+# Visual Studio Code related
+.classpath
+.project
+.settings/
 .vscode/
 
 # Flutter/Dart/Pub related
@@ -30,6 +33,11 @@
 .pub-cache/
 .pub/
 build/
+flutter_*.png
+linked_*.ds
+unlinked.ds
+unlinked_spec.ds
+
 
 # Android related
 **/android/**/gradle-wrapper.jar
@@ -73,11 +81,18 @@ build/
 !**/ios/**/default.mode2v3
 !**/ios/**/default.pbxuser
 !**/ios/**/default.perspectivev3
+!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+
+# Web related
+lib/generated_plugin_registrant.dart
+
+# Symbolication related
+app.*.symbols
+
+# Obfuscation related
+app.*.map.json
+
+# Exceptions to above rules.
+!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
 
-# Mad Brains internal files
-fastlane/
-.gitlab-ci.yml
-.ruby-version
-Gemfile
-Gemfile.lock
-.templates
+example/ios/Podfile.lock

CHANGELOG.md

@@ -1,3 +1,9 @@
+## [2.0.1]
+
+* Update models & add new
+* Added more options for working with proxy api
+* Redesigned network client
+
 ## [2.0.0] 
 
 * Null safe support

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Mad Brains
+Copyright (c) 2022 Mad Brains
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -0,0 +1,44 @@
+.PHONY: version doctor
+
+PANA_SCRIPT=./tool/verify_pub_score.sh 100
+
+EXAMPLE_PATH= example
+
+FVM = fvm
+FVM_FLUTTER = $(FVM) flutter
+FVM_DART = $(FVM) dart
+
+
+init:
+	$(FVM) use 3.0.1 --force; $(FVM_DART) pub global activate pana;
+
+version:
+	$(FVM_FLUTTER) --version; $(FVM_DART) --version;
+
+doctor:
+	$(FVM_FLUTTER) doctor;
+
+ifeq (bump, $(firstword $(MAKECMDGOALS)))
+  runargs := $(wordlist 2, $(words $(MAKECMDGOALS)), $(MAKECMDGOALS))
+  $(eval $(runargs):;@true)
+endif
+bump:
+	./tool/bump-version.sh $(filter-out $@,$(MAKECMDGOALS))
+
+build_runner:
+	$(FVM_FLUTTER) pub run build_runner build --delete-conflicting-outputs;
+
+pub_get:
+	$(FVM_FLUTTER) packages get;
+
+clean:
+	$(FVM_FLUTTER) clean;
+
+fix:
+	$(FVM_FLUTTER) format .;
+
+analyze:
+	$(FVM_FLUTTER) analyze . --fatal-infos;
+
+pana:
+	$(PANA_SCRIPT);

README.md

@@ -19,7 +19,7 @@ Acquiring SDK allows you to integrate [Sberbank Internet Acquiring][acquiring] i
 Add this to your package's pubspec.yaml file:
 ```yaml
 dependencies:
-  sberbank_acquiring: 2.0.0
+  sberbank_acquiring: <lastles>
 ```
 
 ## Before usage
@@ -37,10 +37,10 @@ The SDK also allows you to configure request proxying, by default all requests g
 To configure the operation mode, set the following parameters:
 ```dart
 final SberbankAcquiring acquiring = SberbankAcquiring(
-  SberbankAcquiringConfig(
+  SberbankAcquiringConfig.credential(
     userName: userName,
     password: password,
-    debug: false,
+    isDebugMode: false,
   ),
 );
 ```
@@ -50,6 +50,7 @@ If you want to use `token`, use the following constructor:
 final SberbankAcquiring acquiring = SberbankAcquiring(
   SberbankAcquiringConfig.token(
     token: token,
+    isDebugMode: false,
   ),
 );
 ```
@@ -58,7 +59,13 @@ If you want to use a `proxy`, use the following constructor:
 ```dart
 final SberbankAcquiring acquiring = SberbankAcquiring(
   SberbankAcquiringConfig.proxy(
-    proxyUrl: 'https://server.com/',
+    proxyDomain: 'server.com',
+    proxyPath: 'api/v1/',
+    globalHeaders: <String, String>{'auth': 'test'},
+    mapping: (AcquiringRequest request, bool isDebugMode) {
+      if(request is RegisterRequest) return ProxyMapping(path: '/register');
+      return;
+    }
   ),
 );
 ```
@@ -68,6 +75,6 @@ final SberbankAcquiring acquiring = SberbankAcquiring(
 The [Example][example] is in the corresponding folder
 
 
-[documentation]: https://securepayments.sberbank.ru/wiki/doku.php/integration:paymentpage:paymentpage_design
+[documentation]: https://securepayments.sberbank.ru/wiki/doku.php/integration:api:rest:start
 [acquiring]: https://securepayments.sberbank.ru/wiki/doku.php/main_page
 [example]: https://github.com/MadBrains/Sberbank-Acquiring-SDK-Flutter/tree/main/example/

README.ru.md

@@ -17,7 +17,7 @@ Acquiring SDK позволяет интегрировать [Интернет-Э
 Для подключения добавьте в файл pubspec.yaml зависимости:
 ```yaml
 dependencies:
-  sberbank_acquiring: 2.0.0
+  sberbank_acquiring: <lastles>
 ```
 
 ## Подготовка к работе
@@ -35,10 +35,10 @@ SDK позволяет настроить режим работы (debug/prod),
 Чтобы настроить режим работы, установите параметры:
 ```dart
 final SberbankAcquiring acquiring = SberbankAcquiring(
-  SberbankAcquiringConfig(
+  SberbankAcquiringConfig.credential(
     userName: userName,
     password: password,
-    debug: false,
+    isDebugMode: false,
   ),
 );
 ```
@@ -48,6 +48,7 @@ final SberbankAcquiring acquiring = SberbankAcquiring(
 final SberbankAcquiring acquiring = SberbankAcquiring(
   SberbankAcquiringConfig.token(
     token: token,
+    isDebugMode: false,
   ),
 );
 ```
@@ -56,7 +57,13 @@ final SberbankAcquiring acquiring = SberbankAcquiring(
 ```dart
 final SberbankAcquiring acquiring = SberbankAcquiring(
   SberbankAcquiringConfig.proxy(
-    proxyUrl: 'https://server.com/',
+    proxyDomain: 'server.com',
+    proxyPath: 'api/v1/',
+    globalHeaders: <String, String>{'auth': 'test'},
+    mapping: (AcquiringRequest request, bool isDebugMode) {
+      if(request is RegisterRequest) return ProxyMapping(path: '/register');
+      return;
+    }
   ),
 );
 ```
@@ -66,6 +73,6 @@ final SberbankAcquiring acquiring = SberbankAcquiring(
 Пример работы SDK доступен в [Example][example]
 
 
-[documentation]: https://securepayments.sberbank.ru/wiki/doku.php/integration:paymentpage:paymentpage_design
+[documentation]: https://securepayments.sberbank.ru/wiki/doku.php/integration:api:rest:start
 [acquiring]: https://securepayments.sberbank.ru/wiki/doku.php/main_page
 [example]: https://github.com/MadBrains/Sberbank-Acquiring-SDK-Flutter/tree/main/example/

analysis_options.yaml

@@ -1,6 +1,10 @@
 analyzer:
   exclude:
     - "**/*.g.dart"
+  language:
+    strict-casts: true
+    strict-inference: true
+    strict-raw-types: true
   strong-mode:
     implicit-casts: false
     implicit-dynamic: false
@@ -18,6 +22,7 @@ linter:
   rules:
     - public_member_api_docs
     - always_declare_return_types
+    - always_require_non_null_named_parameters
     - annotate_overrides
     - avoid_bool_literals_in_conditional_expressions
     - avoid_catching_errors
@@ -137,3 +142,4 @@ linter:
     - sort_constructors_first
     - prefer_single_quotes
     - always_specify_types
+    - require_trailing_commas