fix: Oauth callback url is fixed to host+/api/oidc/callback (#314)

README.md

@@ -94,8 +94,8 @@
     - 对于`OIDC`, `Issuer`是必须的。`Scopes`是可选的，默认为 `openid,profile,email`. 确保可以获取 `sub`,`email` 和`preferred_username`
     - `github oauth app`在`Settings`->`Developer settings`->`OAuth Apps`->`New OAuth App`
       中创建,地址 [https://github.com/settings/developers](https://github.com/settings/developers)
-    - `Authorization callback URL`填写`http://<your server[:port]>/api/oauth/callback`
-      ，比如`http://127.0.0.1:21114/api/oauth/callback`
+    - `Authorization callback URL`填写`http://<your server[:port]>/api/oidc/callback`
+      ，比如`http://127.0.0.1:21114/api/oidc/callback`
 7. 登录日志
 8. 链接日志
 9. 文件传输日志

README_EN.md

@@ -94,8 +94,8 @@ displaying data.Frontend code is available at [rustdesk-api-web](https://github.
     - For `OIDC`, you must set the `Issuer`. And `Scopes` is optional which default is `openid,email,profile`, please make sure this `Oauth App` can access `sub`, `email` and `preferred_username`
     - Create a `GitHub OAuth App`
       at `Settings` -> `Developer settings` -> `OAuth Apps` -> `New OAuth App` [here](https://github.com/settings/developers).
-    - Set the `Authorization callback URL` to `http://<your server[:port]>/api/oauth/callback`,
-      e.g., `http://127.0.0.1:21114/api/oauth/callback`.
+    - Set the `Authorization callback URL` to `http://<your server[:port]>/api/oidc/callback`,
+      e.g., `http://127.0.0.1:21114/api/oidc/callback`.
    
 7. Login logs
 8. Connection logs

docs/api/api_docs.go

@@ -954,9 +954,9 @@ const docTemplateapi = `{
                 }
             }
         },
-        "/oauth/callback": {
-            "get": {
-                "description": "OauthCallback",
+        "/oidc/auth": {
+            "post": {
+                "description": "OidcAuth",
                 "consumes": [
                     "application/json"
                 ],
@@ -966,7 +966,7 @@ const docTemplateapi = `{
                 "tags": [
                     "Oauth"
                 ],
-                "summary": "OauthCallback",
+                "summary": "OidcAuth",
                 "responses": {
                     "200": {
                         "description": "OK",
@@ -983,9 +983,9 @@ const docTemplateapi = `{
                 }
             }
         },
-        "/oidc/auth": {
-            "post": {
-                "description": "OidcAuth",
+        "/oidc/auth-query": {
+            "get": {
+                "description": "OidcAuthQuery",
                 "consumes": [
                     "application/json"
                 ],
@@ -995,7 +995,7 @@ const docTemplateapi = `{
                 "tags": [
                     "Oauth"
                 ],
-                "summary": "OidcAuth",
+                "summary": "OidcAuthQuery",
                 "responses": {
                     "200": {
                         "description": "OK",
@@ -1012,9 +1012,9 @@ const docTemplateapi = `{
                 }
             }
         },
-        "/oidc/auth-query": {
+        "/oidc/callback": {
             "get": {
-                "description": "OidcAuthQuery",
+                "description": "OauthCallback",
                 "consumes": [
                     "application/json"
                 ],
@@ -1024,7 +1024,7 @@ const docTemplateapi = `{
                 "tags": [
                     "Oauth"
                 ],
-                "summary": "OidcAuthQuery",
+                "summary": "OauthCallback",
                 "responses": {
                     "200": {
                         "description": "OK",

docs/api/api_swagger.json

@@ -947,9 +947,9 @@
                 }
             }
         },
-        "/oauth/callback": {
-            "get": {
-                "description": "OauthCallback",
+        "/oidc/auth": {
+            "post": {
+                "description": "OidcAuth",
                 "consumes": [
                     "application/json"
                 ],
@@ -959,7 +959,7 @@
                 "tags": [
                     "Oauth"
                 ],
-                "summary": "OauthCallback",
+                "summary": "OidcAuth",
                 "responses": {
                     "200": {
                         "description": "OK",
@@ -976,9 +976,9 @@
                 }
             }
         },
-        "/oidc/auth": {
-            "post": {
-                "description": "OidcAuth",
+        "/oidc/auth-query": {
+            "get": {
+                "description": "OidcAuthQuery",
                 "consumes": [
                     "application/json"
                 ],
@@ -988,7 +988,7 @@
                 "tags": [
                     "Oauth"
                 ],
-                "summary": "OidcAuth",
+                "summary": "OidcAuthQuery",
                 "responses": {
                     "200": {
                         "description": "OK",
@@ -1005,9 +1005,9 @@
                 }
             }
         },
-        "/oidc/auth-query": {
+        "/oidc/callback": {
             "get": {
-                "description": "OidcAuthQuery",
+                "description": "OauthCallback",
                 "consumes": [
                     "application/json"
                 ],
@@ -1017,7 +1017,7 @@
                 "tags": [
                     "Oauth"
                 ],
-                "summary": "OidcAuthQuery",
+                "summary": "OauthCallback",
                 "responses": {
                     "200": {
                         "description": "OK",

docs/api/api_swagger.yaml

@@ -792,11 +792,11 @@ paths:
       summary: 登出
       tags:
       - 登录
-  /oauth/callback:
-    get:
+  /oidc/auth:
+    post:
       consumes:
       - application/json
-      description: OauthCallback
+      description: OidcAuth
       produces:
       - application/json
       responses:
@@ -808,14 +808,14 @@ paths:
           description: Internal Server Error
           schema:
             $ref: '#/definitions/response.ErrorResponse'
-      summary: OauthCallback
+      summary: OidcAuth
       tags:
       - Oauth
-  /oidc/auth:
-    post:
+  /oidc/auth-query:
+    get:
       consumes:
       - application/json
-      description: OidcAuth
+      description: OidcAuthQuery
       produces:
       - application/json
       responses:
@@ -827,14 +827,14 @@ paths:
           description: Internal Server Error
           schema:
             $ref: '#/definitions/response.ErrorResponse'
-      summary: OidcAuth
+      summary: OidcAuthQuery
       tags:
       - Oauth
-  /oidc/auth-query:
+  /oidc/callback:
     get:
       consumes:
       - application/json
-      description: OidcAuthQuery
+      description: OauthCallback
       produces:
       - application/json
       responses:
@@ -846,7 +846,7 @@ paths:
           description: Internal Server Error
           schema:
             $ref: '#/definitions/response.ErrorResponse'
-      summary: OidcAuthQuery
+      summary: OauthCallback
       tags:
       - Oauth
   /peers:

http/controller/api/ouath.go

@@ -143,7 +143,7 @@ func (o *Oauth) OidcAuthQuery(c *gin.Context) {
 // @Produce  json
 // @Success 200 {object} apiResp.LoginRes
 // @Failure 500 {object} response.ErrorResponse
-// @Router /oauth/callback [get]
+// @Router /oidc/callback [get]
 func (o *Oauth) OauthCallback(c *gin.Context) {
 	state := c.Query("state")
 	if state == "" {

http/router/api.go

@@ -49,6 +49,10 @@ func ApiInit(g *gin.Engine) {
 		frg.GET("/oauth/callback", o.OauthCallback)
 		frg.GET("/oauth/login", o.OauthCallback)
 		frg.GET("/oauth/msg", o.Message)
+
+		frg.GET("/oidc/callback", o.OauthCallback)
+		frg.GET("/oidc/login", o.OauthCallback)
+		frg.GET("/oidc/msg", o.Message)
 	}
 	{
 		pe := &api.Peer{}

resources/templates/oauth_fail.html

@@ -62,7 +62,7 @@
         var title = 'OauthFailed'
         var msg = '{{.message}}'
         var btn = 'Close'
-        document.writeln('<script src="/api/oauth/msg?lang=' + lang + '&msg=' + msg + '&title=OauthFailed"><\/script>');
+        document.writeln('<script src="/api/oidc/msg?lang=' + lang + '&msg=' + msg + '&title=OauthFailed"><\/script>');
     </script>
 </head>
 <body>

resources/templates/oauth_success.html

@@ -61,7 +61,7 @@
         var title = 'OauthSuccess'
         var msg = '{{.message}}'
         var btn = 'Close'
-        document.writeln('<script src="/api/oauth/msg?lang=' + lang + '&msg=' + msg + '&title=OauthSuccess"><\/script>');
+        document.writeln('<script src="/api/oidc/msg?lang=' + lang + '&msg=' + msg + '&title=OauthSuccess"><\/script>');
     </script>
 </head>
 <body>