Skip to content

Commit e318f1f

Browse files
committed
feat: WebClient 1.4.2
1 parent ee19eb9 commit e318f1f

File tree

5 files changed

+115365
-107601
lines changed

5 files changed

+115365
-107601
lines changed

http/controller/api/ouath.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ func (o *Oauth) OidcAuthQueryPre(c *gin.Context) (*model.User, *model.UserToken)
8080

8181
// 如果 UserId 为 0,说明还在授权中
8282
if v.UserId == 0 {
83-
c.JSON(http.StatusOK, gin.H{"message": "Authorization in progress, please login and bind"})
83+
//fix: 1.4.2 webclient oidc
84+
c.JSON(http.StatusOK, gin.H{"message": "Authorization in progress, please login and bind", "error": "No authed oidc is found"})
8485
return nil, nil
8586
}
8687

resources/web2/index.html

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<title>RustDesk</title>
3333
<script src="/webclient-config/index.js"></script>
3434
<link rel="manifest" href="manifest.json"/>
35-
<script type="module" crossorigin src="js/dist/index.js?v=ddbe54f1"></script>
35+
<script type="module" crossorigin src="js/dist/index.js?v=bd4ac5e9"></script>
3636
<link rel="modulepreload" href="js/dist/vendor.js?v=0b990c6e"/>
3737
<style>
3838
html,
@@ -319,26 +319,5 @@
319319
</script>
320320
<script src="libs/stream/ponyfill.min.js"></script>
321321
<script src="libs/stream/StreamSaver.min.js"></script>
322-
<script src="libs/firebase-app.js?8.10.1"></script>
323-
<script src="libs/firebase-analytics.js?8.10.1"></script>
324-
325-
<script>
326-
// Your web app's Firebase configuration
327-
// For Firebase JS SDK v7.20.0 and later, measurementId is optional
328-
const firebaseConfig = {
329-
apiKey: "AIzaSyCgehIZk1aFP0E7wZtYRRqrfvNiNAF39-A",
330-
authDomain: "rustdesk.firebaseapp.com",
331-
databaseURL: "https://rustdesk.firebaseio.com",
332-
projectId: "rustdesk",
333-
storageBucket: "rustdesk.appspot.com",
334-
messagingSenderId: "768133699366",
335-
appId: "1:768133699366:web:d50faf0792cb208d7993e7",
336-
measurementId: "G-9PEH85N6ZQ",
337-
};
338-
339-
// Initialize Firebase
340-
firebase.initializeApp(firebaseConfig);
341-
firebase.analytics();
342-
</script>
343322
</body>
344323
</html>

0 commit comments

Comments
 (0)