Skip to content

Commit

Permalink
fix: added oauth helpers to all sdks (#324)
Browse files Browse the repository at this point in the history
  • Loading branch information
valmoz authored May 11, 2022
1 parent 81cd05e commit c986399
Show file tree
Hide file tree
Showing 57 changed files with 3,396 additions and 44 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/check-custom-templates.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,16 @@ jobs:
- id: retrieve-templates
name: Retrieve templates
run: |
openapi-generator-cli author template -g ${{ matrix.sdk }} -o templates-temp/${{ matrix.sdk }}
for entry in "templates-temp/${{ matrix.sdk }}"/*; do
FILE="${entry/templates-temp/templates}"
openapi-generator-cli author template -g ${{ matrix.sdk }} -o templates-temp/openapi-generator/${{ matrix.sdk }}
for entry in "templates-temp/openapi-generator/${{ matrix.sdk }}"/*; do
FILE="${entry/templates-temp/openapi-generator/templates}"
if test -f "$FILE"; then
echo "Moving $entry to $FILE"
mv $entry $FILE
fi
done
rm -rf templates-temp/${{ matrix.sdk }}
cd templates/${{ matrix.sdk }}
rm -rf templates-temp/openapi-generator/${{ matrix.sdk }}
cd templates/openapi-generator/${{ matrix.sdk }}
git add .
Expand Down
24 changes: 23 additions & 1 deletion .github/workflows/generate-csharp-netcore.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@ jobs:
distribution: 'adopt'
java-version: '8'

- id: setup-dotnet
name: Setup dotnet
uses: actions/setup-dotnet@v2
with:
dotnet-version: '2.1.x'

- id: setup-libraries
name: Install libraries
run: |
Expand Down Expand Up @@ -90,7 +96,9 @@ jobs:
name: Move custom files to backup
run: |
mkdir -p ./backup/csharp-netcore/src/It.FattureInCloud.Sdk/Filter
mkdir -p ./backup/csharp-netcore/src/It.FattureInCloud.Sdk/Oauth2
mv ./generated/csharp-netcore/src/It.FattureInCloud.Sdk/Filter ./backup/csharp-netcore/src/It.FattureInCloud.Sdk/
mv ./generated/csharp-netcore/src/It.FattureInCloud.Sdk/Oauth2 ./backup/csharp-netcore/src/It.FattureInCloud.Sdk/
- id: delete-old-files
name: Delete old files
Expand All @@ -116,12 +124,26 @@ jobs:
USER_AGENT="$APP_NAME/${{ env.sdk_version }}/csharp-SDK"
openapi-generator-cli generate -i ./openapi.yaml -g csharp-netcore -o generated/csharp-netcore/ -t ./templates/csharp-netcore --additional-properties=useDateTimeOffset=true,conditionalSerialization=true,packageName=${PACKAGE_NAME},packageAuthors=${PACKAGE_AUTHORS},packageCompany=${PACKAGE_COMPANY},packageTitle=${PACKAGE_TITLE},packageVersion=${SDK_VERSION},targetFramework=${TARGET_FRAMEWORK},testTargetFramework=${TEST_TARGET_FRAMEWORK},multiTarget=true,licenseId=MIT --git-repo-id=${GIT_REPO_ID} --git-user-id=${GIT_USER_ID} --release-note=${RELEASE_NOTE} --http-user-agent=${USER_AGENT}
openapi-generator-cli generate -i ./openapi.yaml -g csharp-netcore -o generated/csharp-netcore/ -t ./templates/openapi-generator/csharp-netcore --additional-properties=useDateTimeOffset=true,conditionalSerialization=true,packageName=${PACKAGE_NAME},packageAuthors=${PACKAGE_AUTHORS},packageCompany=${PACKAGE_COMPANY},packageTitle=${PACKAGE_TITLE},packageVersion=${SDK_VERSION},targetFramework=${TARGET_FRAMEWORK},testTargetFramework=${TEST_TARGET_FRAMEWORK},multiTarget=true,licenseId=MIT --git-repo-id=${GIT_REPO_ID} --git-user-id=${GIT_USER_ID} --release-note=${RELEASE_NOTE} --http-user-agent=${USER_AGENT}
- id: move-custom-files-to-repo
name: Move custom files to repo
run: |
mv ./backup/csharp-netcore/src/It.FattureInCloud.Sdk/Filter ./generated/csharp-netcore/src/It.FattureInCloud.Sdk/
mv ./backup/csharp-netcore/src/It.FattureInCloud.Sdk/Oauth2 ./generated/csharp-netcore/src/It.FattureInCloud.Sdk/
- id: generate-additional-files
name: Generate Additional files
run: |
node ./scripts/generate-scopes.js csharp-netcore
- id: lint-code
name: Lint Code Base
run: |
cd ./generated/csharp-netcore
dotnet new tool-manifest
dotnet tool install JetBrains.ReSharper.GlobalTools
dotnet jb cleanupcode It.FattureInCloud.Sdk.sln
- id: create-pr
name: Create Pull Request
Expand Down
20 changes: 19 additions & 1 deletion .github/workflows/generate-java.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,13 @@ jobs:
mkdir -p ./backup/java/src/main/java/it/fattureincloud/sdk/
mv ./generated/java/src/main/java/it/fattureincloud/sdk/filter ./backup/java/src/main/java/it/fattureincloud/sdk/filter
mkdir -p ./backup/java/src/main/java/it/fattureincloud/sdk/auth/
mv ./generated/java/src/main/java/it/fattureincloud/sdk/auth/OAuth2AuthorizationCodeError.java ./backup/java/src/main/java/it/fattureincloud/sdk/auth/OAuth2AuthorizationCodeError.java
mv ./generated/java/src/main/java/it/fattureincloud/sdk/auth/OAuth2AuthorizationCodeManager.java ./backup/java/src/main/java/it/fattureincloud/sdk/auth/OAuth2AuthorizationCodeManager.java
mv ./generated/java/src/main/java/it/fattureincloud/sdk/auth/OAuth2AuthorizationCodeParams.java ./backup/java/src/main/java/it/fattureincloud/sdk/auth/OAuth2AuthorizationCodeParams.java
mv ./generated/java/src/main/java/it/fattureincloud/sdk/auth/OAuth2AuthorizationCodeResponse.java ./backup/java/src/main/java/it/fattureincloud/sdk/auth/OAuth2AuthorizationCodeResponse.java
mv ./generated/java/src/main/java/it/fattureincloud/sdk/auth/Scope.java ./backup/java/src/main/java/it/fattureincloud/sdk/auth/Scope.java
- id: delete-old-files
name: Delete old files
run: |
Expand Down Expand Up @@ -141,13 +148,24 @@ jobs:
USER_AGENT="$APP_NAME/${{ env.sdk_version }}/Java-SDK"
openapi-generator-cli generate -i ./openapi.yaml -g java -o ./generated/java/ -t ./templates/java --git-repo-id=${GIT_REPO_ID} --git-user-id=${GIT_USER_ID} --release-note=${RELEASE_NOTE} --http-user-agent=${USER_AGENT} --additional-properties=$ADDITIONAL_PROPERTIES
openapi-generator-cli generate -i ./openapi.yaml -g java -o ./generated/java/ -t ./templates/openapi-generator/java --git-repo-id=${GIT_REPO_ID} --git-user-id=${GIT_USER_ID} --release-note=${RELEASE_NOTE} --http-user-agent=${USER_AGENT} --additional-properties=$ADDITIONAL_PROPERTIES
- id: move-custom-files-to-repo
name: Move custom files to repo
run: |
mv ./backup/java/src/main/java/it/fattureincloud/sdk/filter ./generated/java/src/main/java/it/fattureincloud/sdk/filter
mv ./backup/java/src/main/java/it/fattureincloud/sdk/auth/OAuth2AuthorizationCodeError.java ./generated/java/src/main/java/it/fattureincloud/sdk/auth/OAuth2AuthorizationCodeError.java
mv ./backup/java/src/main/java/it/fattureincloud/sdk/auth/OAuth2AuthorizationCodeManager.java ./generated/java/src/main/java/it/fattureincloud/sdk/auth/OAuth2AuthorizationCodeManager.java
mv ./backup/java/src/main/java/it/fattureincloud/sdk/auth/OAuth2AuthorizationCodeParams.java ./generated/java/src/main/java/it/fattureincloud/sdk/auth/OAuth2AuthorizationCodeParams.java
mv ./backup/java/src/main/java/it/fattureincloud/sdk/auth/OAuth2AuthorizationCodeResponse.java ./generated/java/src/main/java/it/fattureincloud/sdk/auth/OAuth2AuthorizationCodeResponse.java
mv ./backup/java/src/main/java/it/fattureincloud/sdk/auth/Scope.java ./generated/java/src/main/java/it/fattureincloud/sdk/auth/Scope.java
- id: generate-additional-files
name: Generate Additional files
run: |
node ./scripts/generate-scopes.js java
- id: download-linter
name: Download Java Linter
run: |
Expand Down
17 changes: 16 additions & 1 deletion .github/workflows/generate-javascript.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,9 @@ jobs:
name: Move custom files to backup
run: |
mkdir -p ./backup/javascript/src/filter
mkdir -p ./backup/javascript/src/oauth2
mv ./generated/javascript/src/filter ./backup/javascript/src/
mv ./generated/javascript/src/oauth2 ./backup/javascript/src/
- id: delete-old-files
name: Delete old files
Expand All @@ -114,12 +116,25 @@ jobs:
USER_AGENT="$APP_NAME/${{ env.sdk_version }}/JavaScript-SDK"
openapi-generator-cli generate -i ./openapi.yaml -g javascript -o ./generated/javascript/ -t ./templates/javascript --git-repo-id=${GIT_REPO_ID} --git-user-id=${GIT_USER_ID} --release-note=${RELEASE_NOTE} --http-user-agent=${USER_AGENT} --additional-properties=projectVersion=$SDK_VERSION,projectName=$PROJECT_NAME,projectDescription=$PROJECT_DESCRIPTION,moduleName=$MODULE_NAME,usePromises=true
openapi-generator-cli generate -i ./openapi.yaml -g javascript -o ./generated/javascript/ -t ./templates/openapi-generator/javascript --git-repo-id=${GIT_REPO_ID} --git-user-id=${GIT_USER_ID} --release-note=${RELEASE_NOTE} --http-user-agent=${USER_AGENT} --additional-properties=projectVersion=$SDK_VERSION,projectName=$PROJECT_NAME,projectDescription=$PROJECT_DESCRIPTION,moduleName=$MODULE_NAME,usePromises=true
- id: move-custom-files-to-repo
name: Move custom files to repo
run: |
mv ./backup/javascript/src/filter ./generated/javascript/src/
mv ./backup/javascript/src/oauth2 ./generated/javascript/oauth2/
- id: generate-additional-files
name: Generate Additional files
run: |
node ./scripts/generate-scopes.js javascript
- id: lint-code
name: Lint Code Base
run: |
cd ./generated/javascript/fattureincloud-js-sdk
npm install
npx eslint --fix ./
- id: create-pr
name: Create Pull Request
Expand Down
30 changes: 29 additions & 1 deletion .github/workflows/generate-php.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,19 @@ jobs:
distribution: 'adopt'
java-version: '8'

- id: setup-php
name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 7.4

- id: setup-composer
name: Setup Composer
run: |
php -v
wget -O composer-setup.php https://getcomposer.org/installer
sudo php composer-setup.php --install-dir=/usr/local/bin --filename=composer
- id: setup-libraries
name: Install libraries
run: |
Expand Down Expand Up @@ -90,7 +103,9 @@ jobs:
name: Move custom files to backup
run: |
mkdir -p ./backup/php/lib/Filter
mkdir -p ./backup/php/lib/OAuth2
mv ./generated/php/lib/Filter ./backup/php/lib/
mv ./generated/php/lib/OAuth2 ./backup/php/lib/
- id: delete-old-files
name: Delete old files
Expand All @@ -113,14 +128,27 @@ jobs:
USER_AGENT="$INVOKER_PACKAGE/${{ env.sdk_version }}/PHP-SDK"
openapi-generator-cli generate -i ./openapi.yaml -g php -o ./generated/php/ -t ./templates/php --package-name=${PACKAGE_NAME} --invoker-package=${INVOKER_PACKAGE} --git-repo-id=${GIT_REPO_ID} --git-user-id=${GIT_USER_ID} --release-note=${RELEASE_NOTE} --http-user-agent=${USER_AGENT} --additional-properties=composerPackageName=${COMPOSER_PACKAGE_NAME}
openapi-generator-cli generate -i ./openapi.yaml -g php -o ./generated/php/ -t ./templates/openapi-generator/php --package-name=${PACKAGE_NAME} --invoker-package=${INVOKER_PACKAGE} --git-repo-id=${GIT_REPO_ID} --git-user-id=${GIT_USER_ID} --release-note=${RELEASE_NOTE} --http-user-agent=${USER_AGENT} --additional-properties=composerPackageName=${COMPOSER_PACKAGE_NAME}
node ./scripts/postprocess-php.js clean './generated/php/lib/' './generated/php/test/'
- id: move-custom-files-to-repo
name: Move custom files to repo
run: |
mv ./backup/php/lib/Filter ./generated/php/lib/Filter
mv ./backup/php/lib/OAuth2 ./generated/php/lib/OAuth2
- id: generate-additional-files
name: Generate Additional files
run: |
node ./scripts/generate-scopes.js php
- id: lint-code
name: Lint Code Base
run: |
cd ./generated/php/
composer install
./vendor/bin/php-cs-fixer fix ./ --allow-risky=yes
- id: create-pr
name: Create Pull Request
Expand Down
22 changes: 21 additions & 1 deletion .github/workflows/generate-python.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@ jobs:
distribution: 'adopt'
java-version: '8'

- id: setup-python
name: Setup Python
uses: actions/setup-python@v2
with:
python-version: '3.10'

- id: setup-libraries
name: Install libraries
run: |
Expand Down Expand Up @@ -90,7 +96,9 @@ jobs:
name: Move custom files to backup
run: |
mkdir -p ./backup/python/fattureincloud_python_sdk/filter
mkdir -p ./backup/python/fattureincloud_python_sdk/oauth2
mv ./generated/python/fattureincloud_python_sdk/filter ./backup/python/fattureincloud_python_sdk/
mv ./generated/python/fattureincloud_python_sdk/oauth2 ./backup/python/fattureincloud_python_sdk/
- id: delete-old-files
name: Delete old files
Expand All @@ -115,12 +123,24 @@ jobs:
USER_AGENT="$APP_NAME/${{ env.sdk_version }}/Python-SDK"
openapi-generator-cli generate -i ./openapi.yaml -g python -o ./generated/python/ -t ./templates/python --git-repo-id=${GIT_REPO_ID} --git-user-id=${GIT_USER_ID} --release-note=${RELEASE_NOTE} --http-user-agent=${USER_AGENT} --additional-properties=packageVersion=${SDK_VERSION},packageName=${PACKAGE_NAME},packageUrl=${PACKAGE_URL},projectName=${PROJECT_NAME},infoName=${INFO_NAME}
openapi-generator-cli generate -i ./openapi.yaml -g python -o ./generated/python/ -t ./templates/openapi-generator/python --git-repo-id=${GIT_REPO_ID} --git-user-id=${GIT_USER_ID} --release-note=${RELEASE_NOTE} --http-user-agent=${USER_AGENT} --additional-properties=packageVersion=${SDK_VERSION},packageName=${PACKAGE_NAME},packageUrl=${PACKAGE_URL},projectName=${PROJECT_NAME},infoName=${INFO_NAME}
- id: move-custom-files-to-repo
name: Move custom files to repo
run: |
mv ./backup/python/fattureincloud_python_sdk/filter ./generated/python/fattureincloud_python_sdk/
mv ./backup/python/fattureincloud_python_sdk/oauth2 ./generated/python/fattureincloud_python_sdk/
- id: generate-additional-files
name: Generate Additional files
run: |
node ./scripts/generate-scopes.js python
- id: format
name: Format files
run: |
pip install black
black ./generated/python/
- id: create-pr
name: Create Pull Request
Expand Down
22 changes: 21 additions & 1 deletion .github/workflows/generate-ruby.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@ jobs:
distribution: 'adopt'
java-version: '8'

- id: setup-ruby
name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.1.0

- id: setup-libraries
name: Install libraries
run: |
Expand Down Expand Up @@ -90,7 +96,9 @@ jobs:
name: Move custom files to backup
run: |
mkdir -p ./backup/ruby/lib/fattureincloud_ruby_sdk/filter
mkdir -p ./backup/ruby/lib/fattureincloud_ruby_sdk/oauth2
mv ./generated/ruby/lib/fattureincloud_ruby_sdk/filter ./backup/ruby/lib/fattureincloud_ruby_sdk/
mv ./generated/ruby/lib/fattureincloud_ruby_sdk/oauth2 ./backup/ruby/lib/fattureincloud_ruby_sdk/
- id: delete-old-files
name: Delete old files
Expand Down Expand Up @@ -118,12 +126,24 @@ jobs:
USER_AGENT="$APP_NAME/${{ env.sdk_version }}/Ruby-SDK"
openapi-generator-cli generate -i ./openapi.yaml -g ruby -o ./generated/ruby/ -t ./templates/ruby --git-repo-id=${GIT_REPO_ID} --git-user-id=${GIT_USER_ID} --release-note=${RELEASE_NOTE} --http-user-agent=${USER_AGENT} --additional-properties=gemVersion=${SDK_VERSION},gemAuthor=${GEM_AUTHOR},gemAuthorEmail=${GEM_AUTHOR_EMAIL},gemDescription=${GEM_DESCRIPTION},gemSummary=${GEM_DESCRIPTION},gemHomepage=${GEM_HOMEPAGE},gemLicense=${GEM_LICENSE},gemName=${GEM_NAME},gemSummary=${GEM_SUMMARY},moduleName=${MODULE_NAME}
openapi-generator-cli generate -i ./openapi.yaml -g ruby -o ./generated/ruby/ -t ./templates/openapi-generator/ruby --git-repo-id=${GIT_REPO_ID} --git-user-id=${GIT_USER_ID} --release-note=${RELEASE_NOTE} --http-user-agent=${USER_AGENT} --additional-properties=gemVersion=${SDK_VERSION},gemAuthor=${GEM_AUTHOR},gemAuthorEmail=${GEM_AUTHOR_EMAIL},gemDescription=${GEM_DESCRIPTION},gemSummary=${GEM_DESCRIPTION},gemHomepage=${GEM_HOMEPAGE},gemLicense=${GEM_LICENSE},gemName=${GEM_NAME},gemSummary=${GEM_SUMMARY},moduleName=${MODULE_NAME}
- id: move-custom-files-to-repo
name: Move custom files to repo
run: |
mv ./backup/ruby/lib/fattureincloud_ruby_sdk/filter ./generated/ruby/lib/fattureincloud_ruby_sdk/
mv ./backup/ruby/lib/fattureincloud_ruby_sdk/oauth2 ./generated/ruby/lib/fattureincloud_ruby_sdk/
- id: generate-additional-files
name: Generate Additional files
run: |
node ./scripts/generate-scopes.js ruby
- id: lint-code
name: Lint Code Base
run: |
cd ./generated/ruby/fattureincloud_ruby_sdk
bundle exec rubocop -a
- id: create-pr
name: Create Pull Request
Expand Down
19 changes: 17 additions & 2 deletions .github/workflows/generate-typescript-axios.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ jobs:
name: Move custom files to backup
run: |
mkdir -p ./backup/typescript-axios/src/filter
mkdir -p ./backup/typescript-axios/src/oauth2
mv ./generated/typescript-axios/src/filter ./backup/typescript-axios/src/
mv ./generated/typescript-axios/src/oauth2 ./backup/typescript-axios/src/
- id: delete-old-files
name: Delete old files
Expand All @@ -111,11 +113,11 @@ jobs:
USER_AGENT="$APP_NAME/${{ env.sdk_version }}/TypeScript-SDK"
openapi-generator-cli generate -i ./openapi.yaml -g typescript-axios -o generated/typescript-axios/ -t ./templates/typescript-axios --additional-properties=npmName=${PACKAGE_NAME},npmVersion=${SDK_VERSION},supportsES6=true,withNodeImports=true,withSeparateModelsAndApi=true,apiPackage=src/api,modelPackage=src/models,withInterfaces=true --git-repo-id=${GIT_REPO_ID} --git-user-id=${GIT_USER_ID} --release-note=${RELEASE_NOTE} --http-user-agent=${USER_AGENT}
openapi-generator-cli generate -i ./openapi.yaml -g typescript-axios -o generated/typescript-axios/ -t ./templates/openapi-generator/typescript-axios --additional-properties=npmName=${PACKAGE_NAME},npmVersion=${SDK_VERSION},supportsES6=true,withNodeImports=true,withSeparateModelsAndApi=true,apiPackage=src/api,modelPackage=src/models,withInterfaces=true --git-repo-id=${GIT_REPO_ID} --git-user-id=${GIT_USER_ID} --release-note=${RELEASE_NOTE} --http-user-agent=${USER_AGENT}
- id: generate-typescript-axios-docs
name: Generate Docs
run: openapi-generator-cli generate -i ./openapi.yaml -g javascript -o generated/typescript-axios-docs/ -t ./templates/typescript-axios-docs
run: openapi-generator-cli generate -i ./openapi.yaml -g javascript -o generated/typescript-axios-docs/ -t ./templates/openapi-generator/typescript-axios-docs

- id: move-docs
name: Moving Docs To The Right Folder
Expand All @@ -125,6 +127,19 @@ jobs:
name: Move custom files to repo
run: |
mv ./backup/typescript-axios/src/filter ./generated/typescript-axios/src/
mv ./backup/typescript-axios/src/oauth2 ./generated/typescript-axios/src/
- id: generate-additional-files
name: Generate Additional files
run: |
node ./scripts/generate-scopes.js typescript-axios
- id: lint-code
name: Lint Code Base
run: |
cd ./generated/typescript-axios/fattureincloud-ts-sdk
npm install
npx eslint --fix ./
- id: create-pr
name: Create Pull Request
Expand Down
1 change: 1 addition & 0 deletions openapi-enriched.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11129,6 +11129,7 @@ components:
securitySchemes:
OAuth2AuthenticationCodeFlow:
type: oauth2
x-receive-token-in: request-body
flows:
authorizationCode:
tokenUrl: https://api-v2.fattureincloud.it/oauth/token
Expand Down
Loading

0 comments on commit c986399

Please sign in to comment.