Preston_PLB
/
Capstone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

B: Make callback URIs follow config

This commit is contained in:
Preston Baxter 2023-11-21 18:23:08 -06:00
parent 8b8320eeb1
commit eadfc6b56e
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/controllers/pco.go
View File

@ -2,6 +2,7 @@ package controllers
import (
"encoding/json"
"fmt"
"io"
"net/http"
"net/url"
@ -13,7 +14,7 @@ import (
"github.com/gin-gonic/gin"
)
const PCO_REDIRECT_URI = "https://capstone.preston-baxter.com:8080/vendor/pco/callback"
const PCO_REDIRECT_URI = "https://%s/vendor/pco/callback"
func InitiatePCOOuath(c *gin.Context) {
conf := config.Config()
@ -27,7 +28,7 @@ func InitiatePCOOuath(c *gin.Context) {
q := init_url.Query()
q.Add("client_id", vendorConfig.ClientId)
q.Add("redirect_uri", PCO_REDIRECT_URI)
q.Add("redirect_uri", fmt.Sprintf(PCO_REDIRECT_URI, conf.AppSettings.FrontendServiceUrl))
q.Add("response_type", "code")
q.Add("scope", vendorConfig.Scope())
init_url.RawQuery = q.Encode()
@ -67,7 +68,7 @@ func RecievePCOOuath(c *gin.Context) {
q.Add("code", code)
q.Add("client_id", vendorConfig.ClientId)
q.Add("client_secret", vendorConfig.ClientSecret)
q.Add("redirect_uri", PCO_REDIRECT_URI)
q.Add("redirect_uri", fmt.Sprintf(PCO_REDIRECT_URI, conf.AppSettings.FrontendServiceUrl))
q.Add("grant_type", "authorization_code")
req, err := http.NewRequest("POST", token_url.String(), strings.NewReader(q.Encode()))

7
ui/controllers/youtube.go
View File

@ -2,6 +2,7 @@ package controllers
import (
"encoding/json"
"fmt"
"io"
"net/http"
"net/url"
@ -13,7 +14,7 @@ import (
"github.com/gin-gonic/gin"
)
const YOUTUBE_REDIRECT_URI = "https://capstone.preston-baxter.com:8080/vendor/youtube/callback"
const YOUTUBE_REDIRECT_URI = "https://%s/vendor/youtube/callback"
func InitiateYoutubeOuath(c *gin.Context) {
conf := config.Config()
@ -28,7 +29,7 @@ func InitiateYoutubeOuath(c *gin.Context) {
q := init_url.Query()
//https://developers.google.com/youtube/v3/guides/auth/server-side-web-apps#httprest_1
q.Add("client_id", vendorConfig.ClientId)
q.Add("redirect_uri", YOUTUBE_REDIRECT_URI)
q.Add("redirect_uri", fmt.Sprintf(YOUTUBE_REDIRECT_URI, conf.AppSettings.FrontendServiceUrl))
q.Add("response_type", "code")
q.Add("scope", vendorConfig.Scope())
q.Add("access_type", "offline")
@ -79,7 +80,7 @@ func ReceiveYoutubeOauth(c *gin.Context) {
q.Add("code", code)
q.Add("client_id", vendorConfig.ClientId)
q.Add("client_secret", vendorConfig.ClientSecret)
q.Add("redirect_uri", YOUTUBE_REDIRECT_URI)
q.Add("redirect_uri", fmt.Sprintf(YOUTUBE_REDIRECT_URI, conf.AppSettings.FrontendServiceUrl))
q.Add("grant_type", "authorization_code")
req, err := http.NewRequest("POST", token_url.String(), strings.NewReader(q.Encode()))

4
versions.json
View File

@ -1,4 +1,4 @@
{
"webhook_version": "0.0.19",
"frontend_version": "0.0.19"
"webhook_version": "0.0.20",
"frontend_version": "0.0.20"
}