Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Use Swagger native OIDC/OAuth2 for handling user login [DEV-2921] #315

Closed
wants to merge 17 commits into from
Closed

feat: Use Swagger native OIDC/OAuth2 for handling user login [DEV-2921] #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
cecb016
Pushed last progress.
abdulla-ashurov Jul 19, 2023
ba24395
Add OAuthRedirectUrl option to swagger.
abdulla-ashurov Jul 24, 2023
298fb51
Add authorization flow with PKCE.
abdulla-ashurov Jul 24, 2023
25c80f1
Change OAuth2.0 authorizationCode to implicit flow
abdulla-ashurov Aug 2, 2023
59770e6
Merge branch 'develop' into oauth-swagger
abdulla-ashurov Aug 2, 2023
5e154eb
Merge branch 'develop' into oauth-swagger
abdulla-ashurov Aug 2, 2023
7c5dd31
Merge remote-tracking branch 'origin' into oauth-swagger
abdulla-ashurov Aug 2, 2023
b919bfa
Update package-lock.json.
abdulla-ashurov Aug 2, 2023
f4a3093
Merge branch 'develop' into oauth-swagger
ankurdotb Aug 2, 2023
94860e3
Merge branch 'develop' into oauth-swagger
ankurdotb Aug 2, 2023
afa37d9
Fix helmet
ankurdotb Aug 2, 2023
0205659
Update package-lock.json
ankurdotb Aug 2, 2023
b0e3341
Oauth config
ankurdotb Aug 2, 2023
ebf397f
Remove security statements
ankurdotb Aug 2, 2023
3fc252c
Update example.env
ankurdotb Aug 2, 2023
6756b50
Update swagger.json
ankurdotb Aug 2, 2023
b226a6e
Remove dispatch guard
ankurdotb Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/dispatch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ jobs:
call-staging:
name: "Staging"
needs: [ call-lint, call-build ]
if: ${{ github.ref_name == 'develop' }}
uses: ./.github/workflows/staging.yml
secrets: inherit

Expand Down
25 changes: 11 additions & 14 deletions example.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# General
MAINNET_RPC_URL="https://rpc.cheqd.net:443"
TESTNET_RPC_URL="https://rpc.cheqd.network:443"
RESOLVER_URL="https://resolver.cheqd.net/1.0/identifiers/"
Expand All @@ -9,27 +10,23 @@ ENABLE_EXTERNAL_DB="false"
EXTERNAL_DB_CONNECTION_URL="postgres://<user>:<password>@<host>:<port>/<database>"
EXTERNAL_DB_ENCRYPTION_KEY="<db-encryption-key>"
EXTERNAL_DB_CERT="<path/to/extenal-db-cert>"

# OpenId
LOGTO_DEFAULT_RESOURCE_URL='http://localhost:8787'
DEFAULT_CUSTOMER_ID="default customer id"

# LogTo
LOGTO_ENDPOINT='http://localhost:3001'
LOGTO_APP_ID='ldfsr...rq432'
LOGTO_APP_SECRET='sdf...sdf'
ENABLE_AUTHENTICATION="false"
LOGTO_ENDPOINT="http://localhost:3001"
LOGTO_APP_ID="ldfsr...rq432"
LOGTO_APP_SECRET="sdf...sdf"
LOGTO_M2M_APP_ID="aaaa...ddddd"
LOGTO_M2M_APP_SECRET="aaaa...ddddd"
LOGTO_MANAGEMENT_API="https://default.logto.app/api"
LOGTO_DEFAULT_RESOURCE_URL="http://localhost:8787"
LOGTO_DEFAULT_ROLE_ID="sdf...sdf"
LOGTO_WEBHOOK_SECRET="sdf...sdf"
COOKIE_SECRET='sdf...sdf'

# Authentication
ENABLE_AUTHENTICATION="false"
DEFAULT_CUSTOMER_ID="default customer id"
COOKIE_SECRET="sdf...sdf"

# verida
ENABLE_VERIDA_CONNECTOR="string,default:false"
# Verida
ENABLE_VERIDA_CONNECTOR="false"
VERIDA_PRIVATE_KEY="akjvncanv....avoa"
POLYGON_PRIVATE_KEY="alnvca...dvncioa"
VERIDA_NETWORK="testnet"
Expand All @@ -38,4 +35,4 @@ VERIDA_NETWORK="testnet"
ISSUER_PRIVATE_KEY_HEX="akjvncanv....avoa"
ISSUER_PUBLIC_KEY_HEX="alnvca...dvncioa"
ISSUER_DID="did:cheqd:testnet:afcnoa...adv"
DEFAULT_FEE_PAYER_MNEMONIC="sketch mountain ....."
DEFAULT_FEE_PAYER_MNEMONIC="sketch mountain ....."
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 10 additions & 3 deletions src/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,19 @@ dotenv.config()
// Define Swagger file
import swaggerDocument from './static/swagger.json' assert { type: "json" }

let swaggerOptions = {}
let swaggerOptions = {};

if (process.env.ENABLE_AUTHENTICATION === 'true') {
swaggerOptions = {
customJs: '/static/custom-button.js',
oauth2RedirectUrl: process.env.APPLICATION_BASE_URL + '/logto/sign-in',
persistAuthorization: true,
oauth: {
clientId: process.env.LOGTO_APP_ID,
clientSecret: process.env.LOGTO_APP_SECRET,
scopes: "openid offline_access profile email custom_data identities",
}
}
}
};

class App {
public express: express.Application
Expand Down
3 changes: 2 additions & 1 deletion src/types/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ const {
LOGTO_ENDPOINT,
LOGTO_APP_ID,
LOGTO_APP_SECRET,
APPLICATION_BASE_URL} = process.env
APPLICATION_BASE_URL
} = process.env


export const HEADERS = {
Expand Down